[jboss-cvs] JBossAS SVN: r58772 - trunk/server/src/main/org/jboss/metadata/web

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

Author: remy.maucherat at jboss.com
Date: 2006-11-30 11:04:49 -0500 (Thu, 30 Nov 2006)
New Revision: 58772

Modified:
   trunk/server/src/main/org/jboss/metadata/web/Servlet.java
   trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
Log:
- Parse init-param inside a filter element.
- Default for load on startup should be -1.

Modified: trunk/server/src/main/org/jboss/metadata/web/Servlet.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/Servlet.java	2006-11-30 14:49:57 UTC (rev 58771)
+++ trunk/server/src/main/org/jboss/metadata/web/Servlet.java	2006-11-30 16:04:49 UTC (rev 58772)
@@ -25,7 +25,7 @@
    private String clazz;
    private String jspFile;
    private HashMap initParams = new HashMap();
-   private int loadOnStartup;
+   private int loadOnStartup = -1;
    private RunAs runAs;
    private HashMap<String, SecurityRoleRefMetaData> securityRoleRefs =
       new HashMap<String, SecurityRoleRefMetaData>();

Modified: trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java	2006-11-30 14:49:57 UTC (rev 58771)
+++ trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java	2006-11-30 16:04:49 UTC (rev 58772)
@@ -194,6 +194,17 @@
       return child;
    }
 
+   public Object newChild(Filter filter, UnmarshallingContext navigator,
+         String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+      if (localName.equals("init-param"))
+      {
+         child = new NameValuePair();
+      }
+      return child;
+   }
+
    public Object newChild(WebSecurityMetaData constraint,
          UnmarshallingContext navigator, String namespaceURI, String localName,
          Attributes attrs)