[jboss-cvs] JBoss Messaging SVN: r4504 - in trunk: src/main/org/jboss/messaging/core/deployers/impl and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: ataylor
Date: 2008-06-17 10:47:59 -0400 (Tue, 17 Jun 2008)
New Revision: 4504

Modified:
   trunk/src/main/org/jboss/messaging/core/deployers/Deployer.java
   trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java
   trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java
   trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityManagerDeployer.java
   trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java
   trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/DeployerTest.java
Log:
removed deployer ordering as order now imposed by the micro container

Modified: trunk/src/main/org/jboss/messaging/core/deployers/Deployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/Deployer.java	2008-06-17 14:44:52 UTC (rev 4503)
+++ trunk/src/main/org/jboss/messaging/core/deployers/Deployer.java	2008-06-17 14:47:59 UTC (rev 4504)
@@ -21,10 +21,10 @@
    */
 package org.jboss.messaging.core.deployers;
 
-import java.net.URL;
-
 import org.jboss.messaging.core.server.MessagingComponent;
 
+import java.net.URL;
+
 /**
  * abstract class that helps with deployment of messaging components.
  *
@@ -61,10 +61,4 @@
     * @throws Exception .
     */
    void undeploy(URL url) throws Exception;
-
-   /**
-    * the order of the deployer, used for ordering the order that deployers are deployed.
-    * @return the order
-    */
-   int getOrder();
 }
\ No newline at end of file

Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java	2008-06-17 14:44:52 UTC (rev 4503)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java	2008-06-17 14:47:59 UTC (rev 4504)
@@ -127,11 +127,6 @@
       return "queues.xml";
    }
 
-   public int getOrder()
-   {
-      return 1;
-   }
-
    /**
     * undeploys an element
     * @param node the element to undeploy

Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java	2008-06-17 14:44:52 UTC (rev 4503)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java	2008-06-17 14:47:59 UTC (rev 4504)
@@ -153,9 +153,4 @@
    {
       return QUEUES_XML;
    }
-
-   public int getOrder()
-   {
-      return 1;
-   }
 }

Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityManagerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityManagerDeployer.java	2008-06-17 14:44:52 UTC (rev 4503)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityManagerDeployer.java	2008-06-17 14:47:59 UTC (rev 4504)
@@ -78,11 +78,6 @@
       return "jbm-security.xml";
    }
 
-   public int getOrder()
-   {
-      return 1;
-   }
-
    public void setJbmSecurityManager(JBMUpdateableSecurityManager jbmSecurityManager)
    {
       this.jbmSecurityManager = jbmSecurityManager;

Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java	2008-06-17 14:44:52 UTC (rev 4503)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java	2008-06-17 14:47:59 UTC (rev 4504)
@@ -241,9 +241,6 @@
    public abstract void undeploy(Node node)
            throws Exception;
 
-
-   abstract public int getOrder();
-
    protected Element getRootElement(URL url)
            throws Exception
    {

Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java	2008-06-17 14:44:52 UTC (rev 4503)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java	2008-06-17 14:47:59 UTC (rev 4504)
@@ -230,9 +230,4 @@
       return "jbm-jndi.xml";
    }
 
-   public int getOrder()
-   {
-      return 2;
-   }
-
 }

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/DeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/DeployerTest.java	2008-06-17 14:44:52 UTC (rev 4503)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/DeployerTest.java	2008-06-17 14:47:59 UTC (rev 4504)
@@ -243,10 +243,5 @@
       {
          return element;
       }
-
-      public int getOrder()
-      {
-         return 0;
-      }
    }
 }