[jboss-cvs] JBossAS SVN: r75201 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/web and 1 other directories.

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

Author: emuckenhuber
Date: 2008-06-30 03:38:40 -0400 (Mon, 30 Jun 2008)
New Revision: 75201

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/TomcatDeployer_testConfweb24.xml
Log:
[JBMETA-67] merging loadOnStartup

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java	2008-06-30 07:02:44 UTC (rev 75200)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java	2008-06-30 07:38:40 UTC (rev 75201)
@@ -41,12 +41,14 @@
    implements MergeableMetaData<ServletMetaData>
 {
    private static final long serialVersionUID = 1;
+   
+   private static final int loadOnStartupDefault = -1;
 
    private String servletClass;
    private String jspFile;
    /** The servlet init-params */
    private List<ParamValueMetaData> initParam;
-   private int loadOnStartup = -1;
+   private int loadOnStartup = loadOnStartupDefault;
    private RunAsMetaData runAs;
    /** The security role ref */
    private SecurityRoleRefsMetaData securityRoleRefs;
@@ -132,9 +134,9 @@
          setInitParam(override.initParam);
       else if(original != null && original.initParam != null)
          setInitParam(original.initParam);
-      if(override != null && override.loadOnStartup > 0)
+      if(override != null && override.loadOnStartup != loadOnStartupDefault)
          setLoadOnStartup(override.loadOnStartup);
-      else if(original != null && original.loadOnStartup > 0)
+      else if(original != null && original.loadOnStartup != loadOnStartupDefault)
          setLoadOnStartup(original.loadOnStartup);
       if(override != null && override.runAs != null)
          setRunAs(override.runAs);

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java	2008-06-30 07:02:44 UTC (rev 75200)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java	2008-06-30 07:38:40 UTC (rev 75201)
@@ -42,7 +42,7 @@
  * as done in the TomcatDeployer
  *
  * @author Scott.Stark at jboss.org
- * @version $Revision: $
+ * @version $Revision$
  */
 public class TomcatDeployerUnitTestCase extends TestCase
 {
@@ -69,6 +69,8 @@
       assertEquals("TomcatDeployer_confweb.xml", dg.getDescription());
       assertEquals("web-app_2_4", webApp.getId());
       assertEquals("2.4", webApp.getVersion());
+      assertNotNull(webApp.getServletByName("default"));
+      assertEquals(0, webApp.getServletByName("default").getLoadOnStartup());
    }
    public void testConfweb25() throws Exception
    {

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/TomcatDeployer_testConfweb24.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/TomcatDeployer_testConfweb24.xml	2008-06-30 07:02:44 UTC (rev 75200)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/TomcatDeployer_testConfweb24.xml	2008-06-30 07:38:40 UTC (rev 75201)
@@ -110,7 +110,7 @@
          <param-name>listings</param-name>
          <param-value>false</param-value>
       </init-param>
-      <load-on-startup>1</load-on-startup>
+      <load-on-startup>0</load-on-startup>
    </servlet>