[jboss-cvs] JBossAS SVN: r58025 - trunk/server/src/main/org/jboss/deployment

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

Author: scott.stark at jboss.org
Date: 2006-11-02 16:15:24 -0500 (Thu, 02 Nov 2006)
New Revision: 58025

Modified:
   trunk/server/src/main/org/jboss/deployment/EARStructure.java
   trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java
Log:
Remove the hard-coded getRelativeOrder override and instead set the default from the ctor.

Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-11-02 21:12:47 UTC (rev 58024)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java	2006-11-02 21:15:24 UTC (rev 58025)
@@ -55,10 +55,13 @@
     */
    private VirtualFileFilter earLibFilter = DEFAULT_EAR_LIB_FILTER;
 
-   @Override
-   public int getRelativeOrder()
+   /**
+    * Set the relative order to 1000 by default
+    *
+    */   
+   public EARStructure()
    {
-      return 1000;
+      setRelativeOrder(1000);
    }
 
    /**

Modified: trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java	2006-11-02 21:12:47 UTC (rev 58024)
+++ trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java	2006-11-02 21:15:24 UTC (rev 58025)
@@ -38,9 +38,14 @@
    /** The name of the application descriptor in the deployment context metadata path */
    private String appXmlPath = "jboss-app.xml";
 
+   /**
+    * Set the relative order to PARSER_DEPLOYER+1 by default
+    *
+    */   
    public JBossAppParsingDeployer()
    {
       super(J2eeApplicationMetaData.class);
+      setRelativeOrder(PARSER_DEPLOYER+1);
    }
 
    /**
@@ -77,16 +82,6 @@
    }
 
    /**
-    * Overriden to order this deployer after the AppParsingDeployer
-    * @return PARSER_DEPLOYER+1
-    */
-   @Override
-   public int getRelativeOrder()
-   {
-      return PARSER_DEPLOYER+1;
-   }
-
-   /**
     * Return J2eeApplicationObjectFactory as our ObjectModelFactory.
     * @return a new J2eeApplicationObjectFactory instance
     */