[jboss-cvs] JBoss Messaging SVN: r6749 - in trunk: examples/javaee/hajndi/config and 81 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue May 12 15:51:09 EDT 2009


Author: ataylor
Date: 2009-05-12 15:51:09 -0400 (Tue, 12 May 2009)
New Revision: 6749

Modified:
   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-jms.xml
   trunk/examples/jms/application-layer-failover/server0/jbm-users.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-jms.xml
   trunk/examples/jms/automatic-failover/server0/jbm-users.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-jms.xml
   trunk/examples/jms/bridge/server0/jbm-users.xml
   trunk/examples/jms/bridge/server1/jbm-jms.xml
   trunk/examples/jms/bridge/server1/jbm-users.xml
   trunk/examples/jms/browser/server0/jbm-jms.xml
   trunk/examples/jms/browser/server0/jbm-users.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-jms.xml
   trunk/examples/jms/client-side-load-balancing/server0/jbm-users.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-jms.xml
   trunk/examples/jms/client-side-load-balancing/server2/jbm-users.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-jms.xml
   trunk/examples/jms/clustered-durable-subscription/server1/jbm-users.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-jms.xml
   trunk/examples/jms/clustered-queue/server1/jbm-users.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-jms.xml
   trunk/examples/jms/clustered-topic/server1/jbm-users.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-jms.xml
   trunk/examples/jms/dead-letter/server0/jbm-users.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-jms.xml
   trunk/examples/jms/divert/server0/jbm-users.xml
   trunk/examples/jms/divert/server1/jbm-jms.xml
   trunk/examples/jms/divert/server1/jbm-users.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-jms.xml
   trunk/examples/jms/expiry/server0/jbm-users.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-jms.xml
   trunk/examples/jms/instantiate-connection-factory/server0/jbm-users.xml
   trunk/examples/jms/interceptor/server0/jbm-jms.xml
   trunk/examples/jms/interceptor/server0/jbm-users.xml
   trunk/examples/jms/jmx/server0/jbm-jms.xml
   trunk/examples/jms/jmx/server0/jbm-users.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-jms.xml
   trunk/examples/jms/last-value-queue/server0/jbm-users.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-jms.xml
   trunk/examples/jms/management/server0/jbm-users.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-jms.xml
   trunk/examples/jms/message-group/server0/jbm-users.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-jms.xml
   trunk/examples/jms/no-consumer-buffering/server0/jbm-users.xml
   trunk/examples/jms/paging/server0/jbm-jms.xml
   trunk/examples/jms/paging/server0/jbm-users.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-jms.xml
   trunk/examples/jms/producer-rate-limit/server0/jbm-users.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-jms.xml
   trunk/examples/jms/queue-message-redistribution/server1/jbm-users.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-jms.xml
   trunk/examples/jms/queue-selector/server0/jbm-users.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-jms.xml
   trunk/examples/jms/reconnect-same-node/server0/jbm-users.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-jms.xml
   trunk/examples/jms/scheduled-message/server0/jbm-users.xml
   trunk/examples/jms/security/server0/jbm-jms.xml
   trunk/examples/jms/security/server0/jbm-users.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-jms.xml
   trunk/examples/jms/static-selector/server0/jbm-users.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-jms.xml
   trunk/examples/jms/symmetric-cluster/server1/jbm-users.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-jms.xml
   trunk/examples/jms/symmetric-cluster/server3/jbm-users.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-jms.xml
   trunk/examples/jms/symmetric-cluster/server5/jbm-users.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-jms.xml
   trunk/examples/jms/topic-hierarchies/server0/jbm-users.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-jms.xml
   trunk/examples/jms/topic-selector-example2/server0/jbm-users.xml
   trunk/examples/jms/topic/server0/jbm-jms.xml
   trunk/examples/jms/topic/server0/jbm-users.xml
   trunk/examples/jms/transactional/server0/jbm-jms.xml
   trunk/examples/jms/transactional/server0/jbm-users.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-jms.xml
   trunk/examples/jms/xa-receive/server0/jbm-users.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-jms.xml
   trunk/examples/jms/xa-with-jta/server0/jbm-users.xml
   trunk/src/config/jboss-as/clustered/jbm-jms.xml
   trunk/src/config/jboss-as/non-clustered/jbm-jms.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-jms.xml
   trunk/src/config/stand-alone/non-clustered/jbm-users.xml
   trunk/src/schemas/jbm-jms.xsd
   trunk/src/schemas/jbm-users.xsd
   trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml
   trunk/tests/jms-tests/config/jbm-jms.xml
   trunk/tests/jms-tests/config/jbm-users.xml
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/XMLDeployerTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/util/XMLUtilTest.java
Log:
updated user and jms config to have base element of configuration

Modified: trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -13,4 +13,4 @@
    <queue name="testQueue">
       <entry name="/queue/testQueue"/>
    </queue>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/javaee/hajndi/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/hajndi/config/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/javaee/hajndi/config/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -9,4 +9,4 @@
          <entry name="XAConnectionFactory"/>
       </entries>
    </connection-factory>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/javaee/jca-config/server-config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/jca-config/server-config/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/javaee/jca-config/server-config/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <connection-factory name="ConnectionFactory">
@@ -15,4 +15,4 @@
    <queue name="B">
       <entry name="/queue/B"/>
    </queue>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/javaee/jms-bridge/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/config/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/javaee/jms-bridge/config/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -16,4 +16,4 @@
    <queue name="target">
       <entry name="/queue/target"/>
    </queue>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/javaee/mdb/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/mdb/config/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/javaee/mdb/config/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -13,4 +13,4 @@
    <queue name="testQueue">
       <entry name="/queue/testQueue"/>
    </queue>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/javaee/servlet-transport/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/servlet-transport/config/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/javaee/servlet-transport/config/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -12,4 +12,4 @@
    <queue name="testQueue">
       <entry name="/queue/testQueue"/>
    </queue>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/javaee/xarecovery/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/xarecovery/config/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/javaee/xarecovery/config/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -13,4 +13,4 @@
    <queue name="testQueue">
       <entry name="/queue/testQueue"/>
    </queue>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/application-layer-failover/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/application-layer-failover/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/automatic-failover/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/automatic-failover/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/automatic-failover/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/automatic-failover/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/automatic-failover/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/automatic-failover/server1/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/automatic-failover/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/automatic-failover/server1/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/bridge/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/bridge/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/sausage-factory"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/bridge/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/bridge/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</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-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/bridge/server1/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/mincing-machine"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/bridge/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/bridge/server1/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</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-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/browser/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</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-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/browser/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/client-kickoff/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/client-kickoff/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -10,4 +10,4 @@
    </connection-factory>
    
    <!-- the example does not use any queue -->
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/client-kickoff/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/client-kickoff/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

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-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

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-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</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-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

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-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

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-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

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-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/clustered-durable-subscription/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/clustered-durable-subscription/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</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-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-queue/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/clustered-queue/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-queue/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/clustered-queue/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-queue/server1/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/clustered-queue/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-queue/server1/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/clustered-topic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-topic/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/clustered-topic/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-topic/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</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-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-topic/server1/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/clustered-topic/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/clustered-topic/server1/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/consumer-rate-limit/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/consumer-rate-limit/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -19,4 +19,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/consumer-rate-limit/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/consumer-rate-limit/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/dead-letter/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/dead-letter/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -19,4 +19,4 @@
       <entry name="/queue/deadLetterQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/dead-letter/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/dead-letter/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/delayed-redelivery/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/delayed-redelivery/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -19,4 +19,4 @@
       <entry name="/queue/deadLetterQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/delayed-redelivery/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/delayed-redelivery/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/divert/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/divert/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/divert/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
             
@@ -33,4 +33,4 @@
       <entry name="/topic/spyTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/divert/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/divert/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/divert/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/divert/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/divert/server1/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/divert/server1/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
             
@@ -19,4 +19,4 @@
       <entry name="/topic/newYorkPriceUpdates"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/divert/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/divert/server1/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/divert/server1/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/durable-subscription/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/durable-subscription/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/durable-subscription/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/durable-subscription/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/expiry/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/expiry/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -19,4 +19,4 @@
       <entry name="/queue/expiryQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/expiry/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/expiry/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/http-transport/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/http-transport/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/http-transport/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/http-transport/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/instantiate-connection-factory/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/instantiate-connection-factory/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    
@@ -7,4 +7,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/instantiate-connection-factory/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/instantiate-connection-factory/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/interceptor/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/interceptor/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/interceptor/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/interceptor/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/jmx/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/jmx/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/jmx/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/jmx/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/large-message/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/large-message/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/large-message/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/large-message/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/last-value-queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/last-value-queue/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -13,4 +13,4 @@
    <queue name="lastValueQueue">
       <entry name="/queue/lastValueQueue"/>
    </queue>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/last-value-queue/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/last-value-queue/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/management/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/management/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -13,4 +13,4 @@
    <queue name="exampleQueue">
       <entry name="/queue/exampleQueue"/>
    </queue>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/management/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/management/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/management-notifications/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/management-notifications/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -13,4 +13,4 @@
    <queue name="exampleQueue">
       <entry name="/queue/exampleQueue"/>
    </queue>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/management-notifications/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/management-notifications/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-security.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/message-counters/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/message-counters/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -19,4 +19,4 @@
       <entry name="/queue/expiryQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/message-counters/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/message-counters/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/message-group/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/message-group/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/message-group/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/message-group/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/message-group/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/message-group/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/message-priority/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/message-priority/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/message-priority/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/message-priority/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/no-consumer-buffering/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/no-consumer-buffering/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -19,4 +19,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/no-consumer-buffering/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/no-consumer-buffering/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/paging/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/paging/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -18,4 +18,4 @@
       <entry name="/queue/pagingQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/paging/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/paging/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/pre-acknowledge/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/pre-acknowledge/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/producer-rate-limit/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/producer-rate-limit/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -19,4 +19,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/producer-rate-limit/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/producer-rate-limit/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/queue/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/queue/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/queue/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/queue-message-redistribution/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/queue-message-redistribution/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/queue-requestor/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/queue-requestor/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/queue-requestor/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/queue-requestor/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/queue-selector/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/queue-selector/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/queue-selector/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/queue-selector/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
             
@@ -40,4 +40,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/reconnect-same-node/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
@@ -8,4 +8,4 @@
       you don't want to do this in real life -->
       <role name="admin"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/request-reply/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/request-reply/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/request-reply/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/request-reply/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/scheduled-message/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/scheduled-message/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/scheduled-message/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/scheduled-message/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/security/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/security/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/security/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -23,4 +23,4 @@
       <entry name="/topic/usTopic"/>
    </topic>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/security/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/security/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/security/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    
    <user name="bill" password="jbossmessaging">
@@ -21,5 +21,5 @@
       <role name="user"/>
    </user>
 
-</deployment>
+</configuration>
 

Modified: trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/ssl-enabled/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/static-selector/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/static-selector/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/selectorQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/static-selector/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/static-selector/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
             
@@ -19,4 +19,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
             
@@ -19,4 +19,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server1/jbm-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server2/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    
@@ -19,4 +19,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server2/jbm-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server3/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
             
@@ -19,4 +19,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server3/jbm-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server4/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -19,4 +19,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server4/jbm-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server5/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -19,4 +19,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/symmetric-cluster/server5/jbm-users.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/temp-queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/temp-queue/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/temp-queue/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/temp-queue/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/topic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/topic/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/topic/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/topic/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/topic-hierarchies/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/topic-hierarchies/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -35,4 +35,4 @@
       <entry name="/topic/news.europe.entertainment"/>
    </topic>
 
-</deployment>
+</configuration>

Modified: trunk/examples/jms/topic-hierarchies/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/topic-hierarchies/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/topic-selector-example1/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/topic/exampleTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/topic-selector-example2/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/transactional/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/transactional/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/transactional/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/transactional/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/xa-heuristic/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/xa-receive/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/xa-receive/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/xa-receive/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/xa-receive/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/xa-send/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/xa-send/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/xa-send/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/xa-send/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/xa-with-jta/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/xa-with-jta/server0/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
    <!--the connection factory used by the example-->
@@ -14,4 +14,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/examples/jms/xa-with-jta/server0/jbm-users.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/examples/jms/xa-with-jta/server0/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/src/config/jboss-as/clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/src/config/jboss-as/clustered/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -27,4 +27,4 @@
       <entry name="/queue/ExpiryQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/src/config/jboss-as/non-clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/src/config/jboss-as/non-clustered/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -17,4 +17,4 @@
       <entry name="/queue/ExpiryQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/src/config/stand-alone/clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/src/config/stand-alone/clustered/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -27,4 +27,4 @@
       <entry name="/queue/ExpiryQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/src/config/stand-alone/clustered/jbm-users.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/src/config/stand-alone/clustered/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/src/config/stand-alone/non-clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/src/config/stand-alone/non-clustered/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -18,4 +18,4 @@
       <entry name="/queue/ExpiryQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/src/config/stand-alone/non-clustered/jbm-users.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/src/config/stand-alone/non-clustered/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,7 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
    </defaultuser>
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/src/schemas/jbm-jms.xsd
===================================================================
--- trunk/src/schemas/jbm-jms.xsd	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/src/schemas/jbm-jms.xsd	2009-05-12 19:51:09 UTC (rev 6749)
@@ -7,7 +7,7 @@
    attributeFormDefault="unqualified"
    version="1.0">
    
-   <xsd:element name="deployment">
+   <xsd:element name="configuration">
    	<xsd:complexType>
    		<xsd:sequence>
    			<xsd:element ref="connection-factory"

Modified: trunk/src/schemas/jbm-users.xsd
===================================================================
--- trunk/src/schemas/jbm-users.xsd	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/src/schemas/jbm-users.xsd	2009-05-12 19:51:09 UTC (rev 6749)
@@ -7,7 +7,7 @@
    attributeFormDefault="unqualified"
    version="1.0">
    
-   <xsd:element name="deployment">
+   <xsd:element name="configuration">
    	<xsd:complexType>
    		<xsd:sequence>
             <xsd:element name="defaultuser" type="userType" maxOccurs="1" minOccurs="0"></xsd:element>

Modified: trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml
===================================================================
--- trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-jms.xsd ">
 
@@ -45,4 +45,4 @@
       <entry name="/topic/fullConfigurationTopic"/>
    </topic>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/tests/jms-tests/config/jbm-jms.xml
===================================================================
--- trunk/tests/jms-tests/config/jbm-jms.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/tests/jms-tests/config/jbm-jms.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" 
+<configuration xmlns="urn:jboss:messaging"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
@@ -13,4 +13,4 @@
       </entries>
    </connection-factory>
 
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/tests/jms-tests/config/jbm-users.xml
===================================================================
--- trunk/tests/jms-tests/config/jbm-users.xml	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/tests/jms-tests/config/jbm-users.xml	2009-05-12 19:51:09 UTC (rev 6749)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
@@ -7,4 +7,4 @@
    <!--<user name="admin" password="admin">
       <role name="admin"/>
    </user>-->
-</deployment>
\ No newline at end of file
+</configuration>
\ No newline at end of file

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java	2009-05-12 19:51:09 UTC (rev 6749)
@@ -22,12 +22,6 @@
 
 package org.jboss.messaging.tests.integration.jms.server;
 
-import java.net.URL;
-
-import javax.jms.Queue;
-import javax.jms.Topic;
-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;
@@ -44,6 +38,11 @@
 import org.jboss.messaging.tests.util.ServiceTestBase;
 import org.w3c.dom.Element;
 
+import javax.jms.Queue;
+import javax.jms.Topic;
+import javax.naming.Context;
+import java.net.URL;
+
 /**
  * A JMSServerDeployerTest
  *
@@ -77,7 +76,7 @@
    {
       JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager, config);
 
-      String xml = "<deployment xmlns='urn:jboss:messaging'> " + "</deployment>";
+      String xml = "<configuration xmlns='urn:jboss:messaging'> " + "</configuration>";
 
       Element rootNode = org.jboss.messaging.utils.XMLUtil.stringToElement(xml);
       deployer.validate(rootNode);

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java	2009-05-12 19:51:09 UTC (rev 6749)
@@ -22,12 +22,6 @@
 
 package org.jboss.messaging.tests.unit.core.deployers.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.jboss.messaging.core.deployers.DeploymentManager;
 import org.jboss.messaging.core.deployers.impl.BasicUserCredentialsDeployer;
 import org.jboss.messaging.core.security.CheckType;
@@ -38,6 +32,12 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * tests BasicUserCredentialsDeployer
  *
@@ -49,19 +49,19 @@
    
    FakeJBMUpdateableSecurityManager securityManager;
 
-   private static final String simpleSecurityXml = "<deployment>\n" +
+   private static final String simpleSecurityXml = "<configuration>\n" +
                                                    "<defaultuser name=\"guest\" password=\"guest\">\n" +
                                                    "      <role name=\"guest\"/>\n" +
                                                    "   </defaultuser>" +
-                                                   "</deployment>";
+                                                   "</configuration>";
 
-   private static final String singleUserXml = "<deployment>\n" +
+   private static final String singleUserXml = "<configuration>\n" +
                                                "      <user name=\"guest\" password=\"guest\">\n" +
                                                "         <role name=\"guest\"/>\n" +
                                                "      </user>\n" +
-                                               "</deployment>";
+                                               "</configuration>";
 
-   private static final String multipleUserXml = "<deployment>\n" +
+   private static final String multipleUserXml = "<configuration>\n" +
                                                  "      <user name=\"guest\" password=\"guest\">\n" +
                                                  "         <role name=\"guest\"/>\n" +
                                                  "         <role name=\"foo\"/>\n" +
@@ -71,7 +71,7 @@
                                                  "         <role name=\"foo\"/>\n" +
                                                  "         <role name=\"bar\"/>\n" +
                                                  "      </user>\n" +
-                                                 "</deployment>";
+                                                 "</configuration>";
 
    protected void setUp() throws Exception
    {

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/XMLDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/XMLDeployerTest.java	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/XMLDeployerTest.java	2009-05-12 19:51:09 UTC (rev 6749)
@@ -38,29 +38,29 @@
  */
 public class XMLDeployerTest extends UnitTestCase
 {
-   private static final String conf1 = "<deployment>\n" + "   <test name=\"test1\">content1</test>\n"
+   private static final String conf1 = "<configuration>\n" + "   <test name=\"test1\">content1</test>\n"
                                        + "   <test name=\"test2\">content2</test>\n"
                                        + "   <test name=\"test3\">content3</test>\n"
                                        + "   <test name=\"test4\">content4</test>\n"
-                                       + "</deployment>";
+                                       + "</configuration>";
 
-   private static final String conf2 = "<deployment>\n" + "   <test name=\"test1\">content1</test>\n"
+   private static final String conf2 = "<configuration>\n" + "   <test name=\"test1\">content1</test>\n"
                                        + "   <test name=\"test2\">contenthaschanged2</test>\n"
                                        + "   <test name=\"test3\">contenthaschanged3</test>\n"
                                        + "   <test name=\"test4\">content4</test>\n"
-                                       + "</deployment>";
+                                       + "</configuration>";
 
-   private static final String conf3 = "<deployment>\n" + "   <test name=\"test1\">content1</test>\n"
+   private static final String conf3 = "<configuration>\n" + "   <test name=\"test1\">content1</test>\n"
                                        + "   <test name=\"test2\">contenthaschanged2</test>\n"
-                                       + "</deployment>";
+                                       + "</configuration>";
 
-   private static final String conf4 = "<deployment>\n" + "   <test name=\"test1\">content1</test>\n"
+   private static final String conf4 = "<configuration>\n" + "   <test name=\"test1\">content1</test>\n"
                                        + "   <test name=\"test2\">content2</test>\n"
                                        + "   <test name=\"test3\">content3</test>\n"
                                        + "   <test name=\"test4\">content4</test>\n"
                                        + "   <test name=\"test5\">content5</test>\n"
                                        + "   <test name=\"test6\">content6</test>\n"
-                                       + "</deployment>";
+                                       + "</configuration>";
 
    private URL url;
 

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/XMLUtilTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/XMLUtilTest.java	2009-05-12 19:43:17 UTC (rev 6748)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/XMLUtilTest.java	2009-05-12 19:51:09 UTC (rev 6749)
@@ -230,22 +230,22 @@
 
    public void testReplaceSystemProperties()
    {
-      String before = "<deployment>\n" +
+      String before = "<configuration>\n" +
            "   <test name=\"${sysprop1}\">content1</test>\n" +
            "   <test name=\"test2\">content2</test>\n" +
            "   <test name=\"test3\">content3</test>\n" +
            "   <test name=\"test4\">${sysprop2}</test>\n" +
            "   <test name=\"test5\">content5</test>\n" +
            "   <test name=\"test6\">content6</test>\n" +
-           "</deployment>";
-      String after = "<deployment>\n" +
+           "</configuration>";
+      String after = "<configuration>\n" +
            "   <test name=\"test1\">content1</test>\n" +
            "   <test name=\"test2\">content2</test>\n" +
            "   <test name=\"test3\">content3</test>\n" +
            "   <test name=\"test4\">content4</test>\n" +
            "   <test name=\"test5\">content5</test>\n" +
            "   <test name=\"test6\">content6</test>\n" +
-           "</deployment>";
+           "</configuration>";
       System.setProperty("sysprop1", "test1");
       System.setProperty("sysprop2", "content4");
       String replaced = org.jboss.messaging.utils.XMLUtil.replaceSystemProps(before);




More information about the jboss-cvs-commits mailing list