[jboss-cvs] JBossAS SVN: r101652 - in projects/metadata/web/trunk/src: main/java/org/jboss/metadata/web/spec and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 1 06:33:09 EST 2010
Author: remy.maucherat at jboss.com
Date: 2010-03-01 06:33:09 -0500 (Mon, 01 Mar 2010)
New Revision: 101652
Modified:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java
projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java
projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java
projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java
projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/TomcatDeployer_testConfweb25.xml
Log:
- Add back load-on-startup as a String.
- It is actually forbidden with Servlet 2.4, but it was added back in 2.5 (and I had missed that).
- JBMETA-259.
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java 2010-03-01 08:29:14 UTC (rev 101651)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java 2010-03-01 11:33:09 UTC (rev 101652)
@@ -75,7 +75,7 @@
servletName = webServlet.name();
servlet.setServletName(servletName);
if (webServlet.loadOnStartup() >= 0)
- servlet.setLoadOnStartup(webServlet.loadOnStartup());
+ servlet.setLoadOnStartupInt(webServlet.loadOnStartup());
servlet.setAsyncSupported(webServlet.asyncSupported());
if (webServlet.initParams() != null)
{
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2010-03-01 08:29:14 UTC (rev 101651)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2010-03-01 11:33:09 UTC (rev 101652)
@@ -56,7 +56,8 @@
private String jspFile;
/** The servlet init-params */
private List<ParamValueMetaData> initParam;
- private int loadOnStartup = loadOnStartupDefault;
+ private String loadOnStartup = null;
+ private int loadOnStartupInt = loadOnStartupDefault;
private boolean loadOnStartupSet = false;
private RunAsMetaData runAs;
/** The security role ref */
@@ -101,14 +102,28 @@
{
this.jspFile = jspFile;
}
- public int getLoadOnStartup()
+ public int getLoadOnStartupInt()
{
+ return loadOnStartupInt;
+ }
+ public void setLoadOnStartupInt(int loadOnStartup)
+ {
+ this.loadOnStartupInt = loadOnStartup;
+ loadOnStartupSet = true;
+ }
+ public String getLoadOnStartup()
+ {
return loadOnStartup;
}
- public void setLoadOnStartup(int loadOnStartup)
+ @XmlElement(name="load-on-startup", nillable=true)
+ public void setLoadOnStartup(String loadOnStartup)
{
this.loadOnStartup = loadOnStartup;
- loadOnStartupSet = true;
+ try {
+ setLoadOnStartupInt(Integer.parseInt(loadOnStartup));
+ } catch (NumberFormatException e) {
+ setLoadOnStartupInt(0);
+ }
}
public RunAsMetaData getRunAs()
{
@@ -176,10 +191,10 @@
setInitParam(override.initParam);
else if(original != null && original.initParam != null)
setInitParam(original.initParam);
- if(override != null && override.loadOnStartup != loadOnStartupDefault)
- setLoadOnStartup(override.loadOnStartup);
- else if(original != null && original.loadOnStartup != loadOnStartupDefault)
- setLoadOnStartup(original.loadOnStartup);
+ if(override != null && override.loadOnStartupInt != loadOnStartupDefault)
+ setLoadOnStartupInt(override.loadOnStartupInt);
+ else if(original != null && original.loadOnStartupInt != loadOnStartupDefault)
+ setLoadOnStartupInt(original.loadOnStartupInt);
if(override != null && override.runAs != null)
setRunAs(override.runAs);
else if(original != null && original.runAs != null)
Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java 2010-03-01 08:29:14 UTC (rev 101651)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java 2010-03-01 11:33:09 UTC (rev 101652)
@@ -273,14 +273,14 @@
assertNotNull(servlet2);
assertEquals("servlet2", servlet2.getId());
assertEquals("org.jboss.test.web.servlets.ClasspathServlet", servlet2.getServletClass());
- assertEquals(1, servlet2.getLoadOnStartup());
+ assertEquals(1, servlet2.getLoadOnStartupInt());
// servlet10
JBossServletMetaData servlet10 = jbossWeb.getServletByName("EJBOnStartupServlet");
assertNotNull(servlet10);
assertEquals("servlet10", servlet10.getId());
assertEquals("EJBOnStartupServlet", servlet10.getServletName());
assertEquals("org.jboss.test.web.servlets.EJBOnStartupServlet", servlet10.getServletClass());
- assertEquals(1, servlet10.getLoadOnStartup());
+ assertEquals(1, servlet10.getLoadOnStartupInt());
List<ParamValueMetaData> s10params = servlet10.getInitParam();
assertEquals(1, s10params.size());
ParamValueMetaData s10p0 = s10params.get(0);
Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java 2010-03-01 08:29:14 UTC (rev 101651)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java 2010-03-01 11:33:09 UTC (rev 101652)
@@ -70,7 +70,7 @@
assertEquals("web-app_2_4", webApp.getId());
assertEquals("2.4", webApp.getVersion());
assertNotNull(webApp.getServletByName("default"));
- assertEquals(0, webApp.getServletByName("default").getLoadOnStartup());
+ assertEquals(0, webApp.getServletByName("default").getLoadOnStartupInt());
}
public void testConfweb25() throws Exception
{
Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java 2010-03-01 08:29:14 UTC (rev 101651)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java 2010-03-01 11:33:09 UTC (rev 101652)
@@ -108,7 +108,7 @@
assertEquals("servlet"+count, servlet.getId());
assertEquals("servlet"+count+"-name", servlet.getServletName());
assertEquals("servlet"+count+".class", servlet.getServletClass());
- assertEquals(1, servlet.getLoadOnStartup());
+ assertEquals(1, servlet.getLoadOnStartupInt());
assertEquals("run-as-role"+count, servlet.getRunAs().getRoleName());
List<ParamValueMetaData> params = servlet.getInitParam();
assertEquals(2, params.size());
Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java 2010-03-01 08:29:14 UTC (rev 101651)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java 2010-03-01 11:33:09 UTC (rev 101652)
@@ -131,7 +131,7 @@
assertEquals("servlet"+count, servlet.getId());
assertEquals("servlet"+count+"-name", servlet.getServletName());
assertEquals("servlet"+count+".class", servlet.getServletClass());
- assertEquals(1, servlet.getLoadOnStartup());
+ assertEquals(1, servlet.getLoadOnStartupInt());
assertEquals("run-as-role"+count, servlet.getRunAs().getRoleName());
List<ParamValueMetaData> params = servlet.getInitParam();
assertEquals(2, params.size());
Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java 2010-03-01 08:29:14 UTC (rev 101651)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java 2010-03-01 11:33:09 UTC (rev 101652)
@@ -137,7 +137,7 @@
assertEquals("servlet"+count, servlet.getId());
assertEquals("servlet"+count+"-name", servlet.getServletName());
assertEquals("servlet"+count+".class", servlet.getServletClass());
- assertEquals(1, servlet.getLoadOnStartup());
+ assertEquals(1, servlet.getLoadOnStartupInt());
assertEquals("run-as-role"+count, servlet.getRunAs().getRoleName());
List<ParamValueMetaData> params = servlet.getInitParam();
assertEquals(2, params.size());
Modified: projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/TomcatDeployer_testConfweb25.xml
===================================================================
--- projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/TomcatDeployer_testConfweb25.xml 2010-03-01 08:29:14 UTC (rev 101651)
+++ projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/TomcatDeployer_testConfweb25.xml 2010-03-01 11:33:09 UTC (rev 101652)
@@ -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/>
</servlet>
More information about the jboss-cvs-commits
mailing list