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

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

Author: scott.stark at jboss.org
Date: 2007-11-07 01:44:20 -0500 (Wed, 07 Nov 2007)
New Revision: 66809

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
Log:
Correct jsp-config, login-config to single valued elements

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2007-11-07 06:09:13 UTC (rev 66808)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2007-11-07 06:44:20 UTC (rev 66809)
@@ -99,9 +99,9 @@
    private FiltersMetaData filters;
    private List<FilterMappingMetaData> filterMappings;
    private List<ErrorPageMetaData> errorPages;
-   private List<JspConfigMetaData> jspConfig;
+   private JspConfigMetaData jspConfig;
    private List<ListenerMetaData> listeners;
-   private List<LoginConfigMetaData> loginConfig;
+   private LoginConfigMetaData loginConfig;
    private List<MimeMappingMetaData> mimeMappings;
    private List<ServletMappingMetaData> servletMappings;
    private List<SecurityConstraintMetaData> securityContraints;
@@ -342,11 +342,11 @@
       this.errorPages = errorPages;
    }
 
-   public List<JspConfigMetaData> getJspConfig()
+   public JspConfigMetaData getJspConfig()
    {
       return jspConfig;
    }
-   public void setJspConfig(List<JspConfigMetaData> jspConfig)
+   public void setJspConfig(JspConfigMetaData jspConfig)
    {
       this.jspConfig = jspConfig;
    }
@@ -371,11 +371,11 @@
       this.localEncodings = localEncodings;
    }
 
-   public List<LoginConfigMetaData> getLoginConfig()
+   public LoginConfigMetaData getLoginConfig()
    {
       return loginConfig;
    }
-   public void setLoginConfig(List<LoginConfigMetaData> loginConfig)
+   public void setLoginConfig(LoginConfigMetaData loginConfig)
    {
       this.loginConfig = loginConfig;
    }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java	2007-11-07 06:09:13 UTC (rev 66808)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java	2007-11-07 06:44:20 UTC (rev 66809)
@@ -1,6 +1,5 @@
 package org.jboss.metadata.web.spec;
 
-import java.util.Collections;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
@@ -39,11 +38,11 @@
 
    public List<TaglibMetaData> getTaglibs()
    {
-      List<JspConfigMetaData> jspConfigs = super.getJspConfig();
+      JspConfigMetaData jspConfig = super.getJspConfig();
       List<TaglibMetaData> taglibs = null;
-      if (jspConfigs != null && jspConfigs.size() > 0)
+      if (jspConfig != null)
       {
-         taglibs = jspConfigs.get(0).getTaglibs();
+         taglibs = jspConfig.getTaglibs();
       }
       return taglibs;
    }
@@ -56,7 +55,6 @@
    {
       JspConfigMetaData jspConfig = new JspConfigMetaData();
       jspConfig.setTaglibs(taglibs);
-      List<JspConfigMetaData> jspConfigs = Collections.singletonList(jspConfig);
-      super.setJspConfig(jspConfigs);
+      super.setJspConfig(jspConfig);
    }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java	2007-11-07 06:09:13 UTC (rev 66808)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java	2007-11-07 06:44:20 UTC (rev 66809)
@@ -75,9 +75,9 @@
    private FiltersMetaData filters;
    private List<FilterMappingMetaData> filterMappings;
    private List<ErrorPageMetaData> errorPages;
-   private List<JspConfigMetaData> jspConfig;
+   private JspConfigMetaData jspConfig;
    private List<ListenerMetaData> listeners;
-   private List<LoginConfigMetaData> loginConfig;
+   private LoginConfigMetaData loginConfig;
    private List<MimeMappingMetaData> mimeMappings;
    private ServletsMetaData servlets;
    private List<ServletMappingMetaData> servletMappings;
@@ -209,11 +209,11 @@
       this.errorPages = errorPages;
    }
 
-   public List<JspConfigMetaData> getJspConfig()
+   public JspConfigMetaData getJspConfig()
    {
       return jspConfig;
    }
-   public void setJspConfig(List<JspConfigMetaData> jspConfig)
+   public void setJspConfig(JspConfigMetaData jspConfig)
    {
       this.jspConfig = jspConfig;
    }
@@ -238,11 +238,11 @@
       this.localEncodings = localEncodings;
    }
 
-   public List<LoginConfigMetaData> getLoginConfig()
+   public LoginConfigMetaData getLoginConfig()
    {
       return loginConfig;
    }
-   public void setLoginConfig(List<LoginConfigMetaData> loginConfig)
+   public void setLoginConfig(LoginConfigMetaData loginConfig)
    {
       this.loginConfig = loginConfig;
    }

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml	2007-11-07 06:09:13 UTC (rev 66808)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml	2007-11-07 06:44:20 UTC (rev 66809)
@@ -114,10 +114,6 @@
       <listener-class>listener0.class</listener-class>
    </listener>
 
-    <login-config id="login-config-BASIC">
-       <auth-method>BASIC</auth-method>
-       <realm-name>login-config0-realm-name</realm-name>
-    </login-config>
     <login-config id="login-config-FORM">
        <auth-method>FORM</auth-method>
        <form-login-config>