svn commit: r958038 - /openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java

[djencks]

Author: djencks
Date: Fri Jun 25 17:15:13 2010
New Revision: 958038

URL: http://svn.apache.org/viewvc?rev=958038&view=rev
Log:
OPENEJB-1298 convert web 2.3 xml to modern schema

Modified:
    
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java

Modified: 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java?rev=958038&r1=958037&r2=958038&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java
 Fri Jun 25 17:15:13 2010
@@ -126,8 +126,8 @@ public class WebApp implements WebCommon
     @XmlElement(name = "welcome-file-list")
     protected List<WelcomeFileList> welcomeFileList;
     //in web-app-2.3.dtd, not in any schema
-    @XmlElement(name = "taglib")
-    protected List<Taglib> taglib;
+//    @XmlElement(name = "taglib")
+//    protected List<Taglib> taglib;
     @XmlElement(name = "error-page")
     protected List<ErrorPage> errorPage;
     @XmlElement(name = "jsp-config")
@@ -595,11 +595,17 @@ public class WebApp implements WebCommon
     }
 
     //compatibility with web-app-2.3.dtd
-    public List<Taglib> getTaglib() {
-        return taglib;
+    @XmlElement(name = "taglib")
+    public Taglib getTaglib() {
+        return null;
     }
 
-    public void setTaglib(List<Taglib> taglib) {
-        this.taglib = taglib;
+    public void setTaglib(Taglib taglib) {
+        List<JspConfig> jspConfigs = getJspConfig();
+        if (jspConfigs.isEmpty()) {
+            jspConfigs.add(new JspConfig());
+        }
+        jspConfigs.get(0).getTaglib().add(taglib);
     }
+
 }