[jboss-cvs] JBoss Messaging SVN: r6766 - in trunk: examples/javaee/ejb-jms-transaction/config and 96 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 13 09:50:36 EDT 2009
Author: ataylor
Date: 2009-05-13 09:50:35 -0400 (Wed, 13 May 2009)
New Revision: 6766
Added:
trunk/src/config/common/schema/
trunk/src/config/common/schema/jbm-configuration.xsd
trunk/src/config/common/schema/jbm-jms.xsd
trunk/src/config/common/schema/jbm-users.xsd
Removed:
trunk/examples/jms/application-layer-failover/server0/jbm-queues.xml
trunk/examples/jms/application-layer-failover/server1/jbm-queues.xml
trunk/examples/jms/automatic-failover/server0/jbm-queues.xml
trunk/examples/jms/automatic-failover/server1/jbm-queues.xml
trunk/examples/jms/bridge/server0/jbm-queues.xml
trunk/examples/jms/bridge/server1/jbm-queues.xml
trunk/examples/jms/browser/server0/jbm-queues.xml
trunk/examples/jms/client-kickoff/server0/jbm-queues.xml
trunk/examples/jms/client-side-load-balancing/server0/jbm-queues.xml
trunk/examples/jms/client-side-load-balancing/server1/jbm-queues.xml
trunk/examples/jms/client-side-load-balancing/server2/jbm-queues.xml
trunk/examples/jms/clustered-durable-subscription/server0/jbm-queues.xml
trunk/examples/jms/clustered-durable-subscription/server1/jbm-queues.xml
trunk/examples/jms/clustered-queue/server0/jbm-queues.xml
trunk/examples/jms/clustered-queue/server1/jbm-queues.xml
trunk/examples/jms/clustered-topic/server0/jbm-queues.xml
trunk/examples/jms/clustered-topic/server1/jbm-queues.xml
trunk/examples/jms/consumer-rate-limit/server0/jbm-queues.xml
trunk/examples/jms/dead-letter/server0/jbm-queues.xml
trunk/examples/jms/delayed-redelivery/server0/jbm-queues.xml
trunk/examples/jms/divert/server0/jbm-queues.xml
trunk/examples/jms/divert/server1/jbm-queues.xml
trunk/examples/jms/durable-subscription/server0/jbm-queues.xml
trunk/examples/jms/expiry/server0/jbm-queues.xml
trunk/examples/jms/http-transport/server0/jbm-queues.xml
trunk/examples/jms/instantiate-connection-factory/server0/jbm-queues.xml
trunk/examples/jms/interceptor/server0/jbm-queues.xml
trunk/examples/jms/jaas/server0/jbm-queues.xml
trunk/examples/jms/jmx/server0/jbm-queues.xml
trunk/examples/jms/large-message/server0/jbm-queues.xml
trunk/examples/jms/last-value-queue/server0/jbm-queues.xml
trunk/examples/jms/management-notifications/server0/jbm-queues.xml
trunk/examples/jms/management/server0/jbm-queues.xml
trunk/examples/jms/message-counters/server0/jbm-queues.xml
trunk/examples/jms/message-group/server0/jbm-queues.xml
trunk/examples/jms/message-priority/server0/jbm-queues.xml
trunk/examples/jms/no-consumer-buffering/server0/jbm-queues.xml
trunk/examples/jms/paging/server0/jbm-queues.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml
trunk/examples/jms/producer-rate-limit/server0/jbm-queues.xml
trunk/examples/jms/queue-message-redistribution/server0/jbm-queues.xml
trunk/examples/jms/queue-message-redistribution/server1/jbm-queues.xml
trunk/examples/jms/queue-requestor/server0/jbm-queues.xml
trunk/examples/jms/queue-selector/server0/jbm-queues.xml
trunk/examples/jms/queue/server0/jbm-queues.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-queues.xml
trunk/examples/jms/request-reply/server0/jbm-queues.xml
trunk/examples/jms/scheduled-message/server0/jbm-queues.xml
trunk/examples/jms/security/server0/jbm-queues.xml
trunk/examples/jms/ssl-enabled/server0/jbm-queues.xml
trunk/examples/jms/static-selector/server0/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server0/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server1/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server2/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server3/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server4/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server5/jbm-queues.xml
trunk/examples/jms/temp-queue/server0/jbm-queues.xml
trunk/examples/jms/topic-hierarchies/server0/jbm-queues.xml
trunk/examples/jms/topic-selector-example1/server0/jbm-queues.xml
trunk/examples/jms/topic-selector-example2/server0/jbm-queues.xml
trunk/examples/jms/topic/server0/jbm-queues.xml
trunk/examples/jms/transactional/server0/jbm-queues.xml
trunk/examples/jms/xa-heuristic/server0/jbm-queues.xml
trunk/examples/jms/xa-receive/server0/jbm-queues.xml
trunk/examples/jms/xa-send/server0/jbm-queues.xml
trunk/examples/jms/xa-with-jta/server0/jbm-queues.xml
trunk/src/schemas/jbm-configuration.xsd
trunk/src/schemas/jbm-jms.xsd
trunk/src/schemas/jbm-users.xsd
Modified:
trunk/build-messaging.xml
trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml
trunk/examples/javaee/hajndi/config/jbm-jms.xml
trunk/examples/javaee/jca-config/server-config/jbm-jms.xml
trunk/examples/javaee/jms-bridge/config/jbm-jms.xml
trunk/examples/javaee/mdb/config/jbm-jms.xml
trunk/examples/javaee/servlet-transport/config/jbm-jms.xml
trunk/examples/javaee/xarecovery/config/jbm-jms.xml
trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml
trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml
trunk/examples/jms/application-layer-failover/server0/jbm-users.xml
trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml
trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml
trunk/examples/jms/application-layer-failover/server1/jbm-users.xml
trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml
trunk/examples/jms/automatic-failover/server0/jbm-jms.xml
trunk/examples/jms/automatic-failover/server0/jbm-users.xml
trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml
trunk/examples/jms/automatic-failover/server1/jbm-jms.xml
trunk/examples/jms/automatic-failover/server1/jbm-users.xml
trunk/examples/jms/bridge/server0/jbm-configuration.xml
trunk/examples/jms/bridge/server0/jbm-jms.xml
trunk/examples/jms/bridge/server0/jbm-users.xml
trunk/examples/jms/bridge/server1/jbm-configuration.xml
trunk/examples/jms/bridge/server1/jbm-jms.xml
trunk/examples/jms/bridge/server1/jbm-users.xml
trunk/examples/jms/browser/server0/jbm-configuration.xml
trunk/examples/jms/browser/server0/jbm-jms.xml
trunk/examples/jms/browser/server0/jbm-users.xml
trunk/examples/jms/client-kickoff/server0/jbm-configuration.xml
trunk/examples/jms/client-kickoff/server0/jbm-jms.xml
trunk/examples/jms/client-kickoff/server0/jbm-users.xml
trunk/examples/jms/client-side-load-balancing/server0/jbm-configuration.xml
trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml
trunk/examples/jms/client-side-load-balancing/server0/jbm-users.xml
trunk/examples/jms/client-side-load-balancing/server1/jbm-configuration.xml
trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml
trunk/examples/jms/client-side-load-balancing/server1/jbm-users.xml
trunk/examples/jms/client-side-load-balancing/server2/jbm-configuration.xml
trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml
trunk/examples/jms/client-side-load-balancing/server2/jbm-users.xml
trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml
trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml
trunk/examples/jms/clustered-durable-subscription/server0/jbm-users.xml
trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml
trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml
trunk/examples/jms/clustered-durable-subscription/server1/jbm-users.xml
trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml
trunk/examples/jms/clustered-queue/server0/jbm-jms.xml
trunk/examples/jms/clustered-queue/server0/jbm-users.xml
trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml
trunk/examples/jms/clustered-queue/server1/jbm-jms.xml
trunk/examples/jms/clustered-queue/server1/jbm-users.xml
trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml
trunk/examples/jms/clustered-topic/server0/jbm-jms.xml
trunk/examples/jms/clustered-topic/server0/jbm-users.xml
trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml
trunk/examples/jms/clustered-topic/server1/jbm-jms.xml
trunk/examples/jms/clustered-topic/server1/jbm-users.xml
trunk/examples/jms/consumer-rate-limit/server0/jbm-configuration.xml
trunk/examples/jms/consumer-rate-limit/server0/jbm-jms.xml
trunk/examples/jms/consumer-rate-limit/server0/jbm-users.xml
trunk/examples/jms/dead-letter/server0/jbm-configuration.xml
trunk/examples/jms/dead-letter/server0/jbm-jms.xml
trunk/examples/jms/dead-letter/server0/jbm-users.xml
trunk/examples/jms/delayed-redelivery/server0/jbm-configuration.xml
trunk/examples/jms/delayed-redelivery/server0/jbm-jms.xml
trunk/examples/jms/delayed-redelivery/server0/jbm-users.xml
trunk/examples/jms/divert/server0/jbm-configuration.xml
trunk/examples/jms/divert/server0/jbm-jms.xml
trunk/examples/jms/divert/server0/jbm-users.xml
trunk/examples/jms/divert/server1/jbm-configuration.xml
trunk/examples/jms/divert/server1/jbm-jms.xml
trunk/examples/jms/divert/server1/jbm-users.xml
trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml
trunk/examples/jms/durable-subscription/server0/jbm-jms.xml
trunk/examples/jms/durable-subscription/server0/jbm-users.xml
trunk/examples/jms/expiry/server0/jbm-configuration.xml
trunk/examples/jms/expiry/server0/jbm-jms.xml
trunk/examples/jms/expiry/server0/jbm-users.xml
trunk/examples/jms/http-transport/server0/jbm-configuration.xml
trunk/examples/jms/http-transport/server0/jbm-jms.xml
trunk/examples/jms/http-transport/server0/jbm-users.xml
trunk/examples/jms/instantiate-connection-factory/server0/jbm-configuration.xml
trunk/examples/jms/instantiate-connection-factory/server0/jbm-jms.xml
trunk/examples/jms/instantiate-connection-factory/server0/jbm-users.xml
trunk/examples/jms/interceptor/server0/jbm-configuration.xml
trunk/examples/jms/interceptor/server0/jbm-jms.xml
trunk/examples/jms/interceptor/server0/jbm-users.xml
trunk/examples/jms/jaas/server0/jbm-configuration.xml
trunk/examples/jms/jaas/server0/jbm-jms.xml
trunk/examples/jms/jmx/server0/jbm-configuration.xml
trunk/examples/jms/jmx/server0/jbm-jms.xml
trunk/examples/jms/jmx/server0/jbm-users.xml
trunk/examples/jms/large-message/server0/jbm-configuration.xml
trunk/examples/jms/large-message/server0/jbm-jms.xml
trunk/examples/jms/large-message/server0/jbm-users.xml
trunk/examples/jms/last-value-queue/server0/jbm-configuration.xml
trunk/examples/jms/last-value-queue/server0/jbm-jms.xml
trunk/examples/jms/last-value-queue/server0/jbm-users.xml
trunk/examples/jms/management-notifications/server0/jbm-configuration.xml
trunk/examples/jms/management-notifications/server0/jbm-jms.xml
trunk/examples/jms/management-notifications/server0/jbm-users.xml
trunk/examples/jms/management/server0/jbm-configuration.xml
trunk/examples/jms/management/server0/jbm-jms.xml
trunk/examples/jms/management/server0/jbm-users.xml
trunk/examples/jms/message-counters/server0/jbm-configuration.xml
trunk/examples/jms/message-counters/server0/jbm-jms.xml
trunk/examples/jms/message-counters/server0/jbm-users.xml
trunk/examples/jms/message-group/server0/jbm-configuration.xml
trunk/examples/jms/message-group/server0/jbm-jms.xml
trunk/examples/jms/message-group/server0/jbm-users.xml
trunk/examples/jms/message-priority/server0/jbm-configuration.xml
trunk/examples/jms/message-priority/server0/jbm-jms.xml
trunk/examples/jms/message-priority/server0/jbm-users.xml
trunk/examples/jms/no-consumer-buffering/server0/jbm-configuration.xml
trunk/examples/jms/no-consumer-buffering/server0/jbm-jms.xml
trunk/examples/jms/no-consumer-buffering/server0/jbm-users.xml
trunk/examples/jms/paging/server0/jbm-configuration.xml
trunk/examples/jms/paging/server0/jbm-jms.xml
trunk/examples/jms/paging/server0/jbm-users.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-jms.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-users.xml
trunk/examples/jms/producer-rate-limit/server0/jbm-configuration.xml
trunk/examples/jms/producer-rate-limit/server0/jbm-jms.xml
trunk/examples/jms/producer-rate-limit/server0/jbm-users.xml
trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml
trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml
trunk/examples/jms/queue-message-redistribution/server0/jbm-users.xml
trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml
trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml
trunk/examples/jms/queue-message-redistribution/server1/jbm-users.xml
trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml
trunk/examples/jms/queue-requestor/server0/jbm-jms.xml
trunk/examples/jms/queue-requestor/server0/jbm-users.xml
trunk/examples/jms/queue-selector/server0/jbm-configuration.xml
trunk/examples/jms/queue-selector/server0/jbm-jms.xml
trunk/examples/jms/queue-selector/server0/jbm-users.xml
trunk/examples/jms/queue/server0/jbm-configuration.xml
trunk/examples/jms/queue/server0/jbm-jms.xml
trunk/examples/jms/queue/server0/jbm-users.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-users.xml
trunk/examples/jms/request-reply/server0/jbm-configuration.xml
trunk/examples/jms/request-reply/server0/jbm-jms.xml
trunk/examples/jms/request-reply/server0/jbm-users.xml
trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml
trunk/examples/jms/scheduled-message/server0/jbm-jms.xml
trunk/examples/jms/scheduled-message/server0/jbm-users.xml
trunk/examples/jms/security/server0/jbm-configuration.xml
trunk/examples/jms/security/server0/jbm-jms.xml
trunk/examples/jms/security/server0/jbm-users.xml
trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml
trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml
trunk/examples/jms/ssl-enabled/server0/jbm-users.xml
trunk/examples/jms/static-selector/server0/jbm-configuration.xml
trunk/examples/jms/static-selector/server0/jbm-jms.xml
trunk/examples/jms/static-selector/server0/jbm-users.xml
trunk/examples/jms/symmetric-cluster/server0/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server0/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server0/jbm-users.xml
trunk/examples/jms/symmetric-cluster/server1/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server1/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server1/jbm-users.xml
trunk/examples/jms/symmetric-cluster/server2/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server2/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server2/jbm-users.xml
trunk/examples/jms/symmetric-cluster/server3/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server3/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server3/jbm-users.xml
trunk/examples/jms/symmetric-cluster/server4/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server4/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server4/jbm-users.xml
trunk/examples/jms/symmetric-cluster/server5/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server5/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server5/jbm-users.xml
trunk/examples/jms/temp-queue/server0/jbm-configuration.xml
trunk/examples/jms/temp-queue/server0/jbm-jms.xml
trunk/examples/jms/temp-queue/server0/jbm-users.xml
trunk/examples/jms/topic-hierarchies/server0/jbm-configuration.xml
trunk/examples/jms/topic-hierarchies/server0/jbm-jms.xml
trunk/examples/jms/topic-hierarchies/server0/jbm-users.xml
trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml
trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml
trunk/examples/jms/topic-selector-example1/server0/jbm-users.xml
trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml
trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml
trunk/examples/jms/topic-selector-example2/server0/jbm-users.xml
trunk/examples/jms/topic/server0/jbm-configuration.xml
trunk/examples/jms/topic/server0/jbm-jms.xml
trunk/examples/jms/topic/server0/jbm-users.xml
trunk/examples/jms/transactional/server0/jbm-configuration.xml
trunk/examples/jms/transactional/server0/jbm-jms.xml
trunk/examples/jms/transactional/server0/jbm-users.xml
trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml
trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml
trunk/examples/jms/xa-heuristic/server0/jbm-users.xml
trunk/examples/jms/xa-receive/server0/jbm-configuration.xml
trunk/examples/jms/xa-receive/server0/jbm-jms.xml
trunk/examples/jms/xa-receive/server0/jbm-users.xml
trunk/examples/jms/xa-send/server0/jbm-configuration.xml
trunk/examples/jms/xa-send/server0/jbm-jms.xml
trunk/examples/jms/xa-send/server0/jbm-users.xml
trunk/examples/jms/xa-with-jta/server0/jbm-configuration.xml
trunk/examples/jms/xa-with-jta/server0/jbm-jms.xml
trunk/examples/jms/xa-with-jta/server0/jbm-users.xml
trunk/src/config/jboss-as/clustered/jbm-configuration.xml
trunk/src/config/jboss-as/clustered/jbm-jms.xml
trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
trunk/src/config/jboss-as/non-clustered/jbm-jms.xml
trunk/src/config/stand-alone/clustered/jbm-configuration.xml
trunk/src/config/stand-alone/clustered/jbm-jms.xml
trunk/src/config/stand-alone/clustered/jbm-users.xml
trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
trunk/src/config/stand-alone/non-clustered/jbm-jms.xml
trunk/src/config/stand-alone/non-clustered/jbm-users.xml
trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java
trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java
trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java
trunk/tests/jms-tests/config/jbm-configuration.xml
trunk/tests/jms-tests/config/jbm-jms.xml
trunk/tests/jms-tests/config/jbm-users.xml
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueDeployerTest.java
Log:
added config for queues and more cleaning of config
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/build-messaging.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -86,7 +86,7 @@
<property name="src.config.standalone.clustered.dir" value="${src.dir}/config/stand-alone/clustered"/>
<property name="src.config.jbossas.non-clustered.dir" value="${src.dir}/config/jboss-as/non-clustered"/>
<property name="src.config.jbossas.clustered.dir" value="${src.dir}/config/jboss-as/clustered"/>
- <property name="src.schemas.dir" value="${src.dir}/schemas"/>
+ <property name="src.schema.dir" value="${src.config.dir}/common/schema"/>
<property name="src.bin.dir" value="${src.dir}/bin"/>
<property name="doc.dir" value="docs"/>
<property name="licenses.dir" value="licenses"/>
@@ -103,7 +103,7 @@
value="${build.dir}/${build.artifact}"/>
<property name="build.distro.lib.dir" value="${build.distro.dir}/lib"/>
<property name="build.distro.config.dir" value="${build.distro.dir}/config"/>
- <property name="build.distro.schemas.dir" value="${build.distro.dir}/schemas"/>
+ <property name="build.distro.schema.dir" value="${build.distro.dir}/schemas"/>
<property name="build.distro.bin.dir" value="${build.distro.dir}/bin"/>
<property name="build.distro.api.dir" value="${build.distro.dir}/docs/api"/>
<property name="build.distro.examples.dir" value="${build.distro.dir}/examples"/>
@@ -264,7 +264,7 @@
<pathelement location="${test.dir}/tmpfiles"/>
<pathelement location="${test.classes.dir}"/>
<pathelement location="${src.config.dir}/common"/>
- <pathelement location="${src.schemas.dir}"/>
+ <pathelement location="${src.schema.dir}"/>
<path refid="test.compilation.classpath"/>
<path refid="sun.jaxb.classpath"/>
<path refid="apache.log4j.classpath"/>
@@ -284,7 +284,7 @@
<pathelement location="${test.dir}/tmpfiles"/>
<pathelement location="${test.classes.dir}"/>
<pathelement location="${src.config.dir}/common"/>
- <pathelement location="${src.schemas.dir}"/>
+ <pathelement location="${src.schema.dir}"/>
<path refid="test.compilation.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="cglib.classpath"/>
@@ -300,7 +300,7 @@
<path id="jms.test.execution.classpath">
<pathelement location="${test.dir}/config"/>
<pathelement location="${src.config.dir}/common"/>
- <pathelement location="${src.schemas.dir}"/>
+ <pathelement location="${src.schema.dir}"/>
<pathelement location="${test.jms.dir}/config"/>
<pathelement location="${test.jms.classes.dir}"/>
<path location="${build.jars.dir}/${transports.jar.name}"/>
@@ -327,7 +327,7 @@
</path>
<path id="jms.standalone.server.classpath">
- <pathelement location="${src.schemas.dir}"/>
+ <pathelement location="${src.schema.dir}"/>
<path location="${build.jars.dir}/${transports.jar.name}"/>
<path refid="jms.test.execution.classpath"/>
@@ -556,7 +556,7 @@
<!-- user configuration is only for standalone -->
<schemavalidate file="${src.config.standalone.non-clustered.dir}/jbm-users.xml">
<schema namespace="urn:jboss:messaging"
- file="${src.schemas.dir}/jbm-users.xsd"/>
+ file="${src.schema.dir}/jbm-users.xsd"/>
</schemavalidate>
<antcall target="-validate-configuration">
@@ -565,7 +565,7 @@
<!-- user configuration is only for standalone -->
<schemavalidate file="${src.config.standalone.clustered.dir}/jbm-users.xml">
<schema namespace="urn:jboss:messaging"
- file="${src.schemas.dir}/jbm-users.xsd"/>
+ file="${src.schema.dir}/jbm-users.xsd"/>
</schemavalidate>
<antcall target="-validate-configuration">
@@ -581,7 +581,7 @@
<echo>validating configuration from ${conf.dir}</echo>
<schemavalidate file="${conf.dir}/jbm-configuration.xml">
<schema namespace="urn:jboss:messaging"
- file="${src.schemas.dir}/jbm-configuration.xsd"/>
+ file="${src.schema.dir}/jbm-configuration.xsd"/>
</schemavalidate>
<!--
<schemavalidate file="${conf.dir}/jbm-queues.xml">
@@ -607,9 +607,9 @@
<jar jarfile="${build.jars.dir}/${core.jar.name}">
<fileset dir="${build.core.classes.dir}" includes="**"/>
- <fileset dir="${src.schemas.dir}">
+ <fileset dir="${src.config.dir}/common">
<include name="**/*.xsd"/>
- <exclude name="jbm-jms.xsd"/>
+ <exclude name="**/jbm-jms.xsd"/>
</fileset>
<manifest>
<attribute name="JBossMessaging-Version" value="${messaging.version.string}"/>
@@ -623,8 +623,8 @@
<jar jarfile="${build.jars.dir}/${jms.jar.name}">
<fileset dir="${build.jms.classes.dir}" includes="**"/>
- <fileset dir="${src.schemas.dir}">
- <include name="jbm-jms.xsd"/>
+ <fileset dir="${src.config.dir}/common">
+ <include name="**/jbm-jms.xsd"/>
</fileset>
</jar>
@@ -812,8 +812,8 @@
<include name="messaging.truststore"/>
</fileset>
</copy>
- <copy todir="${build.distro.schemas.dir}">
- <fileset dir="${src.schemas.dir}">
+ <copy todir="${build.distro.schema.dir}">
+ <fileset dir="${src.schema.dir}">
<include name="*.xsd"/>
</fileset>
</copy>
Modified: trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Modified: trunk/examples/javaee/hajndi/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/hajndi/config/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/javaee/hajndi/config/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Modified: trunk/examples/javaee/jca-config/server-config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/jca-config/server-config/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/javaee/jca-config/server-config/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
<entries>
Modified: trunk/examples/javaee/jms-bridge/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/config/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/javaee/jms-bridge/config/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Modified: trunk/examples/javaee/mdb/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/mdb/config/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/javaee/mdb/config/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Modified: trunk/examples/javaee/servlet-transport/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/servlet-transport/config/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/javaee/servlet-transport/config/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="TestServletConnectionFactory">
<connector-ref connector-name="netty-servlet"/>
Modified: trunk/examples/javaee/xarecovery/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/xarecovery/config/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/javaee/xarecovery/config/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Modified: trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,28 +1,40 @@
<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
- <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 -->
+ <clustered>true</clustered>
- <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>
- <!-- Other config -->
+ <!-- Acceptors -->
- <journal-min-files>2</journal-min-files>
+ <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>
+
+ <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/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/application-layer-failover/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd ">
-
- <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/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,28 +1,40 @@
<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
- <clustered>true</clustered>
-
- <!-- Connectors -->
+ <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="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 -->
- <!-- 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>
- <journal-min-files>2</journal-min-files>
+ <!-- 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>
+
+ <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-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/application-layer-failover/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd ">
-
- <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-users.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
<backup>true</backup>
@@ -26,4 +26,16 @@
<journal-min-files>2</journal-min-files>
+ <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-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/automatic-failover/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/automatic-failover/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/automatic-failover/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,16 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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-users.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/automatic-failover/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../../src/schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging ../../../src/schema/jbm-configuration.xsd">
<clustered>true</clustered>
<backup-connector-ref connector-name="backup-connector"/>
@@ -31,4 +31,16 @@
<journal-min-files>2</journal-min-files>
+ <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-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/automatic-failover/server1/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
Deleted: trunk/examples/jms/automatic-failover/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/automatic-failover/server1/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,16 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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-users.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/automatic-failover/server1/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/bridge/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/bridge/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
<!-- Connectors -->
@@ -50,4 +50,16 @@
<journal-min-files>2</journal-min-files>
+ <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/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/bridge/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/bridge/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/bridge/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,16 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/bridge/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/bridge/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/bridge/server1/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -25,4 +25,16 @@
<journal-min-files>2</journal-min-files>
+ <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>
\ No newline at end of file
Modified: trunk/examples/jms/bridge/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/bridge/server1/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/bridge/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/bridge/server1/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,16 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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-users.xml
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/bridge/server1/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/browser/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/browser/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/browser/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -21,5 +21,17 @@
<!-- Other config -->
<journal-min-files>2</journal-min-files>
+
+ <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/browser/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/browser/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/browser/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/browser/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/browser/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/browser/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,16 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/browser/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/browser/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/browser/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/client-kickoff/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-kickoff/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- true to expose JBoss Messaging resources through JMX -->
<jmx-management-enabled>true</jmx-management-enabled>
Modified: trunk/examples/jms/client-kickoff/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-kickoff/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
Deleted: trunk/examples/jms/client-kickoff/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-kickoff/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <!-- the example does not require any queue settings -->
-
-</configuration>
Modified: trunk/examples/jms/client-kickoff/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-kickoff/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
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-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
<!-- Connectors -->
@@ -43,4 +43,16 @@
<journal-min-files>2</journal-min-files>
+ <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/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<discovery-group-ref discovery-group-name="my-discovery-group"/>
Deleted: trunk/examples/jms/client-side-load-balancing/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,16 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
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-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -44,4 +44,16 @@
<journal-min-files>2</journal-min-files>
+ <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-side-load-balancing/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<discovery-group-ref discovery-group-name="my-discovery-group"/>
Deleted: trunk/examples/jms/client-side-load-balancing/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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-users.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
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-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -42,4 +42,16 @@
<journal-min-files>2</journal-min-files>
+ <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/server2/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<discovery-group-ref discovery-group-name="my-discovery-group"/>
Deleted: trunk/examples/jms/client-side-load-balancing/server2/jbm-queues.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/server2/jbm-users.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -53,4 +53,16 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/clustered-durable-subscription/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -11,7 +11,7 @@
<param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
</connector>
</connectors>
-
+
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
@@ -19,7 +19,7 @@
<param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
</acceptor>
</acceptors>
-
+
<!-- Clustering configuration -->
<broadcast-groups>
<broadcast-group name="my-broacast-group">
@@ -29,7 +29,7 @@
<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>
@@ -37,7 +37,7 @@
<refresh-timeout>10000</refresh-timeout>
</discovery-group>
</discovery-groups>
-
+
<cluster-connections>
<cluster-connection name="my-cluster">
<address>jms</address>
@@ -53,5 +53,17 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/clustered-durable-subscription/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
<!-- Connectors -->
@@ -53,4 +53,16 @@
<journal-min-files>2</journal-min-files>
+ <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/clustered-queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-queue/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/clustered-queue/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-queue/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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-queue/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-queue/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
<!-- Connectors -->
@@ -52,4 +52,16 @@
<journal-min-files>2</journal-min-files>
+ <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-queue/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-queue/server1/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/clustered-queue/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-queue/server1/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,16 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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-queue/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-queue/server1/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
<!-- Connectors -->
@@ -54,4 +54,16 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/clustered-topic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-topic/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/clustered-topic/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-topic/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/clustered-topic/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-topic/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
<!-- Connectors -->
@@ -52,5 +52,16 @@
<journal-min-files>2</journal-min-files>
+ <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>
</configuration>
\ No newline at end of file
Modified: trunk/examples/jms/clustered-topic/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-topic/server1/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/clustered-topic/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-topic/server1/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/clustered-topic/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/clustered-topic/server1/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/consumer-rate-limit/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/consumer-rate-limit/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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/consumer-rate-limit/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/consumer-rate-limit/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/consumer-rate-limit/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/consumer-rate-limit/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/consumer-rate-limit/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/consumer-rate-limit/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/dead-letter/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/dead-letter/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,24 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
+ <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>
+
</configuration>
Modified: trunk/examples/jms/dead-letter/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/dead-letter/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/dead-letter/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/dead-letter/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,25 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/dead-letter/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/dead-letter/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/delayed-redelivery/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/delayed-redelivery/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,23 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
+ <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>
+
</configuration>
Modified: trunk/examples/jms/delayed-redelivery/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/delayed-redelivery/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/delayed-redelivery/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/delayed-redelivery/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,24 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/delayed-redelivery/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/delayed-redelivery/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/divert/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/divert/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/divert/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- We need to make it clustered otherwise the bridge won't deploy -->
<clustered>true</clustered>
@@ -71,4 +71,17 @@
<journal-min-files>2</journal-min-files>
+
+ <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>
+
</configuration>
Modified: trunk/examples/jms/divert/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/divert/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/divert/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!-- the connection factory used by the example -->
Deleted: trunk/examples/jms/divert/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/divert/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/divert/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/divert/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/divert/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/divert/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/divert/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/divert/server1/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/divert/server1/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -23,4 +23,16 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/divert/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/divert/server1/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/divert/server1/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!-- the connection factory used by the example -->
Deleted: trunk/examples/jms/divert/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/divert/server1/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/divert/server1/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/divert/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/divert/server1/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/divert/server1/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -23,4 +23,16 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/durable-subscription/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/durable-subscription/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/durable-subscription/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/durable-subscription/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/durable-subscription/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/durable-subscription/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/expiry/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/expiry/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -23,4 +23,23 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
+ <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>
+
</configuration>
Modified: trunk/examples/jms/expiry/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/expiry/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/expiry/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/expiry/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,24 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/expiry/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/expiry/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/http-transport/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/http-transport/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -25,4 +25,16 @@
<journal-min-files>2</journal-min-files>
+ <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/http-transport/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/http-transport/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/http-transport/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/http-transport/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/http-transport/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/http-transport/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/instantiate-connection-factory/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/instantiate-connection-factory/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -23,4 +23,16 @@
<journal-min-files>2</journal-min-files>
+ <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/instantiate-connection-factory/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/instantiate-connection-factory/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the queue used by the example-->
<queue name="exampleQueue">
Deleted: trunk/examples/jms/instantiate-connection-factory/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/instantiate-connection-factory/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/instantiate-connection-factory/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/instantiate-connection-factory/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/interceptor/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/interceptor/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<remoting-interceptors>
<class-name>org.jboss.jms.example.SimpleInterceptor</class-name>
@@ -27,4 +27,16 @@
<journal-min-files>2</journal-min-files>
+ <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/interceptor/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/interceptor/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/interceptor/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/interceptor/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/interceptor/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/interceptor/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/jaas/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/jaas/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/jaas/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -23,4 +23,16 @@
<journal-min-files>2</journal-min-files>
+ <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/jaas/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/jaas/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/jaas/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<deployment xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/jaas/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/jaas/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/jaas/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/jmx/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/jmx/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- true to expose JBoss Messaging resources through JMX -->
<jmx-management-enabled>true</jmx-management-enabled>
@@ -25,4 +25,16 @@
<journal-min-files>2</journal-min-files>
+ <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/jmx/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/jmx/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
Deleted: trunk/examples/jms/jmx/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/jmx/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/jmx/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/jmx/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/large-message/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/large-message/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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/large-message/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/large-message/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/large-message/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/large-message/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/large-message/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/large-message/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/last-value-queue/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/last-value-queue/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -23,4 +23,23 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
+ <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>
+
</configuration>
Modified: trunk/examples/jms/last-value-queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/last-value-queue/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/last-value-queue/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/last-value-queue/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,24 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/last-value-queue/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/last-value-queue/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/management/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/management/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<management-address>jbm.management</management-address>
@@ -16,5 +16,32 @@
<factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
</acceptor>
</acceptors>
-
+
+ <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>
+
</configuration>
Modified: trunk/examples/jms/management/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/management/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
Deleted: trunk/examples/jms/management/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/management/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,32 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/management/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/management/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/management-notifications/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/management-notifications/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schema/jbm-configuration.xsd">
<management-notification-address>example.notifications</management-notification-address>
@@ -27,4 +27,31 @@
<!-- Other configs -->
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/management-notifications/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/management-notifications/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
Deleted: trunk/examples/jms/management-notifications/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/management-notifications/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,32 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/management-notifications/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/management-notifications/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-security.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schema/jbm-security.xsd ">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/message-counters/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-counters/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schema/jbm-configuration.xsd">
<jmx-management-enabled>true</jmx-management-enabled>
<message-counter-enabled>true</message-counter-enabled>
@@ -27,4 +27,33 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
+ <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>
+
</configuration>
Modified: trunk/examples/jms/message-counters/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-counters/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/message-counters/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-counters/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,34 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/message-counters/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-counters/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/message-group/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/message-group/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-group/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,22 @@
<journal-min-files>2</journal-min-files>
+ <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>
+ <address-setting match="jms.queue.exampleQueue">
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
+ </address-setting>
+ </address-settings>
+
</configuration>
Modified: trunk/examples/jms/message-group/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/message-group/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-group/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/message-group/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/message-group/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-group/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,23 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
- <address-setting match="jms.queue.exampleQueue">
- <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
- </address-setting>
- </address-settings>
-
-</configuration>
Modified: trunk/examples/jms/message-group/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/message-group/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-group/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/message-priority/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-priority/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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/message-priority/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-priority/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/message-priority/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-priority/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/message-priority/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/message-priority/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/no-consumer-buffering/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/no-consumer-buffering/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -23,4 +23,16 @@
<journal-min-files>2</journal-min-files>
+ <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/no-consumer-buffering/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/no-consumer-buffering/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/no-consumer-buffering/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/no-consumer-buffering/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/no-consumer-buffering/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/no-consumer-buffering/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/paging/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/paging/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -25,5 +25,37 @@
<paging-max-global-size-bytes>20485760</paging-max-global-size-bytes>
<paging-global-watermark-size>1048576</paging-global-watermark-size>
-
+
+ <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>
+
+ <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-setting match="jms.queue.exampleQueue">
+ <page-size-bytes>1048576</page-size-bytes>
+ </address-setting>
+ </address-settings>
+
</configuration>
Modified: trunk/examples/jms/paging/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/paging/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/paging/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/paging/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,37 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
- <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-setting match="jms.queue.exampleQueue">
- <page-size-bytes>1048576</page-size-bytes>
- </address-setting>
- </address-settings>
-
-</configuration>
Modified: trunk/examples/jms/paging/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/paging/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -23,4 +23,19 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/pre-acknowledge/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,20 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/pre-acknowledge/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/producer-rate-limit/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/producer-rate-limit/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -23,4 +23,16 @@
<journal-min-files>2</journal-min-files>
+ <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/producer-rate-limit/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/producer-rate-limit/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/producer-rate-limit/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/producer-rate-limit/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/producer-rate-limit/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/producer-rate-limit/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/queue/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -23,4 +23,16 @@
<journal-min-files>2</journal-min-files>
+ <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/queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/queue/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/queue/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -53,4 +53,27 @@
<journal-min-files>2</journal-min-files>
+ <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>
+ <!-- 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>
+
</configuration>
Modified: trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/queue-message-redistribution/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,28 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
- <!-- 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>
-
-</configuration>
Modified: trunk/examples/jms/queue-message-redistribution/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -54,4 +54,27 @@
<journal-min-files>2</journal-min-files>
+ <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>
+ <!-- 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>
+
</configuration>
Modified: trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/queue-message-redistribution/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,28 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
- <!-- 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>
-
-</configuration>
Modified: trunk/examples/jms/queue-message-redistribution/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -23,4 +23,26 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/queue-requestor/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-requestor/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/queue-requestor/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-requestor/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,27 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/queue-requestor/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-requestor/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/queue-selector/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-selector/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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/queue-selector/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-selector/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/queue-selector/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-selector/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/queue-selector/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/queue-selector/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -37,4 +37,24 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factories used by the example-->
Deleted: trunk/examples/jms/reconnect-same-node/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,25 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/reconnect-same-node/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/request-reply/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/request-reply/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,26 @@
<journal-min-files>2</journal-min-files>
+ <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/request-reply/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/request-reply/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/request-reply/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/request-reply/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,26 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/request-reply/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/request-reply/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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/scheduled-message/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/scheduled-message/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/scheduled-message/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/scheduled-message/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/scheduled-message/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/scheduled-message/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/security/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/security/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/security/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,34 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/security/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/security/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/security/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/security/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/security/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/security/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,35 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/security/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/security/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/security/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<user name="bill" password="jbossmessaging">
<role name="user"/>
Modified: trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -33,4 +33,16 @@
<journal-min-files>2</journal-min-files>
+ <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/ssl-enabled/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-ssl-connector"/>
Deleted: trunk/examples/jms/ssl-enabled/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/ssl-enabled/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/static-selector/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/static-selector/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -29,4 +29,16 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/static-selector/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/static-selector/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/static-selector/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/static-selector/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/static-selector/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/static-selector/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/symmetric-cluster/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -61,4 +61,16 @@
<journal-min-files>2</journal-min-files>
+ <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/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--This connection factory is not actually used in the example, but we keep it here for good
measure -->
Deleted: trunk/examples/jms/symmetric-cluster/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/symmetric-cluster/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -61,4 +61,16 @@
<journal-min-files>2</journal-min-files>
+ <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/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--This connection factory is not actually used in the example, but we keep it here for good
measure -->
Deleted: trunk/examples/jms/symmetric-cluster/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/symmetric-cluster/server2/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -61,4 +61,16 @@
<journal-min-files>2</journal-min-files>
+ <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-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--This connection factory is not actually used in the example, but we keep it here for good
measure -->
Deleted: trunk/examples/jms/symmetric-cluster/server2/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/symmetric-cluster/server3/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -56,4 +56,16 @@
<journal-min-files>2</journal-min-files>
+ <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-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--This connection factory is not actually used in the example, but we keep it here for good
measure -->
Deleted: trunk/examples/jms/symmetric-cluster/server3/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/symmetric-cluster/server4/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -55,4 +55,16 @@
<journal-min-files>2</journal-min-files>
+ <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/server4/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--This connection factory is not actually used in the example, but we keep it here for good
measure -->
Deleted: trunk/examples/jms/symmetric-cluster/server4/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/server4/jbm-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/symmetric-cluster/server5/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -55,4 +55,16 @@
<journal-min-files>2</journal-min-files>
+ <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-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--This connection factory is not actually used in the example, but we keep it here for good
measure -->
Deleted: trunk/examples/jms/symmetric-cluster/server5/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/temp-queue/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/temp-queue/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,27 @@
<journal-min-files>2</journal-min-files>
+ <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/temp-queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/temp-queue/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/temp-queue/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/temp-queue/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,28 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/temp-queue/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/temp-queue/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/topic/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/topic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/topic/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/topic/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/topic-hierarchies/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-hierarchies/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
@@ -10,7 +10,7 @@
<param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
</connector>
</connectors>
-
+
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
@@ -23,4 +23,16 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/topic-hierarchies/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-hierarchies/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/topic-hierarchies/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-hierarchies/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/topic-hierarchies/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-hierarchies/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/topic-selector-example1/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/topic-selector-example1/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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>
+
</configuration>
Modified: trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/topic-selector-example2/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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>
-
-</configuration>
Modified: trunk/examples/jms/topic-selector-example2/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/transactional/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/transactional/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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/transactional/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/transactional/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/transactional/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/transactional/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/transactional/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/transactional/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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/xa-heuristic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/xa-heuristic/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/xa-heuristic/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/xa-receive/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-receive/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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/xa-receive/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-receive/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/xa-receive/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-receive/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/xa-receive/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-receive/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/xa-send/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-send/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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/xa-send/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-send/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/xa-send/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-send/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/xa-send/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-send/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/examples/jms/xa-with-jta/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-with-jta/server0/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -22,4 +22,16 @@
<journal-min-files>2</journal-min-files>
+ <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/xa-with-jta/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-with-jta/server0/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
Deleted: trunk/examples/jms/xa-with-jta/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/jbm-queues.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-with-jta/server0/jbm-queues.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,17 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <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/xa-with-jta/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/examples/jms/xa-with-jta/server0/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Added: trunk/src/config/common/schema/jbm-configuration.xsd
===================================================================
--- trunk/src/config/common/schema/jbm-configuration.xsd (rev 0)
+++ trunk/src/config/common/schema/jbm-configuration.xsd 2009-05-13 13:50:35 UTC (rev 6766)
@@ -0,0 +1,602 @@
+<?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="configuration">
+ <xsd:complexType>
+ <xsd:all>
+ <xsd:element ref="clustered" maxOccurs="1"
+ minOccurs="0" />
+ <xsd:element ref="enable-file-deployment" maxOccurs="1"
+ minOccurs="0" />
+ <xsd:element ref="enable-persistence" maxOccurs="1"
+ minOccurs="0" />
+ <xsd:element name="scheduled-thread-pool-max-size"
+ type="xsd:int" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Maximum number of threads to use for the scheduled thread pool
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="thread-pool-max-size"
+ type="xsd:int" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Maximum number of threads to use for the thread pool
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="security-enabled" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="security-invalidation-interval"
+ type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="wild-card-routing-enabled"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="management-address" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="management-notification-address"
+ type="xsd:string" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="management-cluster-password"
+ type="xsd:string" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="management-request-timeout"
+ type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="jmx-management-enabled"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="message-counter-enabled"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="message-counter-sample-period"
+ type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="message-counter-max-day-history"
+ type="xsd:positiveInteger" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="connection-scan-period"
+ type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="connection-ttl-override"
+ type="xsd:long" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="transaction-timeout" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="transaction-timeout-scan-period"
+ type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="message-expiry-scan-period"
+ type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="message-expiry-thread-priority"
+ type="xsd:positiveInteger" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="id-cache-size" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="persist-id-cache" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element ref="remoting-interceptors" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element name="queue-activation-timeout"
+ type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="backup" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="persist-delivery-count-before-delivery" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="allow-route-when-no-bindings" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="backup-connector-ref"
+ type="backup-connectorType" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="connector" type="connectorType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="acceptors" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="acceptor" type="acceptorType"
+ minOccurs="1" maxOccurs="unbounded">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="broadcast-groups" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="broadcast-group" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="discovery-groups" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="discovery-group" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="diverts" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="divert" type="divertType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="queues" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="bridges" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="bridge" type="bridgeType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="cluster-connections" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="cluster-connection" type="clusterConnectionType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="paging-max-threads" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="paging-directory" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="paging-global-watermark-size" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="paging-max-global-size-bytes"
+ type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="bindings-directory" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="create-bindings-dir"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-directory" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="create-journal-dir"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-type" type="journalType"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-buffer-reuse-size"
+ type="xsd:long" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-sync-transactional"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-sync-non-transactional"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-file-size" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-min-files" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-max-aio" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <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>
+
+ <xsd:element name="clustered" type="xsd:boolean"></xsd:element>
+
+ <xsd:element name="enable-file-deployment" type="xsd:boolean"></xsd:element>
+
+ <xsd:element name="enable-persistence" type="xsd:boolean"></xsd:element>
+
+ <xsd:element name="local-bind-address" type="xsd:string"></xsd:element>
+
+ <xsd:element name="local-bind-port" type="portRange"></xsd:element>
+
+ <xsd:element name="group-address" type="xsd:string"></xsd:element>
+
+ <xsd:element name="group-port" type="portRange"></xsd:element>
+
+ <xsd:element name="broadcast-period" type="xsd:unsignedLong"></xsd:element>
+
+ <xsd:element name="connector-ref" type="connector-refType">
+ </xsd:element>
+
+ <xsd:element name="broadcast-group">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="local-bind-port" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element ref="group-address" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element ref="group-port" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element ref="broadcast-period" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element ref="connector-ref" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="refresh-timeout" type="xsd:unsignedLong"></xsd:element>
+
+ <xsd:element name="discovery-group">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="group-address" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element ref="group-port" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element ref="refresh-timeout" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="discovery-group-ref">
+ <xsd:complexType>
+ <xsd:attribute name="discovery-group-name"
+ type="xsd:IDREF">
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:complexType name="connector-refType">
+ <xsd:attribute name="connector-name" type="xsd:IDREF"
+ use="required">
+ </xsd:attribute>
+ <xsd:attribute name="backup-connector-name" type="xsd:IDREF"
+ use="optional">
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:element name="remoting-interceptors">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="class-name" type="xsd:string"
+ maxOccurs="unbounded" minOccurs="1">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:complexType name="paramType">
+ <xsd:attribute name="key" type="xsd:string" use="required"></xsd:attribute>
+ <xsd:attribute name="value" type="xsd:string" use="required"></xsd:attribute>
+ <xsd:attribute name="type" use="required">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="String"></xsd:enumeration>
+ <xsd:enumeration value="Integer"></xsd:enumeration>
+ <xsd:enumeration value="Long"></xsd:enumeration>
+ <xsd:enumeration value="Boolean"></xsd:enumeration>
+ <xsd:enumeration value="Float"></xsd:enumeration>
+ <xsd:enumeration value="Double"></xsd:enumeration>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="connectorType">
+ <xsd:sequence>
+ <xsd:element name="factory-class" type="xsd:string"
+ minOccurs="1" maxOccurs="1">
+ </xsd:element>
+ <xsd:element name="param" type="paramType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="acceptorType">
+ <xsd:sequence>
+ <xsd:element name="factory-class" type="xsd:string"
+ minOccurs="1" maxOccurs="1">
+ </xsd:element>
+ <xsd:element name="param" type="paramType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="optional"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="bridgeType">
+ <xsd:sequence>
+ <xsd:element name="queue-name" type="xsd:IDREF"
+ maxOccurs="1" minOccurs="1">
+ </xsd:element>
+ <xsd:element name="forwarding-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="transformer-class-name" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="retry-interval" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="retry-interval-multiplier"
+ type="xsd:double" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="reconnect-attempts"
+ type="minusOneOrMoreInteger" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="failover-on-server-shutdown"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="use-duplicate-detection"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:choice>
+ <xsd:element name="connector-ref"
+ type="connector-refType" minOccurs="1" maxOccurs="1">
+ </xsd:element>
+ <xsd:element name="discovery-group-ref" minOccurs="1"
+ maxOccurs="1">
+ <xsd:complexType>
+ <xsd:attribute name="discovery-group-name"
+ type="xsd:IDREF" use="required">
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="clusterConnectionType">
+ <xsd:sequence>
+ <xsd:element name="address" type="xsd:string"
+ maxOccurs="1" minOccurs="1">
+ </xsd:element>
+ <xsd:element name="retry-interval" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="use-duplicate-detection"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="forward-when-no-consumers"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-hops"
+ type="xsd:positiveInteger" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+
+ <xsd:choice>
+ <xsd:element name="connector-ref"
+ type="connector-refType" minOccurs="1" maxOccurs="unbounded">
+ </xsd:element>
+ <xsd:element name="discovery-group-ref" minOccurs="1"
+ maxOccurs="1">
+ <xsd:complexType>
+ <xsd:attribute name="discovery-group-name"
+ type="xsd:IDREF" use="required">
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="divertType">
+ <xsd:sequence>
+ <xsd:element name="routing-name" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="address" type="xsd:string" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element name="forwarding-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="transformer-class-name" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="exclusive" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:simpleType name="journalType">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="ASYNCIO"></xsd:enumeration>
+ <xsd:enumeration value="NIO"></xsd:enumeration>
+ </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">
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:simpleType name="portRange">
+ <xsd:restriction base="xsd:int">
+ <xsd:minExclusive value="1024"></xsd:minExclusive>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="minusOneOrMoreInteger">
+ <xsd:restriction base="xsd:int">
+ <xsd:minInclusive value="-1"></xsd:minInclusive>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+</xsd:schema>
Added: trunk/src/config/common/schema/jbm-jms.xsd
===================================================================
--- trunk/src/config/common/schema/jbm-jms.xsd (rev 0)
+++ trunk/src/config/common/schema/jbm-jms.xsd 2009-05-13 13:50:35 UTC (rev 6766)
@@ -0,0 +1,162 @@
+<?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="configuration">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="connection-factory"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ <xsd:choice maxOccurs="unbounded" minOccurs="0">
+ <xsd:element ref="queue" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element ref="topic" maxOccurs="1" minOccurs="1"></xsd:element>
+ </xsd:choice>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="connection-factory">
+ <xsd:complexType>
+ <xsd:all>
+ <xsd:element name="connector-ref" type="connector-refType" maxOccurs="1" minOccurs="0"></xsd:element>
+ <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element>
+ <xsd:element name="discovery-initial-wait" type="xsd:unsignedLong" maxOccurs="1" minOccurs="0"></xsd:element>
+
+ <xsd:element name="entries" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="entry" type="entryType"
+ maxOccurs="unbounded" minOccurs="1">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="ping-period" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="connection-ttl" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="call-timeout" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="consumer-window-size" type="minusOneOrMoreInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="consumer-max-rate" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="producer-window-size" type="minusOneOrMoreInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="producer-max-rate" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="min-large-message-size" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="client-id" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="dups-ok-batch-size" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="transaction-batch-size" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="block-on-acknowledge" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="send-np-messages-synchronously" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="send-p-messages-synchronously" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="auto-group-id" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-connections" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="pre-acknowledge" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="retry-interval" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="retry-interval-multiplier" type="xsd:float"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="reconnect-attempts" type="minusOneOrMoreInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="failover-on-server-shutdown" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="load-balancing-policy-class-name" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="use-global-pools" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="scheduled-thread-pool-max-size" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="thread-pool-max-size" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ </xsd:all>
+ <xsd:attribute name="name" type="xsd:string"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:complexType name="connector-refType">
+ <xsd:attribute name="connector-name" type="xsd:string" use="required"></xsd:attribute>
+ <xsd:attribute name="backup-connector-name" type="xsd:string" use="optional"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="entryType">
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="discovery-group-refType">
+ <xsd:attribute name="discovery-group-name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:element name="queue" type="queueType"></xsd:element>
+
+ <xsd:element name="topic" type="topicType"></xsd:element>
+
+ <xsd:complexType name="queueType">
+ <xsd:sequence>
+ <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ <xsd:attribute name="durable" type="xsd:boolean" use="optional"></xsd:attribute>
+ <xsd:attribute name="filter" type="xsd:string" use="optional"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="topicType">
+ <xsd:sequence>
+ <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+
+ <xsd:simpleType name="minusOneOrMoreInteger">
+ <xsd:restriction base="xsd:int">
+ <xsd:minInclusive value="-1"></xsd:minInclusive>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+</xsd:schema>
Added: trunk/src/config/common/schema/jbm-users.xsd
===================================================================
--- trunk/src/config/common/schema/jbm-users.xsd (rev 0)
+++ trunk/src/config/common/schema/jbm-users.xsd 2009-05-13 13:50:35 UTC (rev 6766)
@@ -0,0 +1,32 @@
+<?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="configuration">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="defaultuser" type="userType" maxOccurs="1" minOccurs="0"></xsd:element>
+ <xsd:element name="user" type="userType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="role">
+ <xsd:complexType>
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:complexType name="userType">
+ <xsd:sequence>
+ <xsd:element ref="role" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ <xsd:attribute name="password" type="xsd:string"></xsd:attribute>
+ </xsd:complexType>
+</xsd:schema>
Modified: trunk/src/config/jboss-as/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/config/jboss-as/clustered/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
Modified: trunk/src/config/jboss-as/clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/config/jboss-as/clustered/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
Modified: trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
Modified: trunk/src/config/jboss-as/non-clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/config/jboss-as/non-clustered/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
Modified: trunk/src/config/stand-alone/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/config/stand-alone/clustered/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<clustered>true</clustered>
Modified: trunk/src/config/stand-alone/clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/config/stand-alone/clustered/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
Modified: trunk/src/config/stand-alone/clustered/jbm-users.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/config/stand-alone/clustered/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../../schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
Modified: trunk/src/config/stand-alone/non-clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/config/stand-alone/non-clustered/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
@@ -10,7 +10,7 @@
</entries>
</connection-factory>
- <queue name="DLQ">
+ <queue name="DLQ" durable="true" filter="foo='bar'">
<entry name="/queue/DLQ"/>
</queue>
Modified: trunk/src/config/stand-alone/non-clustered/jbm-users.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/config/stand-alone/non-clustered/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -22,11 +22,11 @@
package org.jboss.messaging.core.management;
+import org.jboss.messaging.core.config.Configuration;
+
import static javax.management.MBeanOperationInfo.ACTION;
import static javax.management.MBeanOperationInfo.INFO;
-import org.jboss.messaging.core.config.Configuration;
-
/**
* This interface describes the core management interface exposed by the server
*/
@@ -113,7 +113,7 @@
@Operation(desc = "Deploy a queue", impact = ACTION)
void deployQueue(@Parameter(name = "address", desc = "Address of the queue")
String address, @Parameter(name = "name", desc = "Name of the queue")
- String name) throws Exception;
+ String name, String filterString) throws Exception;
@Operation(desc = "Deploy a queue", impact = ACTION)
void deployQueue(@Parameter(name = "address", desc = "Address of the queue")
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -22,25 +22,6 @@
package org.jboss.messaging.core.management.impl;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanNotificationInfo;
-import javax.management.NotificationBroadcasterSupport;
-import javax.management.NotificationEmitter;
-import javax.management.NotificationFilter;
-import javax.management.NotificationListener;
-import javax.transaction.xa.Xid;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.exception.MessagingException;
@@ -59,6 +40,24 @@
import org.jboss.messaging.core.transaction.impl.XidImpl;
import org.jboss.messaging.utils.SimpleString;
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanNotificationInfo;
+import javax.management.NotificationBroadcasterSupport;
+import javax.management.NotificationEmitter;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+import javax.transaction.xa.Xid;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
*
@@ -242,9 +241,9 @@
return configuration.isSecurityEnabled();
}
- public void deployQueue(final String address, final String name) throws Exception
+ public void deployQueue(final String address, final String name, String filterString) throws Exception
{
- server.deployQueue(new SimpleString(address), new SimpleString(name), null, true, false);
+ server.deployQueue(new SimpleString(address), new SimpleString(name), new SimpleString(filterString), true, false);
}
public void deployQueue(final String address, final String name, final String filterStr, final boolean durable) throws Exception
Modified: trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -22,8 +22,6 @@
package org.jboss.messaging.core.management.jmx.impl;
-import javax.management.MBeanInfo;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.management.MessagingServerControlMBean;
import org.jboss.messaging.core.management.ReplicationOperationInvoker;
@@ -31,6 +29,8 @@
import org.jboss.messaging.core.management.impl.MBeanInfoHelper;
import org.jboss.messaging.core.management.impl.MessagingServerControl;
+import javax.management.MBeanInfo;
+
/**
* A ReplicationAwareMessagingServerControlWrapper
*
@@ -271,7 +271,7 @@
replicationAwareInvoke("deployQueue", address, name, filter, durable);
}
- public void deployQueue(String address, String name) throws Exception
+ public void deployQueue(String address, String name, String filterString) throws Exception
{
replicationAwareInvoke("deployQueue", address, name);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -712,7 +712,8 @@
return createQueue(address, queueName, filterString, durable, temporary, false);
}
- public Queue deployQueue(final SimpleString address,
+ public Queue
+ deployQueue(final SimpleString address,
final SimpleString queueName,
final SimpleString filterString,
final boolean durable,
Modified: trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -22,14 +22,13 @@
package org.jboss.messaging.jms.server;
-import java.util.List;
-
-import javax.naming.Context;
-
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.server.MessagingComponent;
import org.jboss.messaging.utils.Pair;
+import javax.naming.Context;
+import java.util.List;
+
/**
* The JMS Management interface.
*
@@ -55,12 +54,14 @@
* The name of the queue to create
* @param jndiBinding
* the name of the binding for JNDI
+ * @param filterString
+ * @param durable
* @return true if the queue is created or if it existed and was added to
* JNDI
* @throws Exception
* if problems were encountered creating the queue.
*/
- boolean createQueue(String queueName, String jndiBinding) throws Exception;
+ boolean createQueue(String queueName, String jndiBinding, String filterString, boolean durable) throws Exception;
/**
* Creates a JMS Topic
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -12,9 +12,6 @@
package org.jboss.messaging.jms.server.impl;
-import java.util.ArrayList;
-import java.util.List;
-
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
@@ -24,9 +21,13 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.jms.server.JMSServerManager;
import org.jboss.messaging.utils.Pair;
+import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
* @author <a href="tim.fox at jboss.com">Tim Fox</a>
@@ -99,12 +100,18 @@
private static final String QUEUE_NODE_NAME = "queue";
+ private static final String QUEUE_FILTER_STRING_ATTR_NAME = "filter";
+
+ private static final String QUEUE_DURABLE_ATTR_NAME = "durable";
+
private static final String TOPIC_NODE_NAME = "topic";
private static final String CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME_ELEMENT = "connection-load-balancing-policy-class-name";
private static final String DISCOVERY_INITIAL_WAIT_ELEMENT = "discovery-initial-wait";
+ private static final boolean DEFAULT_QUEUE_DURABILITY = true;
+
public JMSServerDeployer(final JMSServerManager jmsServerManager,
final DeploymentManager deploymentManager,
final Configuration config)
@@ -428,7 +435,21 @@
}
else if (node.getNodeName().equals(QUEUE_NODE_NAME))
{
- String queueName = node.getAttributes().getNamedItem(getKeyAttribute()).getNodeValue();
+ NamedNodeMap atts = node.getAttributes();
+ String queueName = atts.getNamedItem(getKeyAttribute()).getNodeValue();
+ String filterString = null;
+ Node filterNode = atts.getNamedItem(QUEUE_FILTER_STRING_ATTR_NAME);
+ if(filterNode != null)
+ {
+ filterString = filterNode.getNodeValue();
+ }
+ boolean durable = DEFAULT_QUEUE_DURABILITY;
+ Node durableNode = atts.getNamedItem(QUEUE_DURABLE_ATTR_NAME);
+ if(durableNode != null)
+ {
+ String val = durableNode.getNodeValue();
+ durable = val == null ? DEFAULT_QUEUE_DURABILITY:val.equalsIgnoreCase(Boolean.FALSE.toString());
+ }
NodeList children = node.getChildNodes();
for (int i = 0; i < children.getLength(); i++)
{
@@ -437,7 +458,7 @@
if (ENTRY_NODE_NAME.equals(children.item(i).getNodeName()))
{
String jndiName = child.getAttributes().getNamedItem("name").getNodeValue();
- jmsServerControl.createQueue(queueName, jndiName);
+ jmsServerControl.createQueue(queueName, jndiName, filterString, durable);
}
}
}
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -22,18 +22,6 @@
package org.jboss.messaging.jms.server.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.deployers.Deployer;
import org.jboss.messaging.core.deployers.DeploymentManager;
@@ -49,6 +37,17 @@
import org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl;
import org.jboss.messaging.utils.Pair;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* A Deployer used to create and add to JNDI queues, topics and connection
* factories. Typically this would only be used in an app server env.
@@ -192,11 +191,11 @@
return server.getMessagingServerControl().getVersion();
}
- public synchronized boolean createQueue(final String queueName, final String jndiBinding) throws Exception
+ public synchronized boolean createQueue(final String queueName, final String jndiBinding, final String filterString, boolean durable) throws Exception
{
checkInitialised();
JBossQueue jBossQueue = new JBossQueue(queueName);
- server.getMessagingServerControl().deployQueue(jBossQueue.getAddress(), jBossQueue.getAddress());
+ server.getMessagingServerControl().deployQueue(jBossQueue.getAddress(), jBossQueue.getAddress(), filterString, durable);
boolean added = bindToJndi(jndiBinding, jBossQueue);
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -22,10 +22,11 @@
package org.jboss.messaging.jms.server.management.impl;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
+import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.core.management.impl.MBeanInfoHelper;
+import org.jboss.messaging.jms.server.JMSServerManager;
+import org.jboss.messaging.jms.server.management.JMSServerControlMBean;
+import org.jboss.messaging.utils.Pair;
import javax.management.ListenerNotFoundException;
import javax.management.MBeanInfo;
@@ -37,13 +38,11 @@
import javax.management.NotificationFilter;
import javax.management.NotificationListener;
import javax.management.StandardMBean;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
-import org.jboss.messaging.core.config.TransportConfiguration;
-import org.jboss.messaging.core.management.impl.MBeanInfoHelper;
-import org.jboss.messaging.jms.server.JMSServerManager;
-import org.jboss.messaging.jms.server.management.JMSServerControlMBean;
-import org.jboss.messaging.utils.Pair;
-
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -385,7 +384,7 @@
public boolean createQueue(final String name, final String jndiBinding) throws Exception
{
- boolean created = server.createQueue(name, jndiBinding);
+ boolean created = server.createQueue(name, jndiBinding, null, true);
if (created)
{
sendNotification(NotificationType.QUEUE_CREATED, name);
Deleted: trunk/src/schemas/jbm-configuration.xsd
===================================================================
--- trunk/src/schemas/jbm-configuration.xsd 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/schemas/jbm-configuration.xsd 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,602 +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="configuration">
- <xsd:complexType>
- <xsd:all>
- <xsd:element ref="clustered" maxOccurs="1"
- minOccurs="0" />
- <xsd:element ref="enable-file-deployment" maxOccurs="1"
- minOccurs="0" />
- <xsd:element ref="enable-persistence" maxOccurs="1"
- minOccurs="0" />
- <xsd:element name="scheduled-thread-pool-max-size"
- type="xsd:int" maxOccurs="1" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
- Maximum number of threads to use for the scheduled thread pool
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="thread-pool-max-size"
- type="xsd:int" maxOccurs="1" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
- Maximum number of threads to use for the thread pool
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="security-enabled" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="security-invalidation-interval"
- type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="wild-card-routing-enabled"
- type="xsd:boolean" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="management-address" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="management-notification-address"
- type="xsd:string" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="management-cluster-password"
- type="xsd:string" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="management-request-timeout"
- type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="jmx-management-enabled"
- type="xsd:boolean" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="message-counter-enabled"
- type="xsd:boolean" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="message-counter-sample-period"
- type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="message-counter-max-day-history"
- type="xsd:positiveInteger" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="connection-scan-period"
- type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="connection-ttl-override"
- type="xsd:long" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="transaction-timeout" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="transaction-timeout-scan-period"
- type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="message-expiry-scan-period"
- type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="message-expiry-thread-priority"
- type="xsd:positiveInteger" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="id-cache-size" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="persist-id-cache" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element ref="remoting-interceptors" maxOccurs="1"
- minOccurs="0">
- </xsd:element>
- <xsd:element name="queue-activation-timeout"
- type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="backup" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="persist-delivery-count-before-delivery" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="allow-route-when-no-bindings" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="backup-connector-ref"
- type="backup-connectorType" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="connector" type="connectorType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="acceptors" maxOccurs="1" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="acceptor" type="acceptorType"
- minOccurs="1" maxOccurs="unbounded">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="broadcast-groups" maxOccurs="1" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="broadcast-group" maxOccurs="unbounded"
- minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="discovery-groups" maxOccurs="1" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="discovery-group" maxOccurs="unbounded"
- minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="diverts" maxOccurs="1" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="divert" type="divertType"
- maxOccurs="unbounded" minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="queues" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="bridges" maxOccurs="1" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="bridge" type="bridgeType"
- maxOccurs="unbounded" minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="cluster-connections" maxOccurs="1" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="cluster-connection" type="clusterConnectionType"
- maxOccurs="unbounded" minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="paging-max-threads" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="paging-directory" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="paging-global-watermark-size" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="paging-max-global-size-bytes"
- type="xsd:unsignedLong" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="bindings-directory" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="create-bindings-dir"
- type="xsd:boolean" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="journal-directory" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="create-journal-dir"
- type="xsd:boolean" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="journal-type" type="journalType"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="journal-buffer-reuse-size"
- type="xsd:long" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="journal-sync-transactional"
- type="xsd:boolean" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="journal-sync-non-transactional"
- type="xsd:boolean" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="journal-file-size" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="journal-min-files" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="journal-max-aio" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <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>
-
- <xsd:element name="clustered" type="xsd:boolean"></xsd:element>
-
- <xsd:element name="enable-file-deployment" type="xsd:boolean"></xsd:element>
-
- <xsd:element name="enable-persistence" type="xsd:boolean"></xsd:element>
-
- <xsd:element name="local-bind-address" type="xsd:string"></xsd:element>
-
- <xsd:element name="local-bind-port" type="portRange"></xsd:element>
-
- <xsd:element name="group-address" type="xsd:string"></xsd:element>
-
- <xsd:element name="group-port" type="portRange"></xsd:element>
-
- <xsd:element name="broadcast-period" type="xsd:unsignedLong"></xsd:element>
-
- <xsd:element name="connector-ref" type="connector-refType">
- </xsd:element>
-
- <xsd:element name="broadcast-group">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="local-bind-port" maxOccurs="1"
- minOccurs="0">
- </xsd:element>
- <xsd:element ref="group-address" maxOccurs="1"
- minOccurs="1">
- </xsd:element>
- <xsd:element ref="group-port" maxOccurs="1"
- minOccurs="1">
- </xsd:element>
- <xsd:element ref="broadcast-period" maxOccurs="1"
- minOccurs="0">
- </xsd:element>
- <xsd:element ref="connector-ref" maxOccurs="unbounded"
- minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="refresh-timeout" type="xsd:unsignedLong"></xsd:element>
-
- <xsd:element name="discovery-group">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="group-address" maxOccurs="1"
- minOccurs="1">
- </xsd:element>
- <xsd:element ref="group-port" maxOccurs="1"
- minOccurs="1">
- </xsd:element>
- <xsd:element ref="refresh-timeout" maxOccurs="1"
- minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="discovery-group-ref">
- <xsd:complexType>
- <xsd:attribute name="discovery-group-name"
- type="xsd:IDREF">
- </xsd:attribute>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="connector-refType">
- <xsd:attribute name="connector-name" type="xsd:IDREF"
- use="required">
- </xsd:attribute>
- <xsd:attribute name="backup-connector-name" type="xsd:IDREF"
- use="optional">
- </xsd:attribute>
- </xsd:complexType>
-
- <xsd:element name="remoting-interceptors">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="class-name" type="xsd:string"
- maxOccurs="unbounded" minOccurs="1">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="paramType">
- <xsd:attribute name="key" type="xsd:string" use="required"></xsd:attribute>
- <xsd:attribute name="value" type="xsd:string" use="required"></xsd:attribute>
- <xsd:attribute name="type" use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="String"></xsd:enumeration>
- <xsd:enumeration value="Integer"></xsd:enumeration>
- <xsd:enumeration value="Long"></xsd:enumeration>
- <xsd:enumeration value="Boolean"></xsd:enumeration>
- <xsd:enumeration value="Float"></xsd:enumeration>
- <xsd:enumeration value="Double"></xsd:enumeration>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- </xsd:complexType>
-
- <xsd:complexType name="connectorType">
- <xsd:sequence>
- <xsd:element name="factory-class" type="xsd:string"
- minOccurs="1" maxOccurs="1">
- </xsd:element>
- <xsd:element name="param" type="paramType"
- maxOccurs="unbounded" minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:complexType name="acceptorType">
- <xsd:sequence>
- <xsd:element name="factory-class" type="xsd:string"
- minOccurs="1" maxOccurs="1">
- </xsd:element>
- <xsd:element name="param" type="paramType"
- maxOccurs="unbounded" minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="optional"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:complexType name="bridgeType">
- <xsd:sequence>
- <xsd:element name="queue-name" type="xsd:IDREF"
- maxOccurs="1" minOccurs="1">
- </xsd:element>
- <xsd:element name="forwarding-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="transformer-class-name" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="retry-interval" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="retry-interval-multiplier"
- type="xsd:double" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="reconnect-attempts"
- type="minusOneOrMoreInteger" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="failover-on-server-shutdown"
- type="xsd:boolean" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="use-duplicate-detection"
- type="xsd:boolean" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:choice>
- <xsd:element name="connector-ref"
- type="connector-refType" minOccurs="1" maxOccurs="1">
- </xsd:element>
- <xsd:element name="discovery-group-ref" minOccurs="1"
- maxOccurs="1">
- <xsd:complexType>
- <xsd:attribute name="discovery-group-name"
- type="xsd:IDREF" use="required">
- </xsd:attribute>
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:complexType name="clusterConnectionType">
- <xsd:sequence>
- <xsd:element name="address" type="xsd:string"
- maxOccurs="1" minOccurs="1">
- </xsd:element>
- <xsd:element name="retry-interval" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="use-duplicate-detection"
- type="xsd:boolean" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="forward-when-no-consumers"
- type="xsd:boolean" maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="max-hops"
- type="xsd:positiveInteger" maxOccurs="1" minOccurs="0">
- </xsd:element>
-
- <xsd:choice>
- <xsd:element name="connector-ref"
- type="connector-refType" minOccurs="1" maxOccurs="unbounded">
- </xsd:element>
- <xsd:element name="discovery-group-ref" minOccurs="1"
- maxOccurs="1">
- <xsd:complexType>
- <xsd:attribute name="discovery-group-name"
- type="xsd:IDREF" use="required">
- </xsd:attribute>
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:complexType name="divertType">
- <xsd:sequence>
- <xsd:element name="routing-name" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="address" type="xsd:string" maxOccurs="1"
- minOccurs="1">
- </xsd:element>
- <xsd:element name="forwarding-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="transformer-class-name" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="exclusive" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:simpleType name="journalType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="ASYNCIO"></xsd:enumeration>
- <xsd:enumeration value="NIO"></xsd:enumeration>
- </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">
- </xsd:attribute>
- </xsd:complexType>
-
- <xsd:simpleType name="portRange">
- <xsd:restriction base="xsd:int">
- <xsd:minExclusive value="1024"></xsd:minExclusive>
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="minusOneOrMoreInteger">
- <xsd:restriction base="xsd:int">
- <xsd:minInclusive value="-1"></xsd:minInclusive>
- </xsd:restriction>
- </xsd:simpleType>
-
-</xsd:schema>
Deleted: trunk/src/schemas/jbm-jms.xsd
===================================================================
--- trunk/src/schemas/jbm-jms.xsd 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/schemas/jbm-jms.xsd 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,152 +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="configuration">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="connection-factory"
- maxOccurs="unbounded" minOccurs="0">
- </xsd:element>
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element ref="queue" maxOccurs="1"
- minOccurs="1">
- </xsd:element>
- <xsd:element ref="topic" maxOccurs="1" minOccurs="1"></xsd:element>
- </xsd:choice>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="connection-factory">
- <xsd:complexType>
- <xsd:all>
- <xsd:element name="connector-ref" type="connector-refType" maxOccurs="1" minOccurs="0"></xsd:element>
- <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element>
- <xsd:element name="discovery-initial-wait" type="xsd:unsignedLong" maxOccurs="1" minOccurs="0"></xsd:element>
-
- <xsd:element name="entries" maxOccurs="1" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="entry" type="entryType"
- maxOccurs="unbounded" minOccurs="1">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="ping-period" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="connection-ttl" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="call-timeout" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="consumer-window-size" type="minusOneOrMoreInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="consumer-max-rate" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="producer-window-size" type="minusOneOrMoreInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="producer-max-rate" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="min-large-message-size" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="client-id" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="dups-ok-batch-size" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="transaction-batch-size" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="block-on-acknowledge" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="send-np-messages-synchronously" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="send-p-messages-synchronously" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="auto-group-id" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="max-connections" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="pre-acknowledge" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="retry-interval" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="retry-interval-multiplier" type="xsd:float"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="reconnect-attempts" type="minusOneOrMoreInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="failover-on-server-shutdown" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="load-balancing-policy-class-name" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="use-global-pools" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="scheduled-thread-pool-max-size" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="thread-pool-max-size" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- </xsd:all>
- <xsd:attribute name="name" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="connector-refType">
- <xsd:attribute name="connector-name" type="xsd:string" use="required"></xsd:attribute>
- <xsd:attribute name="backup-connector-name" type="xsd:string" use="optional"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:complexType name="entryType">
- <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:complexType name="discovery-group-refType">
- <xsd:attribute name="discovery-group-name" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:element name="queue" type="destinationType"></xsd:element>
-
- <xsd:complexType name="destinationType">
- <xsd:sequence>
- <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:element name="topic" type="destinationType"></xsd:element>
-
- <xsd:simpleType name="minusOneOrMoreInteger">
- <xsd:restriction base="xsd:int">
- <xsd:minInclusive value="-1"></xsd:minInclusive>
- </xsd:restriction>
- </xsd:simpleType>
-
-</xsd:schema>
Deleted: trunk/src/schemas/jbm-users.xsd
===================================================================
--- trunk/src/schemas/jbm-users.xsd 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/src/schemas/jbm-users.xsd 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,32 +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="configuration">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="defaultuser" type="userType" maxOccurs="1" minOccurs="0"></xsd:element>
- <xsd:element name="user" type="userType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="role">
- <xsd:complexType>
- <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="userType">
- <xsd:sequence>
- <xsd:element ref="role" maxOccurs="unbounded" minOccurs="1"></xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
- <xsd:attribute name="password" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
Modified: trunk/tests/jms-tests/config/jbm-configuration.xml
===================================================================
--- trunk/tests/jms-tests/config/jbm-configuration.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/jms-tests/config/jbm-configuration.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../../src/schemas/jbm-configuration.xsd">
+ xsi:schemaLocation="urn:jboss:messaging ../../../src/schema/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
Modified: trunk/tests/jms-tests/config/jbm-jms.xml
===================================================================
--- trunk/tests/jms-tests/config/jbm-jms.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/jms-tests/config/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,6 +1,6 @@
<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
Modified: trunk/tests/jms-tests/config/jbm-users.xml
===================================================================
--- trunk/tests/jms-tests/config/jbm-users.xml 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/jms-tests/config/jbm-users.xml 2009-05-13 13:50:35 UTC (rev 6766)
@@ -1,5 +1,5 @@
<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -21,13 +21,13 @@
*/
package org.jboss.test.messaging.tools.container;
+import org.jboss.kernel.plugins.config.property.PropertyKernelConfig;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
@@ -41,24 +41,6 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS;
-
-import java.io.File;
-import java.lang.management.ManagementFactory;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.ObjectName;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularData;
-import javax.naming.InitialContext;
-
-import org.jboss.kernel.plugins.config.property.PropertyKernelConfig;
-import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.management.ObjectNames;
@@ -77,6 +59,18 @@
import org.jboss.messaging.utils.Pair;
import org.jboss.messaging.utils.SimpleString;
+import javax.management.MBeanServerInvocationHandler;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import java.io.File;
+import java.lang.management.ManagementFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -244,7 +238,7 @@
public void createQueue(String name, String jndiName) throws Exception
{
- this.getJMSServerManager().createQueue(name, "/queue/" + (jndiName != null ? jndiName : name));
+ this.getJMSServerManager().createQueue(name, "/queue/" + (jndiName != null ? jndiName : name), null, true);
}
public void createTopic(String name, String jndiName) throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -21,42 +21,7 @@
*/
package org.jboss.messaging.tests.integration.jms.bridge;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PING_PERIOD;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.jms.BytesMessage;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.transaction.TransactionManager;
-
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
@@ -79,6 +44,23 @@
import org.jboss.messaging.tests.unit.util.InVMContext;
import org.jboss.messaging.tests.util.UnitTestCase;
+import javax.jms.BytesMessage;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.transaction.TransactionManager;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
/**
*
* A BridgeTestBase
@@ -177,7 +159,7 @@
{
server = jmsServer1;
}
- server.createQueue(queueName, "/queue/" + queueName);
+ server.createQueue(queueName, "/queue/" + queueName, null, true);
}
protected void tearDown() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -182,7 +182,7 @@
log.info("Restarting server");
jmsServer1.start();
- jmsServer1.createQueue("targetQueue", "queue/targetQueue");
+ jmsServer1.createQueue("targetQueue", "queue/targetQueue", null, true);
createQueue("targetQueue", 1);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -22,6 +22,14 @@
package org.jboss.messaging.tests.integration.jms.cluster.management;
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.jms.JBossQueue;
+import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
+import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
+import org.jboss.messaging.tests.integration.cluster.management.ReplicationAwareTestBase;
+import org.jboss.messaging.tests.integration.jms.server.management.JMSUtil;
+import org.jboss.messaging.tests.integration.jms.server.management.NullInitialContext;
import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createJMSQueueControl;
import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
@@ -32,15 +40,6 @@
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
-import org.jboss.messaging.jms.JBossQueue;
-import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
-import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
-import org.jboss.messaging.tests.integration.cluster.management.ReplicationAwareTestBase;
-import org.jboss.messaging.tests.integration.jms.server.management.JMSUtil;
-import org.jboss.messaging.tests.integration.jms.server.management.NullInitialContext;
-
/**
* A ReplicationAwareQueueControlWrapperTest
*
@@ -323,13 +322,13 @@
liveServerManager.start();
String queueName = randomString();
- liveServerManager.createQueue(queueName, queueName);
- backupServerManager.createQueue(queueName, queueName);
+ liveServerManager.createQueue(queueName, queueName, null, true);
+ backupServerManager.createQueue(queueName, queueName, null, true);
queue = new JBossQueue(queueName);
String otherQueueName = randomString();
- liveServerManager.createQueue(otherQueueName, otherQueueName);
- backupServerManager.createQueue(otherQueueName, otherQueueName);
+ liveServerManager.createQueue(otherQueueName, otherQueueName, null, true);
+ backupServerManager.createQueue(otherQueueName, otherQueueName, null, true);
otherQueue = new JBossQueue(otherQueueName);
Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -21,11 +21,6 @@
*/
package org.jboss.messaging.tests.integration.jms.connection;
-import javax.jms.Connection;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Session;
-
import org.jboss.messaging.core.client.impl.ClientSessionInternal;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
@@ -40,6 +35,11 @@
import org.jboss.messaging.tests.integration.jms.server.management.NullInitialContext;
import org.jboss.messaging.tests.util.UnitTestCase;
+import javax.jms.Connection;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.Session;
+
/**
*
* A ExceptionListenerTest
@@ -72,7 +72,7 @@
jmsServer = new JMSServerManagerImpl(server);
jmsServer.setContext(new NullInitialContext());
jmsServer.start();
- jmsServer.createQueue(Q_NAME, Q_NAME);
+ jmsServer.createQueue(Q_NAME, Q_NAME, null, true);
cf = new JBossConnectionFactory(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"));
cf.setBlockOnPersistentSend(true);
cf.setPreAcknowledge(true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -21,31 +21,6 @@
*/
package org.jboss.messaging.tests.integration.jms.consumer;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PING_PERIOD;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
-
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
@@ -60,6 +35,12 @@
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.utils.SimpleString;
+import javax.jms.Connection;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
@@ -89,7 +70,7 @@
jmsServer = new JMSServerManagerImpl(server);
jmsServer.setContext(new NullInitialContext());
jmsServer.start();
- jmsServer.createQueue(Q_NAME, Q_NAME);
+ jmsServer.createQueue(Q_NAME, Q_NAME, null, true);
cf = new JBossConnectionFactory(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"));
cf.setBlockOnPersistentSend(true);
cf.setPreAcknowledge(true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -22,23 +22,6 @@
package org.jboss.messaging.tests.integration.jms.server.management;
-import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createJMSQueueControl;
-import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
-import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.naming.Context;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
@@ -52,10 +35,25 @@
import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
import org.jboss.messaging.tests.integration.management.ManagementControlHelper;
+import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createJMSQueueControl;
import org.jboss.messaging.tests.integration.management.ManagementTestBase;
import org.jboss.messaging.tests.unit.util.InVMContext;
+import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
+import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
+import static org.jboss.messaging.tests.util.RandomUtil.randomString;
import org.jboss.messaging.utils.SimpleString;
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.naming.Context;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
/**
* A QueueControlTest
*
@@ -342,7 +340,7 @@
JMSQueueControlMBean queueControl = createManagementControl();
String expiryQueueName = randomString();
JBossQueue expiryQueue = new JBossQueue(expiryQueueName);
- serverManager.createQueue(expiryQueueName, expiryQueueName);
+ serverManager.createQueue(expiryQueueName, expiryQueueName, null, true);
queueControl.setExpiryAddress(expiryQueue.getAddress());
JMSQueueControlMBean expiryQueueControl = createJMSQueueControl(expiryQueue, mbeanServer);
@@ -469,7 +467,7 @@
public void testSendMessageToDLQ() throws Exception
{
String deadLetterQueue = randomString();
- serverManager.createQueue(deadLetterQueue, deadLetterQueue);
+ serverManager.createQueue(deadLetterQueue, deadLetterQueue, null, true);
JBossQueue dlq = new JBossQueue(deadLetterQueue);
Connection conn = createConnection();
@@ -526,7 +524,7 @@
{
String otherQueueName = randomString();
- serverManager.createQueue(otherQueueName, otherQueueName);
+ serverManager.createQueue(otherQueueName, otherQueueName, null, true);
JBossQueue otherQueue = new JBossQueue(otherQueueName);
// send on queue
@@ -573,7 +571,7 @@
String filter = "key = " + matchingValue;
String otherQueueName = randomString();
- serverManager.createQueue(otherQueueName, otherQueueName);
+ serverManager.createQueue(otherQueueName, otherQueueName, null, true);
JBossQueue otherQueue = new JBossQueue(otherQueueName);
Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
@@ -608,7 +606,7 @@
{
String otherQueueName = randomString();
- serverManager.createQueue(otherQueueName, otherQueueName);
+ serverManager.createQueue(otherQueueName, otherQueueName, null, true);
JBossQueue otherQueue = new JBossQueue(otherQueueName);
String[] messageIDs = JMSUtil.sendMessages(queue, 1);
@@ -631,7 +629,7 @@
String unknownMessageID = randomString();
String otherQueueName = randomString();
- serverManager.createQueue(otherQueueName, otherQueueName);
+ serverManager.createQueue(otherQueueName, otherQueueName, null, true);
JMSQueueControlMBean queueControl = createManagementControl();
assertEquals(0, queueControl.getMessageCount());
@@ -692,7 +690,7 @@
serverManager.activated();
String queueName = randomString();
- serverManager.createQueue(queueName, queueName);
+ serverManager.createQueue(queueName, queueName, null, true);
queue = new JBossQueue(queueName);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -22,27 +22,10 @@
package org.jboss.messaging.tests.integration.jms.server.management;
-import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS;
-import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createJMSQueueControl;
-import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
-import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import java.util.Map;
-
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.naming.Context;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS;
import org.jboss.messaging.core.management.ResourceNames;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
@@ -56,8 +39,22 @@
import org.jboss.messaging.tests.integration.management.ManagementControlHelper;
import org.jboss.messaging.tests.integration.management.ManagementTestBase;
import org.jboss.messaging.tests.unit.util.InVMContext;
+import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
+import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
+import static org.jboss.messaging.tests.util.RandomUtil.randomString;
import org.jboss.messaging.utils.SimpleString;
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.QueueConnection;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.naming.Context;
+import java.util.Map;
+
/**
*
* A JMSQueueControlUsingJMSTest
@@ -459,7 +456,7 @@
public void testSendMessageToDLQ() throws Exception
{
String deadLetterQueue = randomString();
- serverManager.createQueue(deadLetterQueue, deadLetterQueue);
+ serverManager.createQueue(deadLetterQueue, deadLetterQueue, null, true);
JBossQueue dlq = new JBossQueue(deadLetterQueue);
Connection conn = createConnection();
@@ -516,7 +513,7 @@
{
String otherQueueName = randomString();
- serverManager.createQueue(otherQueueName, otherQueueName);
+ serverManager.createQueue(otherQueueName, otherQueueName, null, true);
JBossQueue otherQueue = new JBossQueue(otherQueueName);
// send on queue
@@ -562,7 +559,7 @@
String filter = "key = " + matchingValue;
String otherQueueName = randomString();
- serverManager.createQueue(otherQueueName, otherQueueName);
+ serverManager.createQueue(otherQueueName, otherQueueName, null, true);
JBossQueue otherQueue = new JBossQueue(otherQueueName);
Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
@@ -597,7 +594,7 @@
{
String otherQueueName = randomString();
- serverManager.createQueue(otherQueueName, otherQueueName);
+ serverManager.createQueue(otherQueueName, otherQueueName, null, true);
JBossQueue otherQueue = new JBossQueue(otherQueueName);
String[] messageIDs = JMSUtil.sendMessages(queue, 1);
@@ -620,7 +617,7 @@
String unknownMessageID = randomString();
String otherQueueName = randomString();
- serverManager.createQueue(otherQueueName, otherQueueName);
+ serverManager.createQueue(otherQueueName, otherQueueName, null, true);
assertEquals(0, proxy.retrieveAttributeValue("MessageCount"));
@@ -681,7 +678,7 @@
serverManager.activated();
String queueName = randomString();
- serverManager.createQueue(queueName, queueName);
+ serverManager.createQueue(queueName, queueName, null, true);
queue = new JBossQueue(queueName);
JBossConnectionFactory cf = new JBossConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName()));
@@ -696,7 +693,7 @@
ResourceNames.JMS_QUEUE + queue.getQueueName());
String expiryQueueName = randomString();
- serverManager.createQueue(expiryQueueName, expiryQueueName);
+ serverManager.createQueue(expiryQueueName, expiryQueueName, null, true);
expiryQueue = new JBossQueue(expiryQueueName);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java 2009-05-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -106,7 +106,7 @@
proxy.invokeOperation("deployQueue", address, name, filter, durable);
}
- public void deployQueue(String address, String name) throws Exception
+ public void deployQueue(String address, String name, String filterString) throws Exception
{
proxy.invokeOperation("deployQueue", address, name);
}
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-13 13:45:26 UTC (rev 6765)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueDeployerTest.java 2009-05-13 13:50:35 UTC (rev 6766)
@@ -22,9 +22,6 @@
package org.jboss.messaging.tests.unit.core.deployers.impl;
-import java.util.ArrayList;
-import java.util.List;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.cluster.QueueConfiguration;
import org.jboss.messaging.core.deployers.DeploymentManager;
@@ -34,6 +31,9 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* A QueueDeployerTest
*
@@ -179,7 +179,7 @@
configs.add(config);
}
- public void deployQueue(String address, String name) throws Exception
+ public void deployQueue(String address, String name, String filterString) throws Exception
{
// TODO Auto-generated method stub
More information about the jboss-cvs-commits
mailing list