[jboss-cvs] JBoss Messaging SVN: r6320 - in trunk: examples/jms/clustered-queue/config and 15 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Apr 6 09:18:14 EDT 2009


Author: timfox
Date: 2009-04-06 09:18:14 -0400 (Mon, 06 Apr 2009)
New Revision: 6320

Modified:
   trunk/examples/jms/browser/config/jbm-configuration.xml
   trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml
   trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml
   trunk/examples/jms/dead-letter/config/jbm-configuration.xml
   trunk/examples/jms/durable-subscription/config/jbm-configuration.xml
   trunk/examples/jms/expiry/config/jbm-configuration.xml
   trunk/examples/jms/large-message/config/jbm-configuration.xml
   trunk/examples/jms/paging/config/jbm-configuration.xml
   trunk/examples/jms/queue-requestor/config/jbm-configuration.xml
   trunk/examples/jms/queue/config/jbm-configuration.xml
   trunk/examples/jms/request-reply/config/jbm-configuration.xml
   trunk/examples/jms/temp-queue/config/jbm-configuration.xml
   trunk/examples/jms/topic-selector/config/jbm-configuration.xml
   trunk/examples/jms/topic/config/jbm-configuration.xml
   trunk/examples/jms/transactional/config/jbm-configuration.xml
   trunk/src/config/jbm-configuration.xml
   trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
Log:
more tweaks

Modified: trunk/examples/jms/browser/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/browser/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/browser/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml
===================================================================
--- trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml
===================================================================
--- trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/dead-letter/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/dead-letter/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/dead-letter/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/durable-subscription/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/durable-subscription/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/durable-subscription/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/expiry/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/expiry/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/expiry/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/large-message/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/large-message/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/large-message/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/paging/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/paging/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/paging/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/queue/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/queue/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/queue-requestor/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-requestor/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/queue-requestor/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/request-reply/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/request-reply/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/request-reply/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/temp-queue/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/temp-queue/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/temp-queue/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/topic/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/topic/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/topic-selector/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/topic-selector/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/examples/jms/transactional/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/transactional/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/examples/jms/transactional/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>
+      <management-notification-address>jbm.notifications</management-notification-address>
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/src/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
@@ -15,7 +15,7 @@
       <wild-card-routing-enabled>true</wild-card-routing-enabled>
 
       <management-address>jbm.management</management-address>
-      <management-notification-address>jbm.admin.notification</management-notification-address>      
+      <management-notification-address>jbm.notifications</management-notification-address>      
 
       <!-- true to expose JBoss Messaging resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>

Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java	2009-04-06 13:18:14 UTC (rev 6320)
@@ -105,7 +105,7 @@
 
    public static final SimpleString DEFAULT_MANAGEMENT_ADDRESS = new SimpleString("jbm.management");
 
-   public static final SimpleString DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS = new SimpleString("jbm.admin.notification");
+   public static final SimpleString DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS = new SimpleString("jbm.notifications");
 
    public static final String DEFAULT_MANAGEMENT_CLUSTER_PASSWORD = "CHANGE ME!!";
 

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java	2009-04-06 13:11:27 UTC (rev 6319)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java	2009-04-06 13:18:14 UTC (rev 6320)
@@ -774,7 +774,7 @@
 
       ClientSession sess = sf.createSession(false, true, true);
 
-      sess.createQueue("jbm.admin.notification", "notifqueue", false);
+      sess.createQueue("jbm.notifications", "notifqueue", false);
 
       ClientConsumer cons = sess.createConsumer("notifqueue");
 




More information about the jboss-cvs-commits mailing list