[jboss-cvs] JBossAS SVN: r60312 - in trunk/server/src/main/org/jboss/metadata: web and 1 other directory.

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

Author: remy.maucherat at jboss.com
Date: 2007-02-05 16:55:05 -0500 (Mon, 05 Feb 2007)
New Revision: 60312

Modified:
   trunk/server/src/main/org/jboss/metadata/WebMetaData.java
   trunk/server/src/main/org/jboss/metadata/web/ErrorPage.java
   trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
Log:
- Fix error pages for exception types.
- Fix parsing of form-login-config.

Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-02-05 21:21:49 UTC (rev 60311)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-02-05 21:55:05 UTC (rev 60312)
@@ -106,7 +106,7 @@
    protected List<WebSecurityMetaData> securityConstraints =
       new ArrayList<WebSecurityMetaData>();
    protected LoginConfig loginConfig;
-   protected HashMap<String, ErrorPage> errorPages = new HashMap<String, ErrorPage>();
+   protected List<ErrorPage> errorPages = new ArrayList<ErrorPage>();
    protected List<String> dependencies = new ArrayList<String>();
    protected ReplicationConfig replicationConfig;
    protected PassivationConfig passivationConfig;
@@ -444,12 +444,12 @@
    
    public Collection getErrorPages()
    {
-      return errorPages.values();
+      return errorPages;
    }
 
    public void addErrorPage(ErrorPage errorPage)
    {
-      errorPages.put(errorPage.getErrorCode(), errorPage);
+      errorPages.add(errorPage);
    }
    
    public Collection getMessageDestinations()

Modified: trunk/server/src/main/org/jboss/metadata/web/ErrorPage.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/ErrorPage.java	2007-02-05 21:21:49 UTC (rev 60311)
+++ trunk/server/src/main/org/jboss/metadata/web/ErrorPage.java	2007-02-05 21:55:05 UTC (rev 60312)
@@ -32,8 +32,6 @@
  */
 public class ErrorPage
 {
-   private static final Logger log = Logger.getLogger(ErrorPage.class);
-   
    protected String errorCode;
    protected String location;
    protected String exceptionType;

Modified: trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java	2007-02-05 21:21:49 UTC (rev 60311)
+++ trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java	2007-02-05 21:55:05 UTC (rev 60312)
@@ -238,6 +238,17 @@
       return child;
    }
 
+   public Object newChild(LoginConfig config, UnmarshallingContext navigator,
+         String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+      if (localName.equals("form-login-config"))
+      {
+         child = new FormLoginConfig();
+      }
+      return child;
+   }
+
    public Object newChild(WebSecurityMetaData constraint,
          UnmarshallingContext navigator, String namespaceURI, String localName,
          Attributes attrs)