Taglib changes for servlet 2.4

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@553 b35dd754-fafc-0310-a699-88a17e54d16e

src/web/audit-policy.jsp

@@ -16,8 +16,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
@@ -112,7 +111,8 @@
 %>
 
 <p>
-<fmt:message key="title" bundle="${lang}" /> can audit XMPP traffic on the server and save
+<fmt:message key="title" />
+can audit XMPP traffic on the server and save
 the data to XML data files. The amount of data sent via an XMPP server can be substantial.
 Messenger provides several settings to control whether to audit packets, how
 audit files are created, and the types of packets to save. In most cases, logging

src/web/breadcrumbs.jsp

-<%@ taglib uri="core" prefix="c"%>
-<%--
-  - $RCSfile$
-  - $Revision$
-  - $Date$
---%>
-<c:set var="title" value="${pageScope.title}" />
-<c:set var="bc" value="${pageScope.bc}" />
-<c:set var="admin" value="${pageScope.admin}" />
-
-<div class="jive-admin-page-title">
-<c:set var="sbar" value="${pageScope.ignorebreadcrumbs}" />
-<c:set var="image" value="${pageScope.image}" />
-<c:if test="${!sbar}">
-  <table cellpadding="2" cellspacing="0" border="0" width="100%">
-  <tr>
-      <td valign="bottom"   align="left">
-        <span class="jive-breadcrumbs">
-        
-        <c:set var="count" value="1" />
-        <c:forEach var="row" items="${admin.breadCrumbs}" >
-        <c:set var="name" value="${row.key}" />
-        <c:set var="value" value="${row.value}" />
-        
-        <c:choose>
-          <c:when test="${count < admin.breadcrumbSize}" >
-             <a style="text-decoration: underline;" href="<c:out value="${value}" />"><c:out value="${name}" /></a>
-           &raquo;
-          </c:when>
-        <c:otherwise>
-           <c:out value="${name}" />
-        </c:otherwise>
-        </c:choose>
-        <c:set var="count" value="${count+1}" />
-       
-          
-      </c:forEach>        
-</span>
-      </td>
-  </tr>
-  </table>
-</c:if>
-</div>
-

src/web/chatroom-history-settings.jsp

@@ -18,8 +18,8 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
@@ -104,7 +104,7 @@
 
 <p>
 Chatrooms can replay conversation histories to provide context to new members joining a room.
-<fmt:message key="short.title" bundle="${lang}" /> provides several options for controlling how
+<fmt:message key="short.title" /> provides several options for controlling how
 much history to store for each room.
 </p>
 

src/web/group-create.jsp

@@ -26,7 +26,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
 <jsp:useBean id="errors" class="java.util.HashMap" />

src/web/group-delete.jsp

@@ -16,7 +16,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <% webManager.init(request, response, session, application, out ); %>

src/web/group-properties.jsp

@@ -20,7 +20,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 

src/web/group-summary.jsp

@@ -17,7 +17,7 @@
                  org.jivesoftware.messenger.group.*"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
 <% webManager.init(request, response, session, application, out ); %>

src/web/header.jsp

-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -10,7 +10,7 @@
 
 <html>
 <head>
-    <title><fmt:message key="title" bundle="${lang}" /> Admin</title>
+    <title><fmt:message key="title" /> Admin</title>
     <meta http-equiv="content-type" content="text/html; charset=">
     <script language="JavaScript" type="text/javascript">
     <!-- // code for window popups

src/web/index.jsp

@@ -20,8 +20,8 @@
 
 %>
 
-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <%-- Define page bean for header and sidebar --%>
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
@@ -119,7 +119,7 @@ some of the server settings. Some settings can not be changed.
             Server Name:
         </td>
         <td class="c2">
-            <c:out value="${webManager.serverInfo.name}" />
+            ${webManager.serverInfo.name}
         </td>
     </tr>
     <c:if test="${!empty webManager.multiUserChatServer}">
@@ -128,7 +128,7 @@ some of the server settings. Some settings can not be changed.
                 Group Chat Service Name:
             </td>
             <td class="c2">
-                <c:out value="${webManager.multiUserChatServer.serviceName}" />
+                ${webManager.multiUserChatServer.serviceName}
             </td>
         </tr>
     </c:if>
@@ -147,7 +147,7 @@ some of the server settings. Some settings can not be changed.
                 <%= i %>: IP:Port, Security:
             </td>
             <td class="c2">
-                <c:out value="${port.IPAddress}" />:<c:out value="${port.port}" />,
+                ${port.IPAddress}:${port.port},
                 <c:choose>
                     <c:when test="${empty port.securityType}">
                         NORMAL

src/web/license-details.jsp

-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -12,6 +10,9 @@
                  java.util.Map,
                  org.jivesoftware.util.*" %>
 
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+
 <%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
@@ -22,8 +23,6 @@
 <c:set target="${breadcrumbs}" property="Home" value="index.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="license-details.jsp" />
 <jsp:include page="top.jsp" flush="true" />
-  
-
 
 <%  // Get parameters
     String licenseText = ParamUtils.getParameter(request,"licenseText");
@@ -46,12 +45,12 @@
 %>
 
 <p>
-The following is a summary of your <fmt:message key="short.title" bundle="${lang}" /> license.
+The following is a summary of your <fmt:message key="short.title" /> license.
 </p>
 
 
 <table class="box" cellpadding="3" cellspacing="1" border="0" width="600">
-<tr class="tableHeaderBlue"><td colspan="2" align="center"><fmt:message key="short.title" bundle="${lang}" /> License Details</td></tr>
+<tr class="tableHeaderBlue"><td colspan="2" align="center"><fmt:message key="short.title" /> License Details</td></tr>
 <tr>
     <td class="jive-label">
         License Type:

src/web/login.jsp

@@ -19,13 +19,12 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
-<c:set var="admin" value="${admin}" />
 
 <%! // List of allowed usernames:
     static Map allowedUsernames = null;

src/web/logviewer.jsp

@@ -20,7 +20,7 @@
                  org.jivesoftware.admin.AdminPageBean"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 

src/web/muc-create-permission.jsp

@@ -18,7 +18,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
 <% admin.init(request, response, session, application, out ); %>

src/web/muc-history-settings.jsp

@@ -18,8 +18,8 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
 
 <%!  // Global vars and methods:
 
@@ -99,7 +99,7 @@
 
 <p>
 Group Chat rooms can replay conversation histories to provide context to new members joining a room.
-<fmt:message key="short.title" bundle="${lang}"/> provides several options for controlling how much
+<fmt:message key="short.title"/> provides several options for controlling how much
 history to store for each room.
 </p>
 

src/web/muc-server-props-edit-form.jsp

@@ -19,7 +19,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <%
    // Handle a cancel

src/web/muc-sysadmins.jsp

@@ -17,7 +17,7 @@
                  java.util.Iterator"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
 <% admin.init(request, response, session, application, out ); %>

src/web/muc-tasks.jsp

@@ -18,7 +18,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
 <% admin.init(request, response, session, application, out ); %>

src/web/offline-messages.jsp

@@ -20,8 +20,8 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" scope="page" />
 <% admin.init(request, response, session, application, out ); %>
@@ -187,7 +187,7 @@
 XMPP provides the option for servers to store-and-forward IM messages when they sent to a user that
 is not logged in. Supporting store-and-forward of 'offline messages' can be a very convenient
 feature of an XMPP deployment. However, offline messages, like email, can take up a significant
-amount of space on a server. <fmt:message key="title" bundle="${lang}" /> provides the option to handle offline messages in a
+amount of space on a server. <fmt:message key="title" /> provides the option to handle offline messages in a
 variety of ways. Select the offline message handling strategy that best suites your needs.
 </p>
 

src/web/private-data-settings.jsp

@@ -16,7 +16,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>

src/web/reg-settings.jsp

@@ -16,7 +16,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
@@ -63,7 +63,7 @@ Use the forms below to change various aspects of user registration and login.
 
 <form action="reg-settings.jsp">
 
-<c:if test="${success}" >
+<c:if test="success" >
 
     <div class="jive-success">
     <table cellpadding="0" cellspacing="0" border="0">

src/web/server-db.jsp

@@ -16,7 +16,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 

src/web/server-props.jsp

@@ -19,15 +19,14 @@
                  org.jivesoftware.messenger.JiveGlobals"
 %>
 
-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 
 <%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
-<c:set var="admin" value="${admin.manager}" />
 
 <%
     // Get parameters

src/web/server-status.jsp

@@ -19,8 +19,8 @@
                  org.jivesoftware.admin.AdminPageBean"
 %>
 
-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 
@@ -38,7 +38,7 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Below is the status of your <fmt:message key="short.title" bundle="${lang}" /> server.
+Below is the status of your <fmt:message key="short.title" /> server.
 </p>
 
 

src/web/session-conflict.jsp

@@ -9,8 +9,8 @@
   - a copy of which is included in this distribution.
 --%>
 
-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <%@ page import="org.jivesoftware.util.*,
                  java.util.Iterator,
@@ -88,7 +88,7 @@
 %>
 
 <p>
-<fmt:message key="title" bundle="${lang}" /> allows multiple logins to the same user account by assigning a unique "resource name"
+<fmt:message key="title" /> allows multiple logins to the same user account by assigning a unique "resource name"
 to each connection. If a connection requests a resource name that is already in use, the server must
 decide how to handle the conflict. The options on this page allow you to determine if the server
 always kicks off existing connections, never kicks off existing connections, or sets the number of

src/web/session-details.jsp

@@ -19,7 +19,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 

src/web/session-summary.jsp

@@ -18,7 +18,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>

src/web/setup-admin-settings.jsp

-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -22,6 +20,9 @@
                  org.jivesoftware.messenger.auth.spi.DbAuthProvider,
                  org.jivesoftware.messenger.user.spi.UserManagerImpl" %>
 
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+
 <%! // Global vars, methods, etc
     void setSetupFinished(HttpSession session) {
         JiveGlobals.setXMLProperty("setup","true");
@@ -181,7 +182,7 @@ function checkClick() {
          value="<%= ((password!=null) ? password : "") %>">
         <span class="jive-description">
         <br>
-        If this is a new <fmt:message key="short.title" bundle="${lang}" /> installation, the current password will be <b>admin</b>.
+        If this is a new <fmt:message key="short.title" /> installation, the current password will be <b>admin</b>.
         </span>
         <%  if (errors.get("password") != null) { %>
             <span class="jive-error-text">

src/web/setup-completed.jsp

-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -10,7 +10,7 @@
 
 <html>
 <head>
-	<title><fmt:message key="short.title" bundle="${lang}" /> Setup</title>
+	<title><fmt:message key="short.title" /> Setup</title>
 
 	<link rel="stylesheet" type="text/css" href="setup-style.css">
 </head>
@@ -21,7 +21,7 @@
 <table cellpadding="8" cellspacing="0" border="0" width="100%">
 <tr>
     <td width="99%">
-        <fmt:message key="short.title" bundle="${lang}" /> Setup
+        <fmt:message key="short.title" /> Setup
     </td>
     <td width="1%" nowrap>
         <font size="-2" face="arial,helvetica,sans-serif" color="#ffffff">
@@ -57,7 +57,7 @@
 
         <p>
         It appears setup has already been run. To administer your community, please use the
-        <a href="index.jsp"><fmt:message key="short.title" bundle="${lang}" /> Admin Tool</a>. To re-run
+        <a href="index.jsp"><fmt:message key="short.title" /> Admin Tool</a>. To re-run
         setup, you need to stop your appserver, delete the "setup" property from the
         jive-messenger.xml file, restart Messenger then reload the setup tool.
         </p>

src/web/setup-datasource-jndi.jsp

-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -78,7 +78,7 @@ Datasource Settings - JNDI Connection
 </p>
 
 <p>
-Choose a JNDI datasource below to connect to the <fmt:message key="short.title" bundle="${lang}" /> database.
+Choose a JNDI datasource below to connect to the <fmt:message key="short.title" /> database.
 The name varies between application servers, but it is generally of the form:
 <tt>java:comp/env/jdbc/[DataSourceName]</tt>. Please consult your application server's
 documentation for more information.

src/web/setup-datasource-settings.jsp

-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -71,7 +71,7 @@ Datasource Settings
 </p>
 
 <p>
-Choose how you would like to connect to the <fmt:message key="short.title" bundle="${lang}" /> database.
+Choose how you would like to connect to the <fmt:message key="short.title" /> database.
 </p>
 
 <%  if (errors.size() > 0) { %>

src/web/setup-datasource-standard.jsp

-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -154,7 +154,7 @@ Datasource Settings - Standard Connection
 
 <p>
 Specify a JDBC driver and connection properties to connect to your database. If you need more
-information about this process please see the database documentation distributed with <fmt:message key="title" bundle="${lang}" />.
+information about this process please see the database documentation distributed with <fmt:message key="title" />.
 </p>
 
 <p>

src/web/setup-env-check.jspf

-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -69,21 +67,21 @@
 %>
         <html>
         <head>
-            <title><fmt:message key="title" bundle="${lang}" /> Setup</title>
+            <title><fmt:message key="title" /> Setup</title>
             <link rel="stylesheet" type="text/css" href="style.css">
         </head>
         <body>
 
         <p class="jive-setup-page-header">
-        <fmt:message key="title" bundle="${lang}" /> Setup
+        <fmt:message key="title" /> Setup
         </p>
 
         <p class="jive-setup-error-text">
-        Error: Can not proceed with <fmt:message key="title" bundle="${lang}" /> setup.
+        Error: Can not proceed with <fmt:message key="title" /> setup.
         </p>
 
         <p>
-        Your current installation fails to meet minimum <fmt:message key="title" bundle="${lang}" /> requirements - please see
+        Your current installation fails to meet minimum <fmt:message key="title" /> requirements - please see
         the checklist below:
         </p>
 
@@ -157,7 +155,7 @@
             <tr>
                 <td><img src="images/check.gif" width="13" height="13" border="0"></td>
                 <td>
-                    <fmt:message key="title" bundle="${lang}" /> Classes
+                    <fmt:message key="title" /> Classes
                 </td>
             </tr>
 
@@ -167,7 +165,7 @@
                 <td><img src="images/x.gif" width="13" height="13" border="0"></td>
                 <td>
                     <span class="jive-setup-error-text">
-                    <fmt:message key="title" bundle="${lang}" /> Classes
+                    <fmt:message key="title" /> Classes
                     </span>
                 </td>
             </tr>

src/web/setup-finished.jsp

-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -32,11 +32,11 @@
 <%@ include file="setup-header.jspf" %>
 
 <p class="jive-setup-page-header">
-<fmt:message key="title" bundle="${lang}" /> Setup Complete!
+<fmt:message key="title" /> Setup Complete!
 </p>
 
 <p>
-This installation of <fmt:message key="title" bundle="${lang}" /> is now complete.
+This installation of <fmt:message key="title" /> is now complete.
 To continue:
 </p>
 

src/web/setup-header.jspf

-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -10,7 +8,7 @@
 
 <html>
 <head>
-	<title><fmt:message key="title" bundle="${lang}" /> Setup</title>
+	<title><fmt:message key="title" /> Setup</title>
 	<link rel="stylesheet" type="text/css" href="setup-style.css">
 </head>
 
@@ -20,7 +18,7 @@
 <table cellpadding="8" cellspacing="0" border="0" width="100%">
 <tr>
     <td width="99%">
-        <fmt:message key="title" bundle="${lang}" /> Setup
+        <fmt:message key="title" /> Setup
     </td>
     <td width="1%" nowrap>
         <font size="-2" face="arial,helvetica,sans-serif" color="#ffffff">

src/web/setup-host-settings.jsp

-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%--
   -	$RCSfile$
   -	$Revision$

src/web/setup-index.jsp

-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -66,7 +66,7 @@ Installation Checklist
 <p>
 
 
-Welcome to <fmt:message key="title" bundle="${lang}" />  Setup. This tool will lead you through the initial configuration process
+Welcome to <fmt:message key="title" />  Setup. This tool will lead you through the initial configuration process
 of the application. Before continuing, verify that your environment meets all the requirements
 below.
 </p>
@@ -113,7 +113,7 @@ below.
 </tr>
 <tr>
     <td colspan="3" class="jive-setup-category-header">
-        <fmt:message key="title" bundle="${lang}" /> Classes
+        <fmt:message key="title" /> Classes
     </td>
 </tr>
 <tr>
@@ -121,7 +121,7 @@ below.
         messenger.jar
         <br>
         <span class="jive-info">
-        <fmt:message key="title" bundle="${lang}" /> classes.
+        <fmt:message key="title" /> classes.
         </span>
     </td>
     <td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td>
@@ -129,7 +129,7 @@ below.
 </tr>
 <tr>
     <td colspan="3" class="jive-setup-category-header">
-        <fmt:message key="title" bundle="${lang}" /> Configuration Files
+        <fmt:message key="title" /> Configuration Files
     </td>
 </tr>
 <tr>

src/web/setup-pause.jsp

-<%@ taglib uri="fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$

src/web/ssl-settings.jsp

@@ -23,7 +23,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <%  try { %>
 

src/web/user-create-success.jsp

-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -12,6 +10,10 @@
                  org.jivesoftware.messenger.user.*,
                  org.jivesoftware.messenger.user.UserAlreadyExistsException"
 %>
+
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+
 <%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
@@ -37,7 +39,7 @@
 
 
 <!-- Define BreadCrumbs -->
-<fmt:message key="title" bundle="${lang}" var="t" />
+<fmt:message key="title" var="t" />
 <c:set var="title" value="${t} Admin"  />
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="index.jsp" />

src/web/user-create.jsp

-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -27,10 +27,14 @@
                  org.dom4j.*"
     errorPage="error.jsp"
 %>
-<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
-<jsp:useBean id="errors" class="java.util.HashMap"/>
-<%  webManager.init(request, response, session, application, out ); %>
-<%   // Get parameters //
+
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+
+<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
+<jsp:useBean id="errors" class="java.util.HashMap" />
+<% webManager.init(request, response, session, application, out ); %>
+
+<%  // Get parameters //
     boolean create = request.getParameter("create") != null;
     boolean cancel = request.getParameter("cancel") != null;
     String username = ParamUtils.getParameter(request,"username");

src/web/user-delete.jsp

@@ -16,7 +16,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <% webManager.init(request, response, session, application, out ); %>

src/web/user-edit-form.jsp

@@ -19,7 +19,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 

src/web/user-message.jsp

@@ -21,7 +21,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <%  // Get parameters
     String username = ParamUtils.getParameter(request,"username");

src/web/user-password.jsp

@@ -18,7 +18,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
 

src/web/user-properties.jsp

@@ -18,7 +18,7 @@
     errorPage="error.jsp"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 

src/web/user-search.jsp

-<%@ taglib uri="core" prefix="c"%>
 <%--
   -	$RCSfile$
   -	$Revision$
   -	$Date$
 --%>
+
 <%@ page import="org.jivesoftware.util.*,
                  org.jivesoftware.messenger.user.*,
                  java.util.HashMap,
                  org.jivesoftware.admin.*,
                  java.util.Map" 
 %>
+
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+
 <%-- Define Administration Bean --%>
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
 <%   webManager.init(request, response, session, application, out ); %>

src/web/user-summary.jsp

@@ -19,7 +19,7 @@
                  org.jivesoftware.messenger.Presence"
 %>
 
-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
 <% webManager.init(request, response, session, application, out ); %>

src/web/user-tabs.jsp

-<%@ taglib uri="core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%--
   -	$RCSfile$
   -	$Revision$