Update of taglib definition

src/java/org/jivesoftware/admin/ContentBoxTag.java

+package org.jivesoftware.admin;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+import java.io.IOException;
+
+public class ContentBoxTag extends BodyTagSupport {
+
+    private String title;
+
+    @Override
+    public int doEndTag() throws JspException
+    {
+        final String body = "<div class=\"jive-contentBoxHeader\">" +
+            title +
+        "</div>\n" +
+        "<div class=\"jive-contentBox\">" +
+            bodyContent.getString() +
+        "</div>\n";
+
+        try {
+            pageContext.getOut().write( body );
+        }
+        catch (IOException ioe) {
+            throw new JspException(ioe.getMessage());
+        }
+
+        return super.doEndTag();
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setTitle( String title )
+    {
+        this.title = title;
+    }
+}

src/web/WEB-INF/admin.tld

-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-    "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>1.0</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>Tag Library for Openfire 2.0</shortname>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
+    <description>Tab Library for Openfire Admin Console</description>
+    <display-name>Admin Console Tags</display-name>
+    <tlib-version>2.0</tlib-version>
+    <short-name>admin</short-name>
     <uri>admin</uri>
-	<info>Tab Library for Openfire Admin Console</info>
 	<tag>
 		<name>tabs</name>
-		<tagclass>org.jivesoftware.admin.TabsTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-		<info />
+		<tag-class>org.jivesoftware.admin.TabsTag</tag-class>
+        <body-content>JSP</body-content>
         <attribute>
             <name>css</name>
             <required>false</required>
@@ -42,9 +40,8 @@
     </tag>
     <tag>
         <name>subnavbar</name>
-        <tagclass>org.jivesoftware.admin.SubnavTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-        <info />
+        <tag-class>org.jivesoftware.admin.SubnavTag</tag-class>
+        <body-content>JSP</body-content>
         <attribute>
             <name>css</name>
             <required>false</required>
@@ -68,9 +65,8 @@
     </tag>
     <tag>
 		<name>sidebar</name>
-		<tagclass>org.jivesoftware.admin.SidebarTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-		<info />
+		<tag-class>org.jivesoftware.admin.SidebarTag</tag-class>
+        <body-content>JSP</body-content>
         <attribute>
             <name>css</name>
             <required>false</required>
@@ -99,9 +95,8 @@
 	</tag>
 	<tag>
 		<name>subsidebar</name>
-		<tagclass>org.jivesoftware.admin.SubSidebarTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-		<info />
+		<tag-class>org.jivesoftware.admin.SubSidebarTag</tag-class>
+        <body-content>JSP</body-content>
         <attribute>
             <name>css</name>
             <required>false</required>
@@ -123,11 +118,20 @@
             <rtexprvalue>true</rtexprvalue>
         </attribute>
 	</tag>
+    <tag>
+        <name>contentBox</name>
+        <tag-class>org.jivesoftware.admin.ContentBoxTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>title</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
     <tag>
         <name>infobox</name>
-        <tagclass>org.jivesoftware.admin.InfoboxTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-        <info />
+        <tag-class>org.jivesoftware.admin.InfoboxTag</tag-class>
+        <body-content>JSP</body-content>
         <attribute>
             <name>type</name>
             <required>true</required>
@@ -136,9 +140,8 @@
     </tag>
     <tag>
         <name>ASN1DER</name>
-        <tagclass>org.jivesoftware.admin.ASN1DERTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-        <info />
+        <tag-class>org.jivesoftware.admin.ASN1DERTag</tag-class>
+        <body-content>JSP</body-content>
         <attribute>
             <name>value</name>
             <required>true</required>