Work on converting admin console to Sitemesh (JM-421). Not all JSP pages are...

Work on converting admin console to Sitemesh (JM-421). Not all JSP pages are finished, but will be shortly.

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

Messenger.iml

@@ -238,7 +238,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/build/lib/merge/shaj.jar!/" />
@@ -247,6 +247,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/sitemesh.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

build/build.xml

@@ -356,6 +356,7 @@
         <mkdir dir="${war.dest.dir}/build"/>
         <!-- Make a new web.xml file in the build dir -->
         <copy file="${webapp.dest.dir}/WEB-INF/web.xml" toFile="${war.dest.dir}/build/web.xml" overwrite="${overwrite}"/>
+        <!-- TODO: copy in decorators.xml -->
         <!-- Make the war -->
         <war destfile="${war.dest.dir}/${war.name}" basedir="${web.dir}"
             webxml="${war.dest.dir}/build/web.xml">
@@ -460,6 +461,12 @@
             </filterset>
         </copy>
 
+        <!-- Copy over decorators file. -->
+        <copy file="${web.dir}/WEB-INF/decorators.xml"
+            toFile="${webapp.dest.dir}/WEB-INF/decorators.xml"
+            overwrite="true">
+        </copy>
+
         <!-- Create a jar of compiled servlets -->
         <jar jarfile="${jspc.dest.dir}/${jspc.jar.name}">
             <fileset dir="${jspc.classes.dest.dir}" includes="**/*.class"/>

build/lib/versions.txt

 Name                 |  Version
 ---------------------------------------------
-hsqldb.jar           | 1.8.0.1
-mysql.jar            | 3.1.10
-postgres.jar         | 7.4 version 215
 ant.jar              | Jetty 5.1.2pre0
+ant-contrib.jar      | 1.0b1
+ant-subdirtask.jar   | Revision 1.4 (CVS)
 commons-logging.jar  | Jetty 5.1.2pre0
 commons-el.jar       | Jetty 5.1.2pre0
+dom4j.jar            | 1.6.1
+hsqldb.jar           | 1.8.0.1
 jetty.jar            | Jetty 5.1.2
 jasper-compiler.jar  | Jetty 5.1.2pre0
 jasper-runtime.jar   | Jetty 5.1.2pre0
-servlet.jar          | Jetty 5.1.2pre0
-dom4j.jar            | 1.6.1
-jaxen.jar            | 1.1 beta 4 (from DOM4J 1.5.2)
+jaxen.jar            | 1.1 beta 4 (from DOM4J 1.6.1)
 junit.jar            | 3.8.1
-ant-contrib.jar      | 1.0b1
-ant-subdirtask.jar   | Revision 1.4 (CVS)
-jdic.jar             | 0.8.7 (for windows only)
-xmltask.jar          | 1.10.5
+jdic.jar             | 0.9.1 (for windows only)
 jstl.jar             | Jakarta standard taglib 1.1.2
-standard.jar         | Jakarta standard taglib 1.1.2
-xpp3.jar             | XPP_3 1.1.3.4.M
-whack.jar            | April-26-2005
 jmdns.jar            | 1.0 RC1
+mysql.jar            | 3.1.10
+postgres.jar         | 7.4 version 215
+servlet.jar          | Jetty 5.1.2pre0
 shaj.jar             | 0.5
+sitemesh.jar         | 2.2.1
+standard.jar         | Jakarta standard taglib 1.1.2
+whack.jar            | April-26-2005
+xmltask.jar          | 1.10.5
+xpp3.jar             | XPP_3 1.1.3.4.M
\ No newline at end of file

src/i18n/messenger_i18n_en.properties

@@ -143,7 +143,12 @@
 ##      Added key: 'timezone.choose'
 ##      Added key: 'plugin.admin.click_reload'
 ##      Added key: 'plugin.admin.reload_success'
+##      Modified key: 'sidebar.server-locale'
+##      Modified key: 'sidebar.server-locale.descr'
+##      Modified key: 'locale.title'
 ##      Modified key: 'locale.title.info'
+##      Modified key: 'locale.system.set'
+##      Modified key: 'locale.current'
 ##      Modified key: 'component.settings.info'
 ##      Modified key: 'sidebar.server-db.descr'
 ##      Modified key: 'sidebar.server2server-settings'
@@ -154,8 +159,31 @@
 ##      Modified key: 'sidebar.server-audit-policy.descr'
 ##      Modified key: 'sidebar.server-data-settings.descr'
 ##      Modified key: 'sidebar.server-ssl.descr'
+##      Removed key: 'license.details.info'
+##      Removed key: 'license.details.info1'
+##      Removed key: 'license.details.details'
+##      Removed key: 'license.details.type'
+##      Removed key: 'license.details.max_session'
+##      Removed key: 'license.details.unlimited'
+##      Removed key: 'license.details.expiration_date'
+##      Removed key: 'license.details.expiration_date_never'
 ##      Removed key: 'locale.choose'
 ##      Removed key: 'plugin.admin.reload_success'
+##      Removed key: 'session.filter.title'
+##      Removed key: 'session.filter.info'
+##      Removed key: 'session.filter.enter_username'
+##      Removed key: 'session.filter.specify_username'
+##      Removed key: 'session.filter.choose_user'
+##      Removed key: 'user.browser.title'
+##      Removed key: 'user.browser.legend'
+##      Removed key: 'user.browser.info'
+##      Removed key: 'user.browser.viewing_page'
+##      Removed key: 'user.browser.username'
+##      Removed key: 'user.browser.name'
+##      Removed key: 'user.browser.no_users'
+##      Removed key: 'user.browser.add_user'
+##      Removed key: 'user.browser.browse_users'
+##      Removed key: 'user.browser.browse_users_desc'
 
 # Messenger
 
@@ -171,8 +199,8 @@ tab.server.descr=Click to manage server settings
         sidebar.server-settings.descr=Click to manage system settings
         sidebar.system-props=System Properties
         sidebar.system-props.descr=Click to manage server properties
-        sidebar.server-locale=System Locale
-        sidebar.server-locale.descr=Click to set the locale used by the system
+        sidebar.server-locale=Language and Time
+        sidebar.server-locale.descr=Click to set the language and time zone
         sidebar.server-db=Database
         sidebar.server-db.descr=Click to view database connection information
         sidebar.server-logs=Logs
@@ -505,19 +533,6 @@ audit.policy.label_audit_presence_packets=Audit Presence Packets
 audit.policy.label_audit_iq_packets=Audit IQ Packets
 audit.policy.queued_packets=Queued packets:
 
-# Users browser Page
-
-user.browser.title=User Browser
-user.browser.legend=Possible Users to Add
-user.browser.info=Click "Add User" to add a user to the list box below. When you're done click "Done"
-user.browser.viewing_page=Viewing page
-user.browser.username=Username
-user.browser.name=Name
-user.browser.no_users=No users in the system
-user.browser.add_user=Add User
-user.browser.browse_users=Browse Users
-user.browser.browse_users_desc=Click to browse available users...
-
 # Chatroom history settings Page
 
 chatroom.history.settings.title=Chat Room History Settings
@@ -655,24 +670,13 @@ index.memory=Java Memory
 
 # Locale Page
 
-locale.title=Server Locale
-locale.title.info=Use the form below to set the locale.
-locale.system.set=Set System Locale
-locale.current=Current Locale
+locale.title=Language and Time Settings
+locale.title.info=Use the form below to set the system language and time zone (locale).
+locale.system.set=Set Locale
+locale.current=Current Settings
 language.choose=Choose Language
 timezone.choose=Choose Time Zone
 
-# License details Page
-
-license.details.info=The following is a summary of your
-license.details.info1=license.
-license.details.details=License Details
-license.details.type=License Type:
-license.details.max_session=Maximum Allowable Sessions:
-license.details.unlimited=Unlimited
-license.details.expiration_date=Expiration Date:
-license.details.expiration_date_never=Never
-
 # Log Page
 
 log.line=line
@@ -1146,15 +1150,6 @@ session.details.close_connect=Close Connection
 session.details.session_detail=Current session details above.
 session.details.back_button=Back to Summary
 
-# Session filter Page
-
-session.filter.title=Filter Session Summary by User
-session.filter.info=To filter the list of sessions by user, select the user from the list below \
-        or enter their username in the box below.
-session.filter.enter_username=Please enter a valid username or choose a username from the list.
-session.filter.specify_username=Specify username:
-session.filter.choose_user=Choose user:
-
 # Session row Page
 
 session.row.cliked=Click for more info...

src/java/org/jivesoftware/admin/SidebarTag.java

@@ -59,26 +59,11 @@ import java.io.IOException;
  */
 public class SidebarTag extends BodyTagSupport {
 
-    private String bean;
     private String css;
     private String currentcss;
     private String headercss;
     private SubSidebarTag subsidebarTag;
 
-    /**
-     * The name of the request attribute which holds a {@link AdminPageBean} instance.
-     */
-    public String getBean() {
-        return bean;
-    }
-
-    /**
-     * Sets the name of the request attribute to hold a {@link AdminPageBean} instance.
-     */
-    public void setBean(String bean) {
-        this.bean = bean;
-    }
-
     /**
      * Returns the value of the CSS class to be used for tab decoration. If not set will return a blank string.
      */
@@ -164,15 +149,9 @@ public class SidebarTag extends BodyTagSupport {
             throw new JspException("Error, no template (body value) set for the subsidebar tag");
         }
 
-        // Get the page data bean from the request:
-        AdminPageBean pageInfo = (AdminPageBean)request.getAttribute(getBean());
-
-        // If the page info bean is not in the request then no tab will be selected - so, it'll fail gracefully
-        if (pageInfo != null) {
-
         // Get the initial subpage and page IDs
-            String subPageID = pageInfo.getSubPageID();
-            String pageID = pageInfo.getPageID();
+        String subPageID = (String)request.getAttribute("subPageID");
+        String pageID = (String)request.getAttribute("pageID");
 
         // If the pageID is null, use the subPageID to set it. If both the pageID and subPageIDs are null,
         // return because these are key to execution of the tag.
@@ -254,7 +233,7 @@ public class SidebarTag extends BodyTagSupport {
                                         String subheader = subcurrent.getParent().attributeValue("name");
                                         buf.append("<li class=\"").append(hcss).append("\">").append(clean(i18n(subheader))).append("</li>");
                                     }
-                                        String extraParams = pageInfo.getExtraParams();
+                                    String extraParams = (String)request.getAttribute("extraParams");
                                     while (siblings.hasNext()) {
                                         Element sibling = (Element)siblings.next();
                                         String sibID = sibling.attributeValue("id");
@@ -297,7 +276,6 @@ public class SidebarTag extends BodyTagSupport {
                 }
             }
         }
-        }
         return EVAL_PAGE;
     }
 

src/java/org/jivesoftware/admin/TabsTag.java

@@ -118,12 +118,8 @@ public class TabsTag extends BodyTagSupport {
         HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
         String beanName = getBean();
         // Get the page data bean from the request:
-        AdminPageBean pageInfo = (AdminPageBean)request.getAttribute(beanName);
         // If the page info bean is not in the request then no tab will be selected - so, it'll fail gracefully
-        String pageID = null;
-        if (pageInfo != null) {
-            pageID = pageInfo.getPageID();
-        }
+        String pageID = (String)request.getAttribute("pageID");
         // Get tabs from the model:
         List tabs = AdminConsole.getModel().selectNodes("//tab");
         if (tabs.size() > 0) {

src/java/org/jivesoftware/messenger/container/PluginServlet.java

@@ -225,7 +225,6 @@ public class PluginServlet extends HttpServlet {
         // Strip the starting "/" from the path to find the JSP URL.
         String jspURL = pathInfo.substring(1);
 
-
         HttpServlet servlet = servlets.get(jspURL);
         if (servlet != null) {
             servlet.service(request, response);
@@ -338,11 +337,13 @@ public class PluginServlet extends HttpServlet {
                     in.close();
                 }
                 catch (Exception ignored) {
+                    // Ignore.
                 }
                 try {
                     out.close();
                 }
                 catch (Exception ignored) {
+                    // Ignore.
                 }
             }
         }
@@ -455,19 +456,18 @@ public class PluginServlet extends HttpServlet {
         // Load all jars from lib
         File libDirectory = new File(pluginDirectory, "lib");
         File[] libs = libDirectory.listFiles();
-        for (int i = 0; i < libs.length; i++) {
-            File libFile = libs[i];
-            builder.append(libFile.getAbsolutePath() + ';');
+        for (File libFile : libs) {
+            builder.append(libFile.getAbsolutePath()).append(';');
         }
 
         File messengerRoot = pluginDirectory.getParentFile().getParentFile().getParentFile();
         File messengerLib = new File(messengerRoot, "target//lib");
 
-        builder.append(messengerLib.getAbsolutePath() + "//servlet.jar;");
-        builder.append(messengerLib.getAbsolutePath() + "//messenger.jar;");
-        builder.append(messengerLib.getAbsolutePath() + "//jasper-compiler.jar;");
-        builder.append(messengerLib.getAbsolutePath() + "//jasper-runtime.jar;");
-        builder.append(env.getClassesDir().getAbsolutePath() + ";");
+        builder.append(messengerLib.getAbsolutePath()).append("//servlet.jar;");
+        builder.append(messengerLib.getAbsolutePath()).append("//messenger.jar;");
+        builder.append(messengerLib.getAbsolutePath()).append("//jasper-compiler.jar;");
+        builder.append(messengerLib.getAbsolutePath()).append("//jasper-runtime.jar;");
+        builder.append(env.getClassesDir().getAbsolutePath()).append(";");
 
         return builder.toString();
     }

src/java/org/jivesoftware/util/WebManager.java

@@ -21,8 +21,6 @@ import org.jivesoftware.messenger.user.UserManager;
 
 import java.io.*;
 import java.net.URL;
-import java.util.LinkedHashMap;
-import java.util.Map;
 import java.util.StringTokenizer;
 
 /**
@@ -30,10 +28,6 @@ import java.util.StringTokenizer;
  */
 public class WebManager extends WebBean {
 
-    private Map breadcrumbMap = new LinkedHashMap();
-    private String title = "";
-    private String sidebar = "";
-
     private int start = 0;
     private int range = 15;
 
@@ -107,7 +101,9 @@ public class WebManager extends WebBean {
         try {
             pageUser = getUserManager().getUser(getAuthToken().getUsername());
         }
-        catch (Exception ignored) {}
+        catch (Exception ignored) {
+            // Ignore.
+        }
         return pageUser;
     }
 
@@ -162,39 +158,7 @@ public class WebManager extends WebBean {
     }
 
     public boolean isServerRunning() {
-        if (getPresenceManager() == null ||
-                getXMPPServer() == null) {
-            return false;
-        }
-        return true;
-    }
-
-    public void addBreadCrumb(String name, String url) {
-        breadcrumbMap.put(name, url);
-    }
-
-    public Map getBreadCrumbs() {
-        return breadcrumbMap;
-    }
-
-    public void setSidebar(String sidebar) {
-        this.sidebar = sidebar;
-    }
-
-    public String getSidebar() {
-        return sidebar;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public int getBreadcrumbSize() {
-        return getBreadCrumbs().size();
+        return !(getPresenceManager() == null || getXMPPServer() == null);
     }
 
     public void setStart(int start) {
@@ -223,6 +187,7 @@ public class WebManager extends WebBean {
             Thread.sleep(3000L);
         }
         catch (Exception ignored) {
+            // Ignore.
         }
     }
 
@@ -253,13 +218,17 @@ public class WebManager extends WebBean {
                     in.close();
                 }
             }
-            catch (IOException e) { }
+            catch (IOException e) {
+                // Ignore.
+            }
             try {
                 if (out != null) {
                     out.close();
                 }
             }
-            catch (IOException e) { }
+            catch (IOException e) {
+                // Ignore.
+            }
         }
     }
 
@@ -378,7 +347,7 @@ public class WebManager extends WebBean {
                     }
                 }
             }
-            else if (values == null) {
+            else {
                 // Store the new page-value as a new user property
                 user.getProperties().put(property, toStore);
             }

src/web/WEB-INF/admin.tld

@@ -24,11 +24,6 @@
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
         </attribute>
-        <attribute>
-            <name>bean</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
         <attribute>
             <name>role</name>
             <required>false</required>
@@ -60,11 +55,6 @@
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
         </attribute>
-        <attribute>
-            <name>bean</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
         <attribute>
             <name>role</name>
             <required>false</required>

src/web/WEB-INF/decorators.xml

+<decorators defaultdir="/decorators">
+    <decorator name="main" page="main.jsp">
+          <pattern>/*.jsp</pattern>
+    </decorator>
+    <excludes>
+        <pattern>/setup/*</pattern>
+        <pattern>/login.jsp*</pattern>
+    </excludes>
+</decorators>
\ No newline at end of file

src/web/WEB-INF/web.xml

@@ -37,6 +37,11 @@
         <filter-class>org.jivesoftware.util.LocaleFilter</filter-class>
     </filter>
     
+    <filter>
+        <filter-name>sitemesh</filter-name>
+        <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
+    </filter>
+
     <filter-mapping>
         <filter-name>AuthCheck</filter-name>
         <url-pattern>*.jsp</url-pattern>
@@ -57,6 +62,11 @@
         <servlet-name>PluginServlet</servlet-name>
     </filter-mapping>
     
+    <filter-mapping>
+        <filter-name>sitemesh</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
     <servlet>
         <servlet-name>PluginServlet</servlet-name>
         <servlet-class>org.jivesoftware.messenger.container.PluginServlet</servlet-class>

src/web/audit-policy.jsp

@@ -10,39 +10,30 @@
 --%>
 
 <%@ page import="org.jivesoftware.messenger.audit.AuditManager,
-                   org.jivesoftware.admin.*,
                    org.jivesoftware.util.*,
                    java.util.*,
                  java.io.File,
-                 org.xmpp.component.ComponentManagerFactory,
                  org.xmpp.packet.JID,
-                 java.util.LinkedList,
                  org.jivesoftware.messenger.user.UserNotFoundException"
     errorPage="error.jsp"
 %>
+<%@ page import="org.jivesoftware.messenger.XMPPServer"%>
+<%@ page import="org.jivesoftware.messenger.user.UserManager"%>
 
 <%@ 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 ); %>
+<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
+<% webManager.init(request, response, session, application, out ); %>
+
+<html>
+    <head>
+        <title><fmt:message key="audit.policy.title"/></title>
+        <meta name="pageID" content="server-audit-policy"/>
+        <meta name="helpPage" content="set_server_traffic_auditing_policy.html"/>
+    </head>
+    <body>
+
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("audit.policy.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "audit-policy.jsp"));
-    pageinfo.setPageID("server-audit-policy");
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="set_server_traffic_auditing_policy.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
-<script language="JavaScript" type="text/javascript">
-function openWin(el) {
-    var win = window.open('user-browser.jsp?formName=f&elName=ignore','newWin','width=500,height=550,menubar=yes,location=no,personalbar=no,scrollbars=yes,resize=yes');
-}
-</script>
 
 <%   // Get parameters:
     boolean update = request.getParameter("update") != null;
@@ -61,9 +52,9 @@ function openWin(el) {
 
 
     // Get an audit manager:
-    AuditManager auditManager = admin.getXMPPServer().getAuditManager();
+    AuditManager auditManager = XMPPServer.getInstance().getAuditManager();
 
-    Map errors = new HashMap();
+    Map<String,String> errors = new HashMap<String,String>();
     if (update) {
         auditManager.setEnabled(auditEnabled);
         auditManager.setAuditMessage(auditMessages);
@@ -117,7 +108,7 @@ function openWin(el) {
                     String tok = tokenizer.nextToken();
                     String username = tok;
                     if (tok.contains("@")) {
-                        if (tok.contains("@" + admin.getServerInfo().getName())) {
+                        if (tok.contains("@" + webManager.getServerInfo().getName())) {
                            username = new JID(tok).getNode();
                         }
                         else {
@@ -126,7 +117,7 @@ function openWin(el) {
                         }
                     }
                     try {
-                        admin.getUserManager().getUser(username);
+                        webManager.getUserManager().getUser(username);
                         newIgnoreList.add(username);
                     }
                     catch (UserNotFoundException e){
@@ -140,7 +131,7 @@ function openWin(el) {
     <div class="jive-success">
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
-        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
         <td class="jive-icon-label">
         <fmt:message key="audit.policy.settings.saved_successfully" />
         </td></tr>
@@ -353,7 +344,7 @@ function openWin(el) {
                              <td nowrap valign="top">
                                 <a href="#" onclick="openWin(document.f.ignore);return false;"
                                  title="<fmt:message key="user.browser.browse_users_desc" />"
-                                 ><img src="images/user.gif" border="0"/> <fmt:message key="user.browser.browse_users" /></a>
+                                 ><img src="images/user.gif" border="0" alt=""/> <fmt:message key="user.browser.browse_users" /></a>
                             </td>
                         </table>
                     </td>
@@ -382,4 +373,5 @@ function openWin(el) {
 
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
+</html>
\ No newline at end of file

src/web/bottom.jsp

-<%--
-  -	$RCSfile$
-  -	$Revision$
-  -	$Date$
-  -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
-  -
-  - This software is published under the terms of the GNU Public License (GPL),
-  - a copy of which is included in this distribution.
---%>
-
-        </td>
-    </tr>
-</tbody>
-</table>
-</div>
-
-</body>
-</html>

src/web/chatroom-history-settings.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2005 Jive Software. All rights reserved.
   -
   - This software is published under the terms of the GNU Public License (GPL),
   - a copy of which is included in this distribution.
@@ -12,7 +11,6 @@
 <%@ page import="org.jivesoftware.util.*,
                  java.util.*,
                  org.jivesoftware.messenger.*,
-                 org.jivesoftware.admin.*,
                  org.jivesoftware.messenger.muc.HistoryStrategy,
                  org.jivesoftware.messenger.muc.MultiUserChatServer"
     errorPage="error.jsp"
@@ -21,19 +19,16 @@
 <%@ 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 ); %>
+<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
+<% webManager.init(request, response, session, application, out ); %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("chatroom.history.settings.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "chatroom-history-settings.jsp"));
-    pageinfo.setPageID("server-chatroom-history");
-%>
-<jsp:include page="top.jsp" flush="true" />
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="chatroom.history.settings.title"/></title>
+        <meta name="pageID" content="server-chatroom-history"/>
+        <meta name="helpPage" content="edit_group_chat_history_settings.html"/>
+    </head>
+    <body>
 
 <%! // Global vars and methods:
     static final int ALL = 1;
@@ -47,10 +42,10 @@
     int numMessages = ParamUtils.getIntParameter(request,"numMessages",0);
 
     // Get an audit manager:
-    MultiUserChatServer muc = admin.getMultiUserChatServer();
+    MultiUserChatServer muc = webManager.getMultiUserChatServer();
     HistoryStrategy historyStrat = muc.getHistoryStrategy();
 
-    Map errors = new HashMap();
+    Map<String, String> errors = new HashMap<String, String>();
     if (update) {
         if (policy != ALL && policy != NONE && policy != NUMBER) {
             errors.put("general", "Please choose a valid chat history policy.");
@@ -76,7 +71,7 @@
     <div class="jive-success">
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
-        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
         <td class="jive-icon-label">
         <fmt:message key="chatroom.history.settings.saved_successfully" />
         </td></tr>
@@ -151,6 +146,7 @@
                 <input type="text" name="numMessages" size="5" maxlength="10"
                  onclick="this.form.policy[2].checked=true;"
                  value="<%= ((numMessages > 0) ? ""+numMessages : "") %>"> messages
+            </td>
         </tr>
     </tbody>
     </table>
@@ -163,4 +159,5 @@
 
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
+</html>

src/web/component-session-details.jsp

@@ -10,24 +10,17 @@
 --%>
 
 <%@ page import="org.jivesoftware.util.*,
-                 java.util.*,
                  org.jivesoftware.messenger.*,
-                 java.text.DateFormat,
                  java.text.NumberFormat,
-                 org.jivesoftware.admin.*,
-                 org.jivesoftware.messenger.user.User,
-                 org.xmpp.packet.JID,
-                 org.xmpp.packet.Presence,
-                 java.net.URLEncoder,
-                 org.jivesoftware.messenger.server.IncomingServerSession,
-                 org.jivesoftware.messenger.server.OutgoingServerSession,
                  org.jivesoftware.messenger.component.ComponentSession"
     errorPage="error.jsp"
 %>
 
 <%@ 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="webManager" class="org.jivesoftware.util.WebManager"  />
+<% webManager.init(request, response, session, application, out ); %>
 
 <%  // Get parameters
     String jid = ParamUtils.getParameter(request, "jid");
@@ -46,16 +39,12 @@
     NumberFormat numFormatter = NumberFormat.getNumberInstance();
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("component.session.details.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "component-session-details.jsp?jid=" + jid));
-    pageinfo.setPageID("component-session-summary");
-%>
-<jsp:include page="top.jsp" flush="true" />
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="component.session.details.title"/></title>
+        <meta name="pageID" content="component-session-summary"/>
+    </head>
+    <body>
 
 <p>
 <fmt:message key="component.session.details.info">
@@ -105,16 +94,16 @@
         <td>
             <% if ("gateway".equals(componentSession.getExternalComponent().getCategory())) {
                 if ("msn".equals(componentSession.getExternalComponent().getType())) { %>
-                <img src="images/msn.gif" width="16" height="16" border="0">&nbsp;
+                <img src="images/msn.gif" width="16" height="16" border="0" alt="MSN">&nbsp;
              <% }
                 else if ("aim".equals(componentSession.getExternalComponent().getType())) { %>
-                <img src="images/aim.gif" width="16" height="16" border="0">&nbsp;
+                <img src="images/aim.gif" width="16" height="16" border="0" alt="AIM">&nbsp;
              <% }
                 else if ("yahoo".equals(componentSession.getExternalComponent().getType())) { %>
-                <img src="images/yahoo.gif" width="22" height="16" border="0">&nbsp;
+                <img src="images/yahoo.gif" width="22" height="16" border="0" alt="Yahoo!">&nbsp;
              <% }
                 else if ("icq".equals(componentSession.getExternalComponent().getType())) { %>
-                <img src="images/icq.gif" width="16" height="16" border="0">&nbsp;
+                <img src="images/icq.gif" width="16" height="16" border="0" alt="ICQ">&nbsp;
              <% }
             }
             %>
@@ -167,4 +156,5 @@
 </center>
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
+</html>
\ No newline at end of file

src/web/component-session-summary.jsp

@@ -13,10 +13,6 @@
                  java.util.*,
                  org.jivesoftware.messenger.*,
                  java.util.Date,
-                 org.jivesoftware.admin.*,
-                 java.text.DateFormat,
-                 org.xmpp.packet.JID,
-                 org.jivesoftware.messenger.server.IncomingServerSession,
                  java.net.URLEncoder,
                  org.jivesoftware.messenger.component.ComponentSession"
     errorPage="error.jsp"
@@ -73,16 +69,12 @@
     int maxIndex = (start+range <= sessionCount ? start+range : sessionCount);
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("component.session.summary.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "component-session-summary.jsp"));
-    pageinfo.setPageID("component-session-summary");
-%>
-<jsp:include page="top.jsp" flush="true" />
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="component.session.summary.title"/></title>
+        <meta name="pageID" content="component-session-summary"/>
+    </head>
+    <body>
 
 <%  if ("success".equals(request.getParameter("close"))) { %>
 
@@ -110,12 +102,11 @@
     <%  } %>
 
 </select>
-</p>
 
 <%  if (numPages > 1) { %>
 
     <p>
-    <fmt:message key="global.page" />:
+    <fmt:message key="global.pages" />:
     [
     <%  for (int i=0; i<numPages; i++) {
             String sep = ((i+1)<numPages) ? " " : "";
@@ -131,8 +122,6 @@
 
 <%  } %>
 
-</p>
-
 <p>
 <fmt:message key="component.session.summary.info">
     <fmt:param value="<%= "<a href='external-components-settings.jsp'>" %>" />
@@ -187,16 +176,16 @@
         <td align="center" width="10%" nowrap>
             <% if ("gateway".equals(componentSession.getExternalComponent().getCategory())) {
                 if ("msn".equals(componentSession.getExternalComponent().getType())) { %>
-                <img src="images/msn.gif" width="16" height="16" border="0">&nbsp;
+                <img src="images/msn.gif" width="16" height="16" border="0" alt="MSN">&nbsp;
              <% }
                 else if ("aim".equals(componentSession.getExternalComponent().getType())) { %>
-                <img src="images/aim.gif" width="16" height="16" border="0">&nbsp;
+                <img src="images/aim.gif" width="16" height="16" border="0" alt="AIM">&nbsp;
              <% }
                 else if ("yahoo".equals(componentSession.getExternalComponent().getType())) { %>
-                <img src="images/yahoo.gif" width="22" height="16" border="0">&nbsp;
+                <img src="images/yahoo.gif" width="22" height="16" border="0" alt="Yahoo!">&nbsp;
              <% }
                 else if ("icq".equals(componentSession.getExternalComponent().getType())) { %>
-                <img src="images/icq.gif" width="16" height="16" border="0">&nbsp;
+                <img src="images/icq.gif" width="16" height="16" border="0" alt="ICQ">&nbsp;
              <% }
             }
             %>
@@ -226,7 +215,7 @@
             <a href="component-session-summary.jsp?jid=<%= URLEncoder.encode(componentSession.getAddress().toString(), "UTF-8") %>&close=true"
              title="<fmt:message key="session.row.cliked_kill_session" />"
              onclick="return confirm('<fmt:message key="session.row.confirm_close" />');"
-             ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
+             ><img src="images/delete-16x16.gif" width="16" height="16" border="0" alt=""></a>
         </td>
     </tr>
     <%  } %>
@@ -259,4 +248,5 @@
 <fmt:message key="component.session.summary.last_update" />: <%= JiveGlobals.formatDateTime(new Date()) %>
 </p>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
\ No newline at end of file
+</html>
\ No newline at end of file

src/web/decorators/main.jsp

+<%--
+  -	$Revision: 2701 $
+  -	$Date: 2005-08-19 16:48:22 -0700 (Fri, 19 Aug 2005) $
+  -
+  - Copyright (C) 2004 Jive Software. All rights reserved.
+  -
+  - This software is published under the terms of the GNU Public License (GPL),
+  - a copy of which is included in this distribution.
+--%>
+
+<%@ page import="org.jivesoftware.util.StringUtils,
+                 org.jivesoftware.admin.AdminConsole,
+                 org.jivesoftware.util.LocaleUtils"
+    errorPage="../error.jsp"
+%>
+
+<%@ taglib uri="admin" prefix="admin" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/page" prefix="page" %>
+
+<jsp:useBean id="info" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
+
+<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
+<% admin.init(request, response, session, application, out); %>
+
+<decorator:usePage id="decoratedPage" />
+
+<%
+    String path = request.getContextPath();
+    // Decorated pages will typically must set a pageID and optionally set a subPageID
+    // and extraParams. Store these values as request attributes so that the tab and sidebar
+    // handling tags can get at the data.
+    request.setAttribute("pageID", decoratedPage.getProperty("meta.pageID"));
+    request.setAttribute("subPageID", decoratedPage.getProperty("meta.subPageID"));
+    request.setAttribute("extraParams", decoratedPage.getProperty("meta.extraParams"));
+%>
+
+<%
+    // If the page has instructed that no decorator should be applied, include the original
+    // page content and return.
+    if("false".equals(decoratedPage.getProperty("meta.decorator"))) {
+        decoratedPage.writePage(out);
+        return;
+    }
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+    <title><%= AdminConsole.getAppName() %> <fmt:message key="login.title" />: <decorator:title /></title>
+    <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+    <link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css">
+    <script language="JavaScript" type="text/javascript">
+    <!-- // code for window popups
+    function helpwin() {
+        var newwin = window.open('/help/index.html#<decorator:getProperty property="meta.helpPage" default=""/>',
+            'helpWindow','width=750,height=550,menubar=yes,location=no,personalbar=no,scrollbars=yes,resize=yes');
+        newwin.focus();
+    }
+    //-->
+    </script>
+</head>
+
+<body id="jive-body">
+
+<div id="jive-header">
+<table cellpadding="0" cellspacing="0" width="100%" border="0">
+<tbody>
+    <tr>
+        <td>
+            <img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> <fmt:message key="login.title" />">
+        </td>
+        <td align="right">
+            <table cellpadding="0" cellspacing="0" border="0">
+            <tr>
+                <td>
+                    <a href="#" onclick="helpwin();return false;"
+                     ><img src="/images/header-help.gif" width="24" height="24" border="0" alt="Click for help" hspace="10"></a>
+                    &nbsp;
+                </td>
+                <td class="info">
+                    <nobr><%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %></nobr>
+                </td>
+            </tr>
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="3">
+            <table cellpadding="0" cellspacing="0" border="0" width="100%">
+            <tbody>
+                <tr>
+                    <td width="99%" nowrap>
+                        <div id="jive-tabs">
+
+                            <admin:tabs css="" currentcss="currentlink">
+                                <a href="[url]" title="[description]"
+                                 onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
+                                 >[name]</a>
+                            </admin:tabs>
+
+                        </div>
+                    </td>
+                    <td width="1%" id="jive-logout" nowrap>
+                        <a href="<%= path %>/index.jsp?logout=true"><%= LocaleUtils.getLocalizedString("global.logout") %> [<%= StringUtils.escapeHTMLTags(admin.getUser().getUsername()) %>]</a>
+                        &nbsp;&nbsp;&nbsp;
+                    </td>
+                </tr>
+            </tbody>
+            </table>
+        </td>
+    </tr>
+</tbody>
+</table>
+</div>
+
+<div id="jive-main">
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<tbody>
+    <tr valign="top">
+        <td width="1%">
+            <div id="jive-sidebar">
+
+                <admin:sidebar css="" currentcss="currentlink" headercss="category">
+                    <a href="[url]" title="[description]"
+                      onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
+                      >[name]</a>
+                     <admin:subsidebar css="" currentcss="currentlink">
+                        <a href="[url]" title="[description]"
+                         onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
+                         >[name]</a>
+                     </admin:subsidebar>
+                </admin:sidebar>
+
+                <br>
+                <img src="<%= path %>/images/blank.gif" width="150" height="1" border="0" alt="">
+
+            </div>
+        </td>
+        <td width="99%" id="jive-content">
+
+        <div id="jive-title">
+            <decorator:title default="&nbsp;"/>
+        </div>
+
+        <decorator:body/>
+
+        </td>
+    </tr>
+</tbody>
+</table>
+</div>
+
+</body>
+</html>
\ No newline at end of file

src/web/error-serverdown.jsp

@@ -65,7 +65,9 @@
         </td>
         <td width="99%" id="jive-content">
 
-        <jsp:include page="title.jsp" flush="true" />
+        <div id="jive-title">
+            <%= title %>
+        </div>
 
         <p>
         <%= AdminConsole.getAppName() %> <fmt:message key="error.serverdown.is_down" />

src/web/external-components-settings.jsp

@@ -16,28 +16,17 @@
                  java.util.Iterator,
                  org.jivesoftware.messenger.*,
                  java.util.*,
-                 java.text.DateFormat,
-                 org.jivesoftware.admin.AdminPageBean,
-                 org.jivesoftware.messenger.net.SocketAcceptThread,
                  org.jivesoftware.messenger.component.ExternalComponentManager,
                  org.jivesoftware.messenger.component.ExternalComponentConfiguration"
     errorPage="error.jsp"
 %>
 
-<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
-<% admin.init(request, response, session, application, out ); %>
-
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("component.settings.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "external-components-settings.jsp"));
-    pageinfo.setPageID("external-components-settings");
-%>
-
-<jsp:include page="top.jsp" flush="true" />
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="component.settings.title"/></title>
+        <meta name="pageID" content="external-components-settings"/>
+    </head>
+    <body>
 
 <%  // Get parameters
     boolean update = request.getParameter("update") != null;
@@ -61,7 +50,7 @@
 
 
     // Update the session kick policy if requested
-    Map errors = new HashMap();
+    Map<String, String> errors = new HashMap<String, String>();
     if (update) {
         // Validate params
         if (componentEnabled) {
@@ -255,7 +244,7 @@
                         <fmt:message key="component.settings.port" />
                     </td>
                     <td width="99%">
-                        <input type="text" size="15" maxlength="50" name="port"
+                        <input type="text" size="10" maxlength="50" name="port"
                          value="<%= port %>">
                     </td>
                 </tr>
@@ -264,7 +253,7 @@
                         <fmt:message key="component.settings.defaultSecret" />
                     </td>
                     <td width="99%">
-                        <input type="text" size="25" maxlength="70" name="defaultSecret"
+                        <input type="text" size="15" maxlength="70" name="defaultSecret"
                          value="<%= ((defaultSecret != null) ? defaultSecret : "") %>">
                     </td>
                 </tr>
@@ -374,7 +363,7 @@
             <fmt:message key="component.settings.secret" />
         </td>
         <td>
-            <input type="text" size="40" name="secret"value="<%= componentAllowed ?  secret : "" %>"/>
+            <input type="text" size="15" name="secret"value="<%= componentAllowed ?  secret : "" %>"/>
         </td>
     </tr>
     <tr align="center">
@@ -392,9 +381,14 @@
 
 <fieldset>
     <legend><fmt:message key="component.settings.disallowed" /></legend>
-    <p><fmt:message key="component.settings.disallowed.info" /></p>
     <div>
-    <table class="jive-table" cellpadding="0" cellspacing="0" border="0" width="100%">
+    <table cellpadding="3" cellspacing="0" border="0" width="100%">
+    <tbody>
+        <tr><td><p><fmt:message key="component.settings.disallowed.info" /></p></td></tr>
+    </tbody>
+    </table>
+    <br><br>
+    <table class="jive-table" cellpadding="3" cellspacing="0" border="0" width="100%">
     <thead>
         <tr>
             <th width="1%">&nbsp;</th>
@@ -449,4 +443,5 @@
     </div>
 </fieldset>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
+</html>

src/web/footer.jsp

-<%
-/**
- *	$RCSfile$
- *	$Revision$
- *	$Date$
- */
-%>
-
-</body>
-</html>

src/web/global.jsp

-<%--
-  -	$RCSfile$
-  -	$Revision$
-  -	$Date$
-  -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
-  -
-  - This software is published under the terms of the GNU Public License (GPL),
-  - a copy of which is included in this distribution.
---%>
-
-<%@ page import="org.jivesoftware.messenger.auth.AuthToken,
-                 org.jivesoftware.util.ClassUtils,
-                 org.jivesoftware.messenger.XMPPServer,
-                 org.jivesoftware.messenger.user.*"
-%>
-
-<%	// Security check
-	AuthToken authToken = (AuthToken)session.getAttribute("jive.admin.authToken");
-	if (authToken == null) {
-		response.sendRedirect("login.jsp");
-		return;
-	}
-    else {
-        // check for an anonymous user token  
-        if (authToken.isAnonymous()) {
-		    response.sendRedirect("login.jsp");
-		    return;
-        }
-    }
-    
-    // Handle an admin logout requst:
-    if (request.getParameter("logout") != null) {
-      session.removeAttribute("jive.admin.authToken");
-      response.sendRedirect("index.jsp");
-      return;
-    }
-
-    // Check to see if we're in "setup" mode:
-    if (XMPPServer.getInstance().isSetupMode()) {
-      response.sendRedirect("setup-index.jsp");
-      return;
-    }
-
-    // Should only be set to true if logged in user is an admin.
-    // Since anyone that logged in is an admin, it's redundant to recheck.
-    boolean isSystemAdmin = true;
-
-    // Otherwise, get the xmpp server
-    XMPPServer xmppServer = XMPPServer.getInstance();
-
-    // The user object of the logged-in user
-    UserManager userManager = xmppServer.getUserManager();
-    User pageUser = null;  
-    try {
-        pageUser = userManager.getUser(authToken.getUsername());
-    }
-    catch (UserNotFoundException ignored) {}
-
-    // embedded mode?
-    boolean embeddedMode = false;
-    try {
-        ClassUtils.forName("org.jivesoftware.messenger.starter.ServerStarter");
-        embeddedMode = true;
-    }
-    catch (Exception ignored) {}
-%>
\ No newline at end of file

src/web/group-create.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2005 Jive Software. All rights reserved.
   -
   - This software is published under the terms of the GNU Public License (GPL),
   - a copy of which is included in this distribution.
@@ -13,15 +12,6 @@
                  java.util.HashMap,
                  java.util.Map,
                  java.util.*,
-                 org.jivesoftware.messenger.*,
-                 org.jivesoftware.admin.*,
-                 java.io.StringWriter,
-                 java.io.StringWriter,
-                 java.io.IOException,
-                 org.jivesoftware.messenger.auth.UnauthorizedException,
-                 java.io.PrintStream,
-                 org.dom4j.xpath.DefaultXPath,
-                 org.dom4j.*,
                  org.jivesoftware.messenger.group.*,
                  java.net.URLEncoder,
                  org.jivesoftware.messenger.user.UserManager,
@@ -33,8 +23,6 @@
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <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 //
@@ -54,6 +42,8 @@
 //    String displayName = ParamUtils.getParameter(request, "display");
 //    String groupList = ParamUtils.getParameter(request, "groupList");
 
+    Map<String, String> errors = new HashMap<String, String>();
+
     // Handle a cancel
     if (cancel) {
         response.sendRedirect("group-summary.jsp");
@@ -126,32 +116,24 @@
     }
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/>
-
-<% // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("group.create.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-create.jsp"));
-    pageinfo.setPageID("group-create");
-%>
-
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="create_a_group.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true"/>
+<html>
+    <head>
+        <title><fmt:message key="group.create.title"/></title>
+        <meta name="pageID" content="group-create"/>
+        <meta name="helpPage" content="create_a_group.html"/>
+    </head>
+    <body>
 
 <c:set var="submit" value="${param.create}"/>
-<c:set var="errors" value="${errors}"/>
 
 <%  if (errors.get("general") != null) { %>
 
-    <div class="jive-success">
+    <div class="jive-error">
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
         <tr>
             <td class="jive-icon">
-                <img src="images/success-16x16.gif" width="16" height="16" border="0">
+                <img src="images/error-16x16.gif" width="16" height="16" border="0" alt="">
             </td>
             <td class="jive-icon-label">
                 <fmt:message key="group.create.error" />
@@ -227,7 +209,7 @@
             <fmt:message key="group.create.label_initial_member" />
         </td>
         <td nowrap class="c1" align="left">
-            <textarea name="users" cols="30" rows="3" id="gdesc"
+            <textarea name="users" cols="30" rows="3" id="users"
              ><%= ((users != null) ? users : "") %></textarea>
         </td>
     </tr>
@@ -360,7 +342,8 @@
 document.f.name.focus();
 </script>
 
-<jsp:include page="bottom.jsp" flush="true"/>
+    </body>
+</html>
 
 <%!
     private static String toList(String[] array) {

src/web/group-delete.jsp

@@ -46,20 +46,14 @@
     }
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("group.delete.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-delete.jsp?group="+URLEncoder.encode(groupName, "UTF-8")));
-    pageinfo.setSubPageID("group-delete");
-    pageinfo.setExtraParams("group="+URLEncoder.encode(groupName, "UTF-8"));
-%>
-
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="delete_a_group.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="group.delete.title"/></title>
+        <meta name="subPageID" content="group-delete"/>
+        <meta name="extraParams" content="<%= URLEncoder.encode(groupName, "UTF-8") %>"/>
+        <meta name="helpPage" content="delete_a_group.html"/>
+    </head>
+    <body>
 
 <p>
 <fmt:message key="group.delete.hint_info" />
@@ -73,4 +67,5 @@
 <input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
+</html>
\ No newline at end of file

src/web/group-edit.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
@@ -9,17 +8,11 @@
   - a copy of which is included in this distribution.
 --%>
 
-<%@ page import="java.text.DateFormat,
-                 java.util.*,
-                 org.jivesoftware.admin.*,
-                 org.xmpp.packet.JID,
+<%@ page import="java.util.*,
                  org.jivesoftware.messenger.group.GroupManager,
                  org.jivesoftware.messenger.group.Group,
                  java.net.URLEncoder,
                  java.net.URLDecoder,
-                 org.jivesoftware.messenger.user.UserManager,
-                 org.jivesoftware.messenger.user.UserNotFoundException,
-                 org.jivesoftware.stringprep.Stringprep,
                  java.io.UnsupportedEncodingException,
                  org.jivesoftware.util.*"
 %>
@@ -28,9 +21,10 @@
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <!-- Define Administration Bean -->
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
+<%  webManager.init(pageContext); %>
 <jsp:useBean id="errors" class="java.util.HashMap"/>
 
-<%  webManager.init(pageContext); %>
+
 
 <%  // Get parameters
     boolean add = request.getParameter("add") != null;
@@ -148,11 +142,15 @@
                     count++;
                 }
                 catch (IllegalArgumentException unfe) {
-                  errorBuf.append("<br>" + LocaleUtils.getLocalizedString("group.edit.inexistent_user", JiveGlobals.getLocale(), Arrays.asList(username)));
+                    errorBuf.append("<br>").append(
+                            LocaleUtils.getLocalizedString("group.edit.inexistent_user",
+                            JiveGlobals.getLocale(), Arrays.asList(username)));
                 }
             }
             else {
-                errorBuf.append("<br>" + LocaleUtils.getLocalizedString("group.edit.already_user", JiveGlobals.getLocale(), Arrays.asList(username)));
+                errorBuf.append("<br>").append(
+                        LocaleUtils.getLocalizedString("group.edit.already_user",
+                        JiveGlobals.getLocale(), Arrays.asList(username)));
             }
         }
         if (count > 0) {
@@ -201,20 +199,15 @@
         groupDisplayName = group.getProperties().get("sharedRoster.displayName"); 
     }
 %>
-    <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/>
-<% // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("group.edit.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-edit.jsp?group="+URLEncoder.encode(groupName, "UTF-8")));
-    pageinfo.setSubPageID("group-edit");
-    pageinfo.setExtraParams("group="+URLEncoder.encode(groupName, "UTF-8"));
-%>
 
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="edit_group_properties.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true"/>
+<html>
+    <head>
+        <title><fmt:message key="group.edit.title"/></title>
+        <meta name="subPageID" content="group-edit"/>
+        <meta name="extraParams" content="<%= "group="+URLEncoder.encode(groupName, "UTF-8") %>"/>
+        <meta name="helpPage" content="edit_group_properties.html"/>
+    </head>
+    <body>
 
     <p>
         <fmt:message key="group.edit.form_info" />
@@ -226,7 +219,7 @@
     <div class="jive-success">
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
-        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
         <td class="jive-icon-label">
         <% if (groupInfoChanged) { %>
         <fmt:message key="group.edit.update" />
@@ -252,7 +245,7 @@
  <div class="jive-error">
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
-        <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
+        <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
         <td class="jive-icon-label">
         <% if(add) { %>
         <fmt:message key="group.edit.not_update" />
@@ -282,7 +275,7 @@
                 </td>
                 <td>
                     <a href="group-edit.jsp?edit=true&group=<%= URLEncoder.encode(groupName, "UTF-8") %>">
-                    <img src="images/edit-16x16.gif" border="0">
+                    <img src="images/edit-16x16.gif" border="0" alt="">
                    </a>
                 </td>
                 <% } else { %>
@@ -537,9 +530,8 @@
         document.f.users.focus();
     </script>
 
-    <jsp:include page="footer.jsp" flush="true"/>
-
-
+    </body>
+</html>
 
 <%!
     private static String toList(String[] array, String enc) {

src/web/group-summary.jsp

@@ -25,18 +25,13 @@
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
 <% webManager.init(request, response, session, application, out ); %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("group.summary.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-summary.jsp"));
-    pageinfo.setPageID("group-summary");
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="about_users_and_groups.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="group.summary.title"/></title>
+        <meta name="pageID" content="group-summary"/>
+        <meta name="helpPage" content="about_users_and_groups.html"/>
+    </head>
+    <body>
 
 <%  // Get parameters
     int start = ParamUtils.getIntParameter(request,"start",0);
@@ -154,12 +149,12 @@
         <td width="1%" align="center">
             <a href="group-edit.jsp?group=<%= groupName %>"
              title=<fmt:message key="global.click_edit" />
-             ><img src="images/edit-16x16.gif" width="17" height="17" border="0"></a>
+             ><img src="images/edit-16x16.gif" width="17" height="17" border="0" alt=""></a>
         </td>
         <td width="1%" align="center" style="border-right:1px #ccc solid;">
             <a href="group-delete.jsp?group=<%= groupName %>"
              title=<fmt:message key="global.click_delete" />
-             ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
+             ><img src="images/delete-16x16.gif" width="16" height="16" border="0" alt=""></a>
         </td>
     </tr>
 
@@ -189,4 +184,5 @@
 
 <%  } %>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
+</html>
\ No newline at end of file

src/web/header.jsp

-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
-<%--
-  -	$RCSfile$
-  -	$Revision$
-  -	$Date$
---%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-    <title><fmt:message key="title" /> <fmt:message key="header.admin" /></title>
-    <meta http-equiv="content-type" content="text/html; charset=">
-    <link rel="stylesheet" href="style/global.css" type="text/css">
-</head>
-
-<body>
\ No newline at end of file

src/web/index.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2005 Jive Software. All rights reserved.
   -
   - This software is published under the terms of the GNU Public License (GPL),
   - a copy of which is included in this distribution.
 --%>
 
 <%@ page import="org.jivesoftware.util.*,
-                 java.util.HashMap,
-                 java.util.Map,
-                 org.jivesoftware.messenger.*,
-                 org.jivesoftware.messenger.user.*,
-                 java.util.*,
                  java.text.*,
-                 org.jivesoftware.admin.AdminPageBean,
                  org.jivesoftware.admin.AdminConsole"
 %>
 
@@ -54,22 +47,19 @@
     }
 %>
 
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("index.title");
-    pageinfo.setTitle(title);
-    pageinfo.setPageID("server-settings");
-%>
-
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="about_the_server.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="index.title"/></title>
+        <meta name="pageID" content="server-settings"/>
+        <meta name="helpPage" content="about_the_server.html"/>
+    </head>
+    <body>
 
 <p>
 <fmt:message key="index.title.info" />
 </p>
 
-<script lang="JavaScript" type="text/javascript">
+<script language="JavaScript" type="text/javascript">
     var checked = false;
     function checkClick() {
         if (checked) { return false; }
@@ -313,4 +303,5 @@
 <input type="submit" value="<fmt:message key="global.edit_properties" />">
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
\ No newline at end of file
+</html>
\ No newline at end of file

src/web/license-details.jsp

-<%--
-  -	$RCSfile$
-  -	$Revision$
-  -	$Date$
---%>
-
-<%@ page import="org.jivesoftware.messenger.container.*,
-                 java.text.DateFormat,
-                 java.util.HashMap,
-                 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 ); %>
-
-<!-- Define BreadCrumbs -->
-<c:set var="title" value="License Details"  />
-<c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
-<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");
-    boolean loadNew = request.getParameter("loadNew") != null;
-
-    // Handle a new license
-    Map errors = new HashMap();
-    if (loadNew) {
-        // Validate
-        if (licenseText == null) {
-            errors.put("licenseText","licenseText");
-        }
-        // if no errors, continue
-        if (errors.size() == 0) {
-        }
-    }
-
-    // Date dateFormatter for all dates on this page:
-    DateFormat dateFormatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM,DateFormat.SHORT);
-%>
-
-<p>
-<fmt:message key="license.details.info" /> <fmt:message key="short.title" /> <fmt:message key="license.details.info1" />
-</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" /> <fmt:message key="license.details.details" /></td></tr>
-<tr>
-    <td class="jive-label">
-        <fmt:message key="license.details.type" />
-    </td>
-    <td>
-
-    </td>
-</tr>
-<tr>
-    <td class="jive-label">
-        <fmt:message key="license.details.max_session" />
-    </td>
-    <td>
-       <fmt:message key="license.details.unlimited" />
-    </td>
-</tr>
-<tr>
-    <td class="jive-label">
-        <fmt:message key="license.details.expiration_date" />
-    </td>
-    <td>
-
-
-            <fmt:message key="license.details.expiration_date_never" />
-
-
-    </td>
-</tr>
-</table>
-</div>
-
-<%--
-
-<br>
-
-<p>
-<b>Update License</b>
-</p>
-
-<p>
-You can update your license by entering new license text below and clicking
-"Update License". Note, this will first verify the license before overriding your
-current one.
-</p>
-
-<form action="license-details.jsp" method="post">
-
-<div class="jive-table">
-<table cellpadding="3" cellspacing="1" border="0" width="100%">
-<tr valign="top">
-    <td class="jive-label">
-        New License Text:
-    </td>
-    <td>
-        <textarea cols="50" rows="6" wrap="virtual" name="licenseText"></textarea>
-    </td>
-</tr>
-</table>
-</div>
-
-<br>
-
-<input type="submit" name="loadNew" value="Update License">
-
-</form>
-
---%>
-
-<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file

src/web/log.jsp

@@ -11,10 +11,8 @@
 
 <%@ page import="java.io.*,
                  java.text.SimpleDateFormat,
-                 org.jivesoftware.messenger.user.User,
                  java.util.Date,
                  java.text.ParseException,
-                 org.jivesoftware.messenger.auth.UnauthorizedException,
                  org.jivesoftware.util.ParamUtils,
                  org.jivesoftware.util.Log,
                  org.jivesoftware.util.StringUtils"
@@ -138,6 +136,7 @@
 <html>
 <head>
     <title><%= log %></title>
+    <meta name="decorator" content="false"/>
     <style type="text/css">
     .log TABLE {
         border : 1px #ccc solid;

src/web/login.jsp

@@ -50,7 +50,7 @@
 
 <%-- Check if in setup mode --%>
 <c:if test="${admin.setupMode}">
-  <c:redirect url="setup-index.jsp" />
+  <c:redirect url="setup/setup-index.jsp" />
 </c:if>
 
 <%	// get parameters

src/web/logviewer.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
@@ -12,12 +11,9 @@
 <%@ page import="java.io.*,
                  org.jivesoftware.util.*,
                  java.text.*,
-                 org.jivesoftware.util.log.Logger,
-                 org.jivesoftware.messenger.auth.UnauthorizedException,
                  org.jivesoftware.util.JiveGlobals,
                  org.jivesoftware.messenger.user.*,
-                 java.util.*,
-                 org.jivesoftware.admin.AdminPageBean"
+                 java.util.*"
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
@@ -49,7 +45,7 @@
             return empty;
         }
         StringTokenizer tokenizer = new StringTokenizer(cookie.getValue(),"&");
-        HashMap valueMap = new HashMap();
+        HashMap<String, String> valueMap = new HashMap<String, String>();
         while (tokenizer.hasMoreTokens()) {
             String tok = tokenizer.nextToken();
             int pos = tok.indexOf("=");
@@ -196,22 +192,16 @@
     HashMap newlogs = getLogUpdate(request, response, logDir);
 %>
 
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("logviewer.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "logviewer.jsp?log=" + log));
-    pageinfo.setPageID("server-logs");
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="use_the_server_logs.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="logviewer.title"/></title>
+        <meta name="pageID" content="server-logs"/>
+        <meta name="helpPage" content="use_the_server_logs.html"/>
+    </head>
+    <body>
 
 <%  if (refreshParam != null && !NONE.equals(refreshParam)) { %>
-
     <meta http-equiv="refresh" content="<%= refresh %>">
-
 <%  } %>
 
 <div id="logviewer">
@@ -447,4 +437,5 @@ IFRAME {
 
 </div>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
\ No newline at end of file
+</html>
\ No newline at end of file

src/web/muc-create-permission.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2005 Jive Software. All rights reserved.
   -
   - This software is published under the terms of the GNU Public License (GPL),
   - a copy of which is included in this distribution.
@@ -11,17 +10,14 @@
 
 <%@ page import="org.jivesoftware.util.*,
                  java.util.*,
-                 org.jivesoftware.messenger.*,
-                 org.jivesoftware.admin.*,
-                 org.jivesoftware.messenger.muc.MultiUserChatServer,
-                 java.util.Iterator"
+                 org.jivesoftware.messenger.muc.MultiUserChatServer"
     errorPage="error.jsp"
 %>
 
 <%@ 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 ); %>
+<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
+<% webManager.init(request, response, session, application, out ); %>
 
 <%  // Get parameters
     String userJID = ParamUtils.getParameter(request,"userJID");
@@ -34,7 +30,7 @@
     boolean openPerms = ParamUtils.getBooleanParameter(request,"openPerms");
 
 	// Get muc server
-    MultiUserChatServer mucServer = admin.getMultiUserChatServer();
+    MultiUserChatServer mucServer = webManager.getMultiUserChatServer();
 
     // Handle a save
     Map errors = new HashMap();
@@ -82,18 +78,13 @@
     }
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("muc.create.permission.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-create-permission.jsp"));
-    pageinfo.setPageID("muc-perms");
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="set_group_chat_room_creation_permissions.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="muc.create.permission.title"/></title>
+        <meta name="pageID" content="muc-perms"/>
+        <meta name="helpPage" content="set_group_chat_room_creation_permissions.html"/>
+    </head>
+    <body>
 
 <p>
 <fmt:message key="muc.create.permission.info" />
@@ -235,4 +226,5 @@
 
 <%  } %>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
+</html>
\ No newline at end of file

src/web/muc-history-settings.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
@@ -11,8 +10,6 @@
 
 <%@ page import="org.jivesoftware.util.*,
                  java.util.*,                  
-                 org.jivesoftware.messenger.*,
-                 org.jivesoftware.admin.*,
                  org.jivesoftware.messenger.muc.HistoryStrategy,
                  org.jivesoftware.messenger.muc.MultiUserChatServer"
     errorPage="error.jsp"
@@ -29,8 +26,8 @@
     static final int NUMBER = 3;
 %>
 
-<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"/>
-<%  admin.init(request, response, session, application, out ); %>
+<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
+<%  webManager.init(request, response, session, application, out ); %>
 
 <%   // Get parameters:
     boolean update = request.getParameter("update") != null;
@@ -38,7 +35,7 @@
     int numMessages = ParamUtils.getIntParameter(request,"numMessages",0);
 
 	// Get muc history
-    MultiUserChatServer mucServer = admin.getMultiUserChatServer();
+    MultiUserChatServer mucServer = webManager.getMultiUserChatServer();
     HistoryStrategy historyStrat = mucServer.getHistoryStrategy();
 
     Map errors = new HashMap();
@@ -86,18 +83,13 @@
     }
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("groupchat.history.settings.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-history-settings.jsp"));
-    pageinfo.setPageID("muc-history");
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="edit_group_chat_history_settings.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="groupchat.history.settings.title"/></title>
+        <meta name="pageID" content="muc-history"/>
+        <meta name="helpPage" content="edit_group_chat_history_settings.html"/>
+    </head>
+    <body>
 
 <p>
 <fmt:message key="groupchat.history.settings.introduction" />
@@ -172,4 +164,5 @@
 
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
\ No newline at end of file
+</html>
\ No newline at end of file

src/web/muc-room-affiliations.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2005 Jive Software. All rights reserved.
   -
   - This software is the proprietary information of Jive Software.
   - Use is subject to license terms.
@@ -11,9 +10,6 @@
 
 <%@ page import="org.jivesoftware.util.*,
                  java.util.*,
-                 org.jivesoftware.messenger.*,
-                 org.jivesoftware.admin.*,
-                 java.util.Iterator,
                  org.jivesoftware.messenger.muc.*,
                  org.xmpp.packet.IQ,
                  org.dom4j.Element,
@@ -23,8 +19,8 @@
 
 <%@ 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 ); %>
+<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
+<% webManager.init(request, response, session, application, out ); %>
 
 <%  // Get parameters
     String roomName = ParamUtils.getParameter(request,"roomName");
@@ -37,7 +33,7 @@
     boolean delete = ParamUtils.getBooleanParameter(request,"delete");
 
     // Load the room object
-    MUCRoom room = admin.getMultiUserChatServer().getChatRoom(roomName);
+    MUCRoom room = webManager.getMultiUserChatServer().getChatRoom(roomName);
 
     if (room == null) {
         // The requested room name does not exist so return to the list of the existing rooms
@@ -105,19 +101,14 @@
     }
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("muc.room.affiliations.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-room-affiliations.jsp?roomName="+URLEncoder.encode(roomName, "UTF-8")));
-    pageinfo.setSubPageID("muc-room-affiliations");
-    pageinfo.setExtraParams("roomName="+URLEncoder.encode(roomName, "UTF-8"));
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="edit_group_chat_room_user_permissions.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="muc.room.affiliations.title"/></title>
+        <meta name="subPageID" content="muc-room-affiliations"/>
+        <meta name="extraParams" content="<%= "roomName="+URLEncoder.encode(roomName, "UTF-8") %>"/>
+        <meta name="helpPage" content="edit_group_chat_room_user_permissions.html"/>
+    </head>
+    <body>
 
 <p>
 <fmt:message key="muc.room.affiliations.info" />
@@ -322,4 +313,5 @@
 
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
+</html>
\ No newline at end of file

src/web/muc-room-create.jsp

-<%--
-  -	$RCSfile$
-  -	$Revision$
-  -	$Date$
-  -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
-  -
-  - This software is the proprietary information of Jive Software.
-  - Use is subject to license terms.
---%>
-
-<%  // Redirect to muc-room-edit-form and set that a room will be created
-    response.sendRedirect("muc-room-edit-form.jsp?&create=true");
-    return;
-%>
\ No newline at end of file

src/web/muc-room-delete.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
@@ -10,7 +9,6 @@
 --%>
 
 <%@ page import="org.jivesoftware.util.*,
-                 org.jivesoftware.admin.*,
                  org.jivesoftware.messenger.muc.MUCRoom,
                  java.net.URLEncoder"
     errorPage="error.jsp"
@@ -50,19 +48,14 @@
     }
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("muc.room.delete.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-room-delete.jsp?roomName="+URLEncoder.encode(roomName, "UTF-8")));
-    pageinfo.setSubPageID("muc-room-delete");
-    pageinfo.setExtraParams("roomName="+URLEncoder.encode(roomName, "UTF-8"));
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="delete_a_group_chat_room.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="muc.room.delete.title"/></title>
+        <meta name="subPageID" content="muc-room-delete"/>
+        <meta name="extraParams" content="<%= "roomName="+URLEncoder.encode(roomName, "UTF-8") %>"/>
+        <meta name="helpPage" content="delete_a_group_chat_room.html"/>
+    </head>
+    <body>
 
 <p>
 <fmt:message key="muc.room.delete.info" />
@@ -113,4 +106,5 @@
 <input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
+</html>
\ No newline at end of file

src/web/muc-room-edit-form.jsp

@@ -79,7 +79,7 @@
     }
 
     // Handle an save
-    Map errors = new HashMap();
+    Map<String, String> errors = new HashMap<String, String>();
     if (save) {
         // do validation
 
@@ -307,25 +307,18 @@
     roomName = roomName == null ? "" : roomName;
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("muc.room.edit.form.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    if (create) {
-        pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-room-edit-form.jsp?create=true"));
-        pageinfo.setPageID("muc-room-create");
-    }
-    else {
-        pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-room-edit-form.jsp?roomName="+URLEncoder.encode(roomName, "UTF-8")));
-        pageinfo.setSubPageID("muc-room-edit-form");
-    }
-    pageinfo.setExtraParams("roomName="+URLEncoder.encode(roomName, "UTF-8")+"&create="+create);
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="view_group_chat_room_summary.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="muc.room.edit.form.title"/></title>
+        <% if (create) { %>
+        <meta name="pageID" content="muc-room-create"/>
+        <% } else { %>
+        <meta name="subPageID" content="muc-room-edit-form"/>
+        <% } %>
+        <meta name="extraParams" content="<%= "roomName="+URLEncoder.encode(roomName, "UTF-8")+"&create="+create %>"/>
+        <meta name="helpPage" content="view_group_chat_room_summary.html"/>
+    </head>
+    <body>
 
 <%  if (!errors.isEmpty()) { %>
 
@@ -381,7 +374,7 @@
         </td></tr>
     </tbody>
     </table>
-    </div><br
+    </div><br>
 
 <%  } %>
 
@@ -423,7 +416,8 @@
 <input type="hidden" name="roomconfig_persistentroom" value="<%= persistentRoom %>">
 
     <table width="100%" border="0"> <tr>
-         <td width="70%"><table width="100%"  border="0">
+         <td width="70%">
+            <table width="100%" border="0">
                 <tbody>
                 <% if (create) { %>
                 <tr>
@@ -488,7 +482,9 @@
                     </td>
                  </tr>
          </tbody>
-         </table></td>
+         </table>
+
+         </td>
         <td width="30%" valign="top" >
         <fieldset>
         <legend><fmt:message key="muc.room.edit.form.room_options" /></legend>
@@ -530,6 +526,7 @@
                 <td><input type="checkbox" name="roomconfig_enablelogging" value="true" id="enablelogging" <% if ("true".equals(enableLog)) out.write("checked");%>>
                     <LABEL FOR="enablelogging"><fmt:message key="muc.room.edit.form.log" /></td>
             </tr>
+        </tbody>
         </table>
         </fieldset>
         </tr>
@@ -541,4 +538,5 @@
     </table>
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
\ No newline at end of file
+</html>
\ No newline at end of file

src/web/muc-room-summary.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2005 Jive Software. All rights reserved.
   -
   - This software is the proprietary information of Jive Software.
   - Use is subject to license terms.
 --%>
 
 <%@ page import="org.jivesoftware.util.*,
-                 org.jivesoftware.messenger.muc.spi.*,
-                 java.text.DateFormat,
                  org.jivesoftware.admin.*,
                  org.jivesoftware.messenger.muc.MUCRoom,
                  java.util.*,
@@ -24,18 +21,13 @@
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
 <% webManager.init(request, response, session, application, out ); %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("muc.room.summary.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-room-summary.jsp"));
-    pageinfo.setPageID("muc-room-summary");
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="edit_group_chat_room_settings.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="muc.room.summary.title"/></title>
+        <meta name="pageID" content="muc-room-summary"/>
+        <meta name="helpPage" content="edit_group_chat_room_settings.html"/>
+    </head>
+    <body>
 
 <%  // Get parameters
     int start = ParamUtils.getIntParameter(request,"start",0);
@@ -205,4 +197,5 @@
 
 <%  } %>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
+</html>
\ No newline at end of file

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

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2005 Jive Software. All rights reserved.
   -
   - This software is published under the terms of the GNU Public License (GPL),
   - a copy of which is included in this distribution.
 --%>
 
 <%@ page import="org.jivesoftware.util.ParamUtils,
-                 java.text.DateFormat,
-                 org.jivesoftware.messenger.XMPPServerInfo,
-                 org.jivesoftware.messenger.muc.MultiUserChatServer,
-                 org.jivesoftware.admin.*,
-                 org.jivesoftware.util.JiveGlobals,
-                 java.util.*,
-                 org.jivesoftware.util.LocaleUtils"
+                 java.util.*"
     errorPage="error.jsp"
 %>
 
@@ -32,9 +25,8 @@
 %>
 
 <%-- Define Administration Bean --%>
-<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
-<c:set var="admin" value="${admin.manager}" />
-<% admin.init(pageContext); %>
+<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
+<% webManager.init(request, response, session, application, out ); %>
 
 <%  // Get parameters
     boolean save = request.getParameter("save") != null;
@@ -53,34 +45,29 @@
             errors.put("mucname","mucname");
         }
         if (errors.size() == 0) {
-            admin.getMultiUserChatServer().setServiceName(muc);
+            webManager.getMultiUserChatServer().setServiceName(muc);
             response.sendRedirect("muc-server-props-edit-form.jsp?success=true&mucname="+muc);
             return;
         }
     }
     else if(muc == null) {
-        name = admin.getServerInfo().getName() == null ? "" : admin.getServerInfo().getName();
-        muc = admin.getMultiUserChatServer().getServiceName() == null  ? "" : admin.getMultiUserChatServer().getServiceName();
+        name = webManager.getServerInfo().getName() == null ? "" : webManager.getServerInfo().getName();
+        muc = webManager.getMultiUserChatServer().getServiceName() == null  ? "" : webManager.getMultiUserChatServer().getServiceName();
     }
 
-    name = admin.getServerInfo().getName();
+    name = webManager.getServerInfo().getName();
     if (errors.size() == 0 && muc == null) {
-        muc = admin.getMultiUserChatServer().getServiceName();
+        muc = webManager.getMultiUserChatServer().getServiceName();
     }
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("groupchat.service.properties.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-server-props-edit-form.jsp"));
-    pageinfo.setPageID("muc-server-props");
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="edit_group_chat_service_properties.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="groupchat.service.properties.title"/></title>
+        <meta name="pageID" content="muc-server-props"/>
+        <meta name="helpPage" content="edit_group_chat_service_properties.html"/>
+    </head>
+    <body>
 
 <p>
 <fmt:message key="groupchat.service.properties.introduction" />
@@ -148,4 +135,5 @@
 
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
\ No newline at end of file
+</html>
\ No newline at end of file

src/web/muc-sysadmins.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2005 Jive Software. All rights reserved.
   -
   - This software is published under the terms of the GNU Public License (GPL),
   - a copy of which is included in this distribution.
@@ -11,10 +10,8 @@
 
 <%@ page import="org.jivesoftware.util.*,
                  java.util.*,
-                 org.jivesoftware.messenger.*,
                  org.jivesoftware.admin.*,
-                 org.jivesoftware.messenger.muc.MultiUserChatServer,
-                 java.util.Iterator"
+                 org.jivesoftware.messenger.muc.MultiUserChatServer"
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>

src/web/plugin-admin.jsp

@@ -5,17 +5,8 @@
   - a copy of which is included in this distribution.
 --%>
 
-<%@ page import="java.util.zip.ZipFile,
-                 java.util.jar.JarFile,
-                 java.util.jar.JarEntry,
-                 java.io.*,
-                 org.dom4j.io.SAXReader,
-                 org.dom4j.Document,
-                 org.dom4j.Element,
-                 org.dom4j.Node,
-                 java.text.DateFormat,
+<%@ page import="java.io.*,
                  org.jivesoftware.admin.AdminPageBean,
-				 org.jivesoftware.messenger.XMPPServer,
 				 org.jivesoftware.messenger.container.PluginManager,
 				 org.jivesoftware.util.*,
                  org.jivesoftware.messenger.container.Plugin,
@@ -202,7 +193,7 @@
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
         <tr>
-        	<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+        	<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
         	<td class="jive-icon-label"><fmt:message key="plugin.admin.deleted_success" /></td>
         </tr>
     </tbody>
@@ -216,7 +207,7 @@
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
         <tr>
-        	<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
+        	<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt="" />></td>
         	<td class="jive-icon-label"><fmt:message key="plugin.admin.deleted_failure" /></td>
         </tr>
     </tbody>
@@ -231,7 +222,7 @@
     <div class="jive-success">
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
-        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
         <td class="jive-icon-label"><fmt:message key="plugin.admin.reload_success" /></td></tr>
     </tbody>
     </table>
@@ -271,8 +262,7 @@
     }
 
     int count = 0;
-    for (int i=0; i<plugins.size(); i++) {
-        Plugin plugin = plugins.get(i);
+    for (Plugin plugin : plugins) {
         String dirName = pluginManager.getPluginDirectory(plugin).getName();
         // Skip the admin plugin.
         if (!"admin".equals(dirName)) {
@@ -326,12 +316,12 @@
 	        <td width="1%" align="center">
 	            <a href="plugin-admin.jsp?reloadplugin=<%= dirName %>"
 	             title="<fmt:message key="plugin.admin.click_reload" />"
-	             ><img src="images/refresh-16x16.gif" width="16" height="16" border="0"></a>
+	             ><img src="images/refresh-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="global.refresh" />"></a>
 	        </td>
 	        <td width="1%" align="center" style="border-right:1px #ccc solid;">
 	            <a href="#" onclick="if (confirm('<fmt:message key="plugin.admin.confirm" />')) { location.replace('plugin-admin.jsp?deleteplugin=<%= dirName %>'); } "
 	             title="<fmt:message key="global.click_delete" />"
-	             ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
+	             ><img src="images/delete-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="global.delete" />"></a>
 	        </td>
 	    </tr>
 <%		    

src/web/server-locale.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
-  - Copyright (C) 2004 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2005 Jive Software. All rights reserved.
   -
   - This software is published under the terms of the GNU Public License (GPL),
   - a copy of which is included in this distribution.
@@ -18,13 +17,6 @@
 <%@ 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" />
-
-<%-- Define Administration Bean --%>
-<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
-<% webManager.init(request, response, session, application, out); %>
-
 <%  // Get parameters //
     String localeCode = ParamUtils.getParameter(request,"localeCode");
     String timeZoneID = ParamUtils.getParameter(request,"timeZoneID");
@@ -61,16 +53,14 @@
     TimeZone timeZone = JiveGlobals.getTimeZone();
 %>
 
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("locale.title");
-    pageinfo.setTitle(title);
-    pageinfo.setPageID("server-locale");
-%>
+<html>
+    <head>
+        <title><fmt:message key="locale.title" /></title>
+        <meta name="pageID" content="server-locale"/>
+        <meta name="helpPage" content="edit_server_properties.html"/>
+    </head>
 
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="edit_server_properties.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<body>
 
 <p>
 <fmt:message key="locale.title.info" />
@@ -200,4 +190,6 @@
 
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+
\ No newline at end of file
+</body>
+</html>
\ No newline at end of file

src/web/session-filter.jsp

-<%--
-  -	$RCSfile$
-  -	$Revision$
-  -	$Date$
---%>
-
-<%@ page import="org.jivesoftware.util.*,
-                 org.jivesoftware.messenger.SessionManager,
-                 java.util.*,
-                 org.jivesoftware.messenger.Session" %>
-
-<%@ include file="global.jsp" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
-<%  // Check to see if the server is down.
-    if (xmppServer == null) {
-        response.sendRedirect("error-serverdown.jsp");
-        return;
-    }
-%>
-
-<%  // Get parameters
-    boolean doFilter = ParamUtils.getBooleanParameter(request, "doFilter");
-    boolean choose = ParamUtils.getBooleanParameter(request,"choose");
-    boolean remove = ParamUtils.getBooleanParameter(request, "remove");
-    String username = ParamUtils.getParameter(request, "username");
-    String usernameTF = ParamUtils.getParameter(request, "usernameTF");
-    String usernameSEL = ParamUtils.getParameter(request, "usernameSEL");
-    if (username == null) {
-        if (choose) {
-            username = usernameSEL;
-        }
-        else {
-            username = usernameTF;
-        }
-    }
-
-    boolean errors = false;
-    if (doFilter) {
-        if (username == null) {
-            errors = true;
-        }
-        else {
-            // Set the username in the session, return to the session summary page:
-            session.setAttribute("messenger.admin.session-summary.username",username);
-            response.sendRedirect("session-summary.jsp");
-            return;
-        }
-    }
-
-    if (remove) {
-        // Remove the filtered username from the session:
-        session.removeAttribute("messenger.admin.session-summary.username");
-        response.sendRedirect("session-summary.jsp");
-        return;
-    }
-%>
-
-<jsp:include page="header.jsp" flush="true" />
-
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("session.filter.title");
-    String[][] breadcrumbs = {
-        {"Home", "index.jsp"},
-        {"Session Summary", "session-summary.jsp"},
-        {title, "session-filter.jsp"}
-    };
-%>
-<jsp:include page="title.jsp" flush="true" />
-
-<p>
-<fmt:message key="session.filter.info" />
-</p>
-
-<%  if (errors) { %>
-
-    <p class="jive-error-text">
-    <fmt:message key="session.filter.enter_username" />
-    </p>
-
-<%  } %>
-
-<form action="session-filter.jsp" name="filterform">
-<input type="hidden" name="doFilter" value="true">
-
-<table cellpadding="3" cellspacing="0" border="0" width="100%">
-<tr valign="top">
-    <td width="1%" nowrap align="center">
-        <input type="radio" name="choose" value="false">
-    </td>
-    <td width="1%" nowrap>
-        <fmt:message key="session.filter.specify_username" />
-    </td>
-    <td width="98%">
-        <input type="text" name="usernameTF" size="30" maxlength="100"
-         value="<%= ((username != null) ? username : "") %>"
-         onfocus="this.form.choose[0].checked=true;">
-    </td>
-</tr>
-<tr valign="top">
-    <td width="1%" nowrap align="center">
-        <input type="radio" name="choose" value="true">
-    </td>
-    <td width="1%" nowrap>
-        <fmt:message key="session.filter.choose_user" />
-    </td>
-    <td width="98%">
-        <select size="1" name="usernameSEL" onfocus="this.form.choose[1].checked=true;">
-            <%
-                Collection<User> users = userManager.getUsers();
-                for (User user: users) {
-            %>
-                <option value="<%= user.getUsername() %>"><%= user.getUsername() %></option>
-
-            <%  } %>
-        </select>
-    </td>
-</tr>
-</table>
-
-<br>
-
-<input type="submit" value="Save and Return">
-<input type="submit" value="<fmt:message key="global.cancel" />" onclick="location.href='session-summary.jsp';">
-
-</form>
-
-<script language="JavaScript" type="text/javascript">
-<%  if (!doFilter) { %>
-
-    document.filterform.usernameTF.focus();
-
-<%  } else { %>
-
-    <%  if (usernameSEL == null) { %>
-
-        document.filterform.usernameTF.focus();
-
-    <%  } %>
-
-<%  } %>
-</script>
-
-<jsp:include page="footer.jsp" flush="true" />
\ No newline at end of file

src/web/session-summary.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
@@ -13,7 +12,6 @@
                  java.util.*,
                  org.jivesoftware.messenger.*,
                  java.util.Date,
-                 org.jivesoftware.admin.*,
                  org.xmpp.packet.JID"
     errorPage="error.jsp"
 %>
@@ -29,26 +27,26 @@
     static final int[] REFRESHES = {0, 10, 30, 60, 90};
     static final String[] REFRESHES_LABELS = {NONE,"10","30","60","90"};
 %>
-<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
-<% admin.init(request, response, session, application, out ); %>
+<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
+<% webManager.init(request, response, session, application, out ); %>
 
 <%  // Get parameters
     int start = ParamUtils.getIntParameter(request,"start",0);
-    int range = ParamUtils.getIntParameter(request,"range",admin.getRowsPerPage("session-summary", DEFAULT_RANGE));
-    int refresh = ParamUtils.getIntParameter(request,"refresh",admin.getRefreshValue("session-summary", 0));
+    int range = ParamUtils.getIntParameter(request,"range",webManager.getRowsPerPage("session-summary", DEFAULT_RANGE));
+    int refresh = ParamUtils.getIntParameter(request,"refresh",webManager.getRefreshValue("session-summary", 0));
     boolean close = ParamUtils.getBooleanParameter(request,"close");
     String jid = ParamUtils.getParameter(request,"jid");
 
     if (request.getParameter("range") != null) {
-        admin.setRowsPerPage("session-summary", range);
+        webManager.setRowsPerPage("session-summary", range);
     }
 
     if (request.getParameter("refresh") != null) {
-        admin.setRefreshValue("session-summary", refresh);
+        webManager.setRefreshValue("session-summary", refresh);
     }
 
     // Get the user manager
-    SessionManager sessionManager = admin.getSessionManager();
+    SessionManager sessionManager = webManager.getSessionManager();
 
     // Get the session count
     int sessionCount = sessionManager.getSessionCount();
@@ -65,7 +63,7 @@
         catch (Exception ignored) {
             // Session might have disappeared on its own
         }
-        // redirect back to this page
+        // Redirect back to this page
         response.sendRedirect("session-summary.jsp?close=success");
         return;
     }
@@ -75,24 +73,13 @@
     int curPage = (start/range) + 1;
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("session.summary.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-summary.jsp"));
-    pageinfo.setPageID("session-summary");
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="view_active_client_sessions.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
-
-<%  if (refresh > 0) { %>
-
-    <meta http-equiv="refresh" content="<%= refresh %>">
-
-<%  } %>
+<html>
+    <head>
+        <title><fmt:message key="session.summary.title"/></title>
+        <meta name="pageID" content="session-summary"/>
+        <meta name="helpPage" content="view_active_client_sessions.html"/>
+    </head>
+    <body>
 
 <%  if ("success".equals(request.getParameter("close"))) { %>
 
@@ -102,6 +89,10 @@
 
 <%  } %>
 
+<%  if (refresh > 0) { %>
+    <meta http-equiv="refresh" content="<%= refresh %>">
+<%  } %>
+
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
 <tbody>
 <form action="session-summary.jsp" method="get">
@@ -203,7 +194,6 @@
             count++;
     %>
         <%@ include file="session-row.jspf" %>
-
     <%  } %>
 
 </tbody>
@@ -234,4 +224,5 @@
 <fmt:message key="session.summary.last_update" />: <%= JiveGlobals.formatDateTime(new Date()) %>
 </p>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
+</html>
\ No newline at end of file

src/web/setup-admin-settings.jsp → src/web/setup/setup-admin-settings.jsp

 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 1410 $
+  -	$Date: 2005-05-26 23:00:40 -0700 (Thu, 26 May 2005) $
 --%>
 
 <%@ page import="org.jivesoftware.util.*,

src/web/setup-completed.jsp → src/web/setup/setup-completed.jsp

@@ -2,8 +2,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 985 $
+  -	$Date: 2005-02-18 10:35:44 -0800 (Fri, 18 Feb 2005) $
 --%>  
 
 <%@ page import="org.jivesoftware.util.*" %>
@@ -34,14 +34,14 @@
 </table>
 </span>
 <table bgcolor="#bbbbbb" cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr><td><img src="images/blank.gif" width="1" height="1" border="0"></td></tr>
+<tr><td><img src="../images/blank.gif" width="1" height="1" border="0"></td></tr>
 </table>
 <table bgcolor="#dddddd" cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr><td><img src="images/blank.gif" width="1" height="1" border="0"></td></tr>
+<tr><td><img src="../images/blank.gif" width="1" height="1" border="0"></td></tr>
 
 </table>
 <table bgcolor="#eeeeee" cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr><td><img src="images/blank.gif" width="1" height="1" border="0"></td></tr>
+<tr><td><img src="../images/blank.gif" width="1" height="1" border="0"></td></tr>
 </table>
 
 <br>

src/web/setup-datasource-jndi.jsp → src/web/setup/setup-datasource-jndi.jsp

@@ -2,8 +2,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 1410 $
+  -	$Date: 2005-05-26 23:00:40 -0700 (Thu, 26 May 2005) $
 --%>
 
 <%@ page import="org.jivesoftware.util.ParamUtils,

src/web/setup-datasource-settings.jsp → src/web/setup/setup-datasource-settings.jsp

@@ -2,8 +2,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 1410 $
+  -	$Date: 2005-05-26 23:00:40 -0700 (Thu, 26 May 2005) $
 --%>
 
 <%@ page import="org.jivesoftware.util.ParamUtils,

src/web/setup-datasource-standard.jsp → src/web/setup/setup-datasource-standard.jsp

@@ -2,8 +2,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 1772 $
+  -	$Date: 2005-08-11 12:56:15 -0700 (Thu, 11 Aug 2005) $
 --%>
 
 <%@ page import="org.jivesoftware.util.ParamUtils,

src/web/setup-env-check.jspf → src/web/setup/setup-env-check.jspf

 <%--
-
   -	$RCSfile$
-
-  -	$Revision$
-
-  -	$Date$
-
+  -	$Revision: 1217 $
+  -	$Date: 2005-04-11 14:11:06 -0700 (Mon, 11 Apr 2005) $
 --%>
 
-
-
 <%@ page import="java.lang.reflect.Method,
-
                  java.io.File,
-
                  org.jivesoftware.util.LocaleUtils" %>
 
-
-
 <%-- note, the loadClass method is defined in setup-global.jspf --%>
 
-
-
 <%  // Check the user's environment for minimum requirements.
 
-
-
     boolean jdk13Installed = false;
-
     boolean servlet22Installed = false;
-
     boolean jsp11Installed = false;
-
     boolean jiveJarsInstalled = false;
-
     boolean messengerHomeExists = false;
-
     File messengerHome = null;
 
-
-
     // Check for JDK 1.5
-
     try {
-
         loadClass("java.util.concurrent.ConcurrentHashMap");
-
         jdk13Installed = true;
-
     }
-
     catch (ClassNotFoundException cnfe) {}
-
     // Check for Servlet 2.3:
-
     try {
-
         Class c = loadClass("javax.servlet.http.HttpSession");
-
         Method m = c.getMethod("getAttribute",new Class[]{String.class});
-
         servlet22Installed = true;
-
     }
-
     catch (ClassNotFoundException cnfe) {}
-
     // Check for JSP 1.1:
-
     try {
-
         loadClass("javax.servlet.jsp.tagext.Tag");
-
         jsp11Installed = true;
-
     }
-
     catch (ClassNotFoundException cnfe) {}
-
     // Check that the Messenger jar are installed:
-
     try {
-
         loadClass("org.jivesoftware.messenger.XMPPServer");
-
         jiveJarsInstalled = true;
-
     }
-
     catch (ClassNotFoundException cnfe) {}
 
-
-
     // Try to determine what the jiveHome directory is:
-
     try {
-
         Class jiveGlobalsClass = loadClass("org.jivesoftware.util.JiveGlobals");
-
         Method getMessengerHomeMethod = jiveGlobalsClass.getMethod("getHomeDirectory", (Class[])null);
-
         String messengerHomeProp = (String)getMessengerHomeMethod.invoke(jiveGlobalsClass, (Object[])null);
-
         if (messengerHomeProp != null) {
-
             messengerHome = new File(messengerHomeProp);
-
             if (messengerHome.exists()) {
-
                 messengerHomeExists = true;
-
             }
-
         }
-
     }
-
     catch (Exception e) {
-
         e.printStackTrace();
-
     }
 
-
-
     // If there were no errors, redirect to the main setup page
-
     if (!jdk13Installed || !servlet22Installed || !jsp11Installed || !jiveJarsInstalled
-
             || !messengerHomeExists)
-
     {
-
 %>
-
         <html>
-
         <head>
-
             <title><fmt:message key="title" /> <fmt:message key="setup.title" /></title>
-
             <link rel="stylesheet" type="text/css" href="style.css">
-
         </head>
-
         <body>
 
-
-
         <p class="jive-setup-page-header">
-
         <fmt:message key="title" /> <fmt:message key="setup.title" />
-
         </p>
 
-
-
         <p class="jive-setup-error-text">
-
         <fmt:message key="setup.env.check.error" /> <fmt:message key="title" /> <fmt:message key="setup.title" />.
-
         </p>
 
-
-
         <p>
-
         <fmt:message key="setup.env.check.error_info">
-
             <fmt:param value="<%= LocaleUtils.getLocalizedString("title") %>" />
-
         </fmt:message>
-
         </p>
 
-
-
         <ul>
-
         <table cellpadding="3" cellspacing="2" border="0">
-
         <%  if (jdk13Installed) { %>
 
-
-
             <tr>
-
-                <td><img src="images/check.gif" width="13" height="13" border="0"></td>
-
+                <td><img src="../images/check.gif" width="13" height="13" border="0"></td>
                 <td>
-
                     <fmt:message key="setup.env.check.jdk" />
-
                 </td>
-
             </tr>
 
-
-
         <%  } else { %>
 
-
-
             <tr>
-
-                <td><img src="images/x.gif" width="13" height="13" border="0"></td>
-
+                <td><img src="../images/x.gif" width="13" height="13" border="0"></td>
                 <td>
-
                     <span class="jive-setup-error-text">
-
                     <fmt:message key="setup.env.check.jdk" />
-
                     </span>
-
                 </td>
-
             </tr>
 
-
-
         <%  }
-
             if (servlet22Installed) {
-
         %>
-
             <tr>
-
-                <td><img src="images/check.gif" width="13" height="13" border="0"></td>
-
+                <td><img src="../images/check.gif" width="13" height="13" border="0"></td>
                 <td>
-
                     <fmt:message key="setup.env.check.servlet" />
-
                 </td>
-
             </tr>
 
-
-
         <%  } else { %>
 
-
-
             <tr>
-
-                <td><img src="images/x.gif" width="13" height="13" border="0"></td>
-
+                <td><img src="../images/x.gif" width="13" height="13" border="0"></td>
                 <td>
-
                     <span class="jive-setup-error-text">
-
                     <fmt:message key="setup.env.check.servlet" />
-
                     </span>
-
                 </td>
-
             </tr>
 
-
-
         <%  }
-
             if (jsp11Installed) {
-
         %>
-
             <tr>
-
-                <td><img src="images/check.gif" width="13" height="13" border="0"></td>
-
+                <td><img src="../images/check.gif" width="13" height="13" border="0"></td>
                 <td>
-
                     <fmt:message key="setup.env.check.jsp" />
-
                 </td>
-
             </tr>
 
-
-
         <%  } else { %>
 
-
-
             <tr>
-
-                <td><img src="images/x.gif" width="13" height="13" border="0"></td>
-
+                <td><img src="../images/x.gif" width="13" height="13" border="0"></td>
                 <td>
-
                     <span class="jive-setup-error-text">
-
                     <fmt:message key="setup.env.check.jsp" />
-
                     </span>
-
                 </td>
-
             </tr>
 
-
-
         <%  }
-
             if (jiveJarsInstalled) {
-
         %>
-
             <tr>
-
-                <td><img src="images/check.gif" width="13" height="13" border="0"></td>
-
+                <td><img src="../images/check.gif" width="13" height="13" border="0"></td>
                 <td>
-
                     <fmt:message key="title" /> <fmt:message key="setup.env.check.class" />
-
                 </td>
-
             </tr>
 
-
-
         <%  } else { %>
 
-
-
             <tr>
-
-                <td><img src="images/x.gif" width="13" height="13" border="0"></td>
-
+                <td><img src="../images/x.gif" width="13" height="13" border="0"></td>
                 <td>
-
                     <span class="jive-setup-error-text">
-
                     <fmt:message key="title" /> <fmt:message key="setup.env.check.class" />
-
                     </span>
-
                 </td>
-
             </tr>
 
-
-
         <%  }
-
             if (messengerHomeExists) {
-
         %>
-
             <tr>
-
-                <td><img src="images/x.gif" width="13" height="13" border="0"></td>
-
+                <td><img src="../images/x.gif" width="13" height="13" border="0"></td>
                 <td>
-
                     <span class="jive-setup-error-text">
-
                     <fmt:message key="setup.env.check.jive" /> (<%= messengerHome.toString() %>)
-
                     </span>
-
                 </td>
-
             </tr>
 
-
-
         <%  } else { %>
 
-
-
             <tr>
-
-                <td><img src="images/x.gif" width="13" height="13" border="0"></td>
-
+                <td><img src="../images/x.gif" width="13" height="13" border="0"></td>
                 <td>
-
                     <span class="jive-setup-error-text">
-
                     <fmt:message key="setup.env.check.not_home" />
-
                     </span>
-
                 </td>
-
             </tr>
 
-
-
         <%  } %>
-
         </table>
-
         </ul>
 
-
-
         <p>
-
         <fmt:message key="setup.env.check.doc" />
-
         </p>
 
-
-
         </body>
-
         </html>
 
-
-
 <%      // return so we stop showing the page:
-
         return;
-
     }
-
 %>
\ No newline at end of file

src/web/setup-finished.jsp → src/web/setup/setup-finished.jsp

@@ -2,8 +2,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 1644 $
+  -	$Date: 2005-07-19 09:05:10 -0700 (Tue, 19 Jul 2005) $
 --%>
 
 <%@ page import="org.jivesoftware.util.ParamUtils,

src/web/setup-footer.jsp → src/web/setup/setup-footer.jsp

 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 1080 $
+  -	$Date: 2005-03-05 22:58:01 -0800 (Sat, 05 Mar 2005) $
 --%>
 
 <%@ page import="java.util.Calendar" %>

src/web/setup-global.jsp → src/web/setup/setup-global.jsp

 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 1147 $
+  -	$Date: 2005-03-18 09:05:48 -0800 (Fri, 18 Mar 2005) $
 --%>
 
 <%@ page import="java.lang.reflect.Method,

src/web/setup-global.jspf → src/web/setup/setup-global.jspf

 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 1147 $
+  -	$Date: 2005-03-18 09:05:48 -0800 (Fri, 18 Mar 2005) $
 --%>
 
 <%@ page import="java.lang.reflect.Method,

src/web/setup-header.jspf → src/web/setup/setup-header.jspf

 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 1090 $
+  -	$Date: 2005-03-06 23:10:21 -0800 (Sun, 06 Mar 2005) $
 --%>
 
 <%@ page import="org.jivesoftware.util.*" %>
@@ -24,13 +24,13 @@
 </table>
 </span>
 <table bgcolor="#bbbbbb" cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr><td><img src="images/blank.gif" width="1" height="1" border="0"></td></tr>
+<tr><td><img src="../images/blank.gif" width="1" height="1" border="0"></td></tr>
 </table>
 <table bgcolor="#dddddd" cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr><td><img src="images/blank.gif" width="1" height="1" border="0"></td></tr>
+<tr><td><img src="../images/blank.gif" width="1" height="1" border="0"></td></tr>
 </table>
 <table bgcolor="#eeeeee" cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr><td><img src="images/blank.gif" width="1" height="1" border="0"></td></tr>
+<tr><td><img src="../images/blank.gif" width="1" height="1" border="0"></td></tr>
 </table>
 
 <br>
@@ -41,6 +41,6 @@
         <td width="1%" nowrap>
             <jsp:include page="setup-sidebar.jsp" flush="true" />
         </td>
-        <td width="1%" nowrap><img src="images/blank.gif" width="15" height="1" border="0"></td>
+        <td width="1%" nowrap><img src="../images/blank.gif" width="15" height="1" border="0"></td>
     <%  } %>
     <td width="98%">

src/web/setup-host-settings.jsp → src/web/setup/setup-host-settings.jsp

 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 1638 $
+  -	$Date: 2005-07-18 10:16:48 -0700 (Mon, 18 Jul 2005) $
 --%>
 
 <%@ page import="org.jivesoftware.util.ParamUtils,

src/web/setup-index.jsp → src/web/setup/setup-index.jsp

@@ -3,8 +3,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 2873 $
+  -	$Date: 2005-09-23 10:54:57 -0700 (Fri, 23 Sep 2005) $
 --%>
 
 <%@ page import="org.jivesoftware.util.ParamUtils,
@@ -150,7 +150,7 @@
              id="loc08" />
         </td>
         <td>
-            <a href="#" onclick="document.sform.localeCode[1].checked=true; return false;"><img src="images/language_zh_CN.gif" border="0" /></a>
+            <a href="#" onclick="document.sform.localeCode[1].checked=true; return false;"><img src="../images/language_zh_CN.gif" border="0" /></a>
         </td>
         <td>
             <label for="loc08">Simplified Chinese</label> (zh_CN)

src/web/setup-pause.jsp → src/web/setup/setup-pause.jsp

 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 985 $
+  -	$Date: 2005-02-18 10:35:44 -0800 (Fri, 18 Feb 2005) $
 --%>
 
 <%@ page import="org.jivesoftware.util.ParamUtils,

src/web/setup-sidebar.jsp → src/web/setup/setup-sidebar.jsp

 <%--
   -	$RCSfile$
-  -	$Revision$
-  -	$Date$
+  -	$Revision: 1354 $
+  -	$Date: 2005-05-16 17:50:50 -0700 (Mon, 16 May 2005) $
 --%>
 
 <%@ page import="org.jivesoftware.util.*" %>
@@ -56,21 +56,21 @@
             <tr>
             <%  if (INCOMPLETE.equals(items[i])) { %>
 
-                <td width="1%"><img src="images/bullet-red-14x14.gif" width="14" height="14" border="0"></td>
+                <td width="1%"><img src="../images/bullet-red-14x14.gif" width="14" height="14" border="0"></td>
                 <td width="99%">
                         <%= names[i] %>
                 </td>
 
             <%  } else if (IN_PROGRESS.equals(items[i])) { %>
 
-                <td width="1%"><img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0"></td>
+                <td width="1%"><img src="../images/bullet-yellow-14x14.gif" width="14" height="14" border="0"></td>
                 <td width="99%">
                         <a href="<%= links[i] %>"><%= names[i] %></a>
                 </td>
 
             <%  } else { %>
 
-                <td width="1%"><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0"></td>
+                <td width="1%"><img src="../images/bullet-green-14x14.gif" width="14" height="14" border="0"></td>
                 <td width="99%">
                         <a href="<%= links[i] %>"><%= names[i] %></a>
                 </td>

src/web/spacer.html

-<html>
-<head><title></title></head>
-
-<body bgcolor="#bbbbbb">
-
-</body>
-</html>
\ No newline at end of file

src/web/ssl-settings.jsp

 <%--
-  -	$RCSfile$
   -	$Revision$
   -	$Date$
   -
@@ -11,15 +10,11 @@
 
 <%@ page import="org.jivesoftware.util.*,
                  java.util.*,
-                 org.jivesoftware.messenger.*,
                  org.jivesoftware.messenger.net.SSLConfig,
-                 javax.net.ssl.KeyManager,
-                 javax.net.ssl.TrustManager,
                  java.security.KeyStore,
                  java.security.cert.CertificateFactory,
                  java.security.cert.Certificate,
-                 java.io.ByteArrayInputStream,
-                 org.jivesoftware.admin.*"
+                 java.io.ByteArrayInputStream"
     errorPage="error.jsp"
 %>
 
@@ -27,10 +22,6 @@
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%  try { %>
 
-<%-- Define Administration Bean --%>
-<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
-<% admin.init(request, response, session, application, out ); %>
-
 <%  // Get parameters:
     String type = ParamUtils.getParameter(request, "type");
     String cert = ParamUtils.getParameter(request, "cert");
@@ -41,7 +32,7 @@
     KeyStore keyStore = SSLConfig.getKeyStore();
     KeyStore trustStore = SSLConfig.getTrustStore();
 
-    Map errors = new HashMap();
+    Map<String, Object> errors = new HashMap<String, Object>();
     if (install) {
         if (cert == null){
             errors.put("cert","");
@@ -89,25 +80,20 @@
     }
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("ssl.settings.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "ssl-settings.jsp"));
-    pageinfo.setPageID("server-ssl");
-%>
-<jsp:include page="top.jsp" flush="true">
-    <jsp:param name="helpPage" value="manage_security_certificates.html" />
-</jsp:include>
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="ssl.settings.title"/></title>
+        <meta name="pageID" content="server-ssl"/>
+        <meta name="helpPage" content="manage_security_certificates.html"/>
+    </head>
+    <body>
 
 <%  if (ParamUtils.getBooleanParameter(request,"success")) { %>
 
     <div class="jive-success">
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
-        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
         <td class="jive-icon-label">
         <fmt:message key="ssl.settings.update" />
         </td></tr>
@@ -120,7 +106,7 @@
     <div class="jive-success">
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
-        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
         <td class="jive-icon-label">
         <fmt:message key="ssl.settings.uninstalled" />
         </td></tr>
@@ -135,7 +121,7 @@
     <div class="jive-error">
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
-        <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
+        <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
         <td class="jive-icon-label">
         <fmt:message key="ssl.settings.error" />
         <%  if (e != null && e.getMessage() != null) { %>
@@ -151,7 +137,7 @@
     <div class="jive-error">
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
-        <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
+        <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
         <td class="jive-icon-label">
         <fmt:message key="ssl.settings.error_certificate" />
         </td></tr>
@@ -203,7 +189,7 @@
             <a href="ssl-settings.jsp?alias=<%= a %>&type=server&uninstall=true"
              title="<fmt:message key="ssl.settings.click_uninstall" />"
              onclick="return confirm('<fmt:message key="ssl.settings.confirm_uninstall" />');"
-             ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
+             ><img src="images/delete-16x16.gif" width="16" height="16" border="0" alt=""></a>
         </td>
     </tr>
     <tr>
@@ -313,6 +299,7 @@
 
 </form>
 
-<%  } catch (Throwable t) { t.printStackTrace(); } %>
+    </body>
+</html>
 
-<jsp:include page="bottom.jsp" flush="true" />
+<%  } catch (Throwable t) { t.printStackTrace(); } %>
\ No newline at end of file

src/web/system-email.jsp

@@ -6,18 +6,13 @@
 --%>
 
 <%@ page import="java.util.*,
-				 org.jivesoftware.util.*,
-                 org.jivesoftware.admin.*"
+				 org.jivesoftware.util.*"
     errorPage="error.jsp"
 %>
 
 <%@ 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 ); %>
-
 <%
     // get parameters
     String host = ParamUtils.getParameter(request,"host");
@@ -73,17 +68,12 @@
     debug = service.isDebugEnabled();
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("system.email.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "system-email.jsp"));
-    pageinfo.setPageID("system-email");
-%>
-
-<jsp:include page="top.jsp" flush="true" />
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="system.email.title"/></title>
+        <meta name="pageID" content="system-email"/>
+    </head>
+    <body>
 
 <p>
 <fmt:message key="system.email.info" />
@@ -95,7 +85,7 @@
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
         <tr>
-        	<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+        	<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
         	<td class="jive-icon-label"><fmt:message key="system.email.update_success" /></td>
         </tr>
     </tbody>
@@ -110,7 +100,7 @@
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
         <tr>
-        	<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
+        	<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
         	<td class="jive-icon-label"><fmt:message key="system.email.update_failure" /></td>
         </tr>
     </tbody>
@@ -210,4 +200,5 @@
 
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
\ No newline at end of file
+</html>
\ No newline at end of file

src/web/system-emailtest.jsp

@@ -5,8 +5,7 @@
   - a copy of which is included in this distribution.
 --%>
 
-<%@ page import="org.jivesoftware.admin.*,
-                 org.jivesoftware.util.*,
+<%@ page import="org.jivesoftware.util.*,
                  org.jivesoftware.messenger.user.*,
                  java.util.*,
                  javax.mail.*,
@@ -18,8 +17,8 @@
 <%@ 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 ); %>
+<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
+<% webManager.init(request, response, session, application, out ); %>
 
 <%	// Get paramters
     boolean doTest = request.getParameter("test") != null;
@@ -41,7 +40,7 @@
     Exception mex = null;
 
     // Validate input
-    Map errors = new HashMap();
+    Map<String, String> errors = new HashMap<String, String>();
     if (doTest) {
         if (from == null) { errors.put("from",""); }
         if (to == null) { errors.put("to",""); }
@@ -80,7 +79,7 @@
     }
 
     // Set var defaults
-    User user = admin.getUserManager().getUser("admin");
+    User user = webManager.getUserManager().getUser("admin");
     if (from == null) {
         from = user.getEmail();
     }
@@ -95,17 +94,12 @@
     }
 %>
 
-<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
-<%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("system.emailtest.title");
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "system-email.jsp"));
-    pageinfo.setPageID("system-email");
-%>
-
-<jsp:include page="top.jsp" flush="true" />
-<jsp:include page="title.jsp" flush="true" />
+<html>
+    <head>
+        <title><fmt:message key="system.emailtest.title"/></title>
+        <meta name="pageID" content="system-email"/>
+    </head>
+    <body>
 
 <script language="JavaScript" type="text/javascript">
 var clicked = false;
@@ -128,7 +122,7 @@ function checkClick(el) {
     <table cellpadding="0" cellspacing="0" border="0">
     <tbody>
         <tr>
-        	<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
+        	<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
 	        <td class="jive-icon-label">
 		        <fmt:message key="system.emailtest.no_host">
 				    <fmt:param value="<%= "<a href='system-email.jsp>" %>"/>
@@ -150,7 +144,7 @@ function checkClick(el) {
         <table cellpadding="0" cellspacing="0" border="0">
         <tbody>
             <tr>
-            	<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+            	<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
             	<td class="jive-icon-label"><fmt:message key="system.emailtest.success" /></td>
             </tr>
         </tbody>
@@ -162,7 +156,7 @@ function checkClick(el) {
         <div class="jive-error">
         <table cellpadding="0" cellspacing="0" border="0">
         <tbody>
-            <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
+            <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
             <td class="jive-icon-label">
                 <fmt:message key="system.emailtest.failure" />
                 <%  if (mex != null) { %>
@@ -259,4 +253,5 @@ function checkClick(el) {
 
 </form>
 
-<jsp:include page="bottom.jsp" flush="true" />
+    </body>
\ No newline at end of file
+</html>
\ No newline at end of file

src/web/title-browser.jspf

-<%--
-  - $RCSfile$
-  - $Revision$
-  - $Date$
---%>
-
-<script language="JavaScript" type="text/javascript">
-function closeWin() {
-    if (parent) {
-        parent.window.close();
-    }
-    else {
-        window.close();
-    }
-}
-</script>
-
-<div class="jive-admin-page-title">
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-    <td>
-        <%= title %>
-    </td>
-    <td align="right">
-        <span class="jive-breadcrumbs">
-        <a href="" onclick="closeWin(); return false;">Close Window</a>
-        </span>
-    </td>
-</tr>
-</table>
-</div>
\ No newline at end of file

src/web/user-browser.jsp

-<%--
-  -	$RCSfile$
-  -	$Revision$
-  -	$Date$
---%>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
-<%@ page import="org.jivesoftware.util.ParamUtils,
-                 java.util.Iterator,
-                 org.jivesoftware.messenger.user.User"
-%>
-
-<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
-<% webManager.init(request, response, session, application, out ); %>
-
-<%  // Get parameters
-    int start = ParamUtils.getIntParameter(request,"start",0);
-    int range = ParamUtils.getIntParameter(request,"range",10);
-    String formName = ParamUtils.getParameter(request,"formName");
-    String elName = ParamUtils.getParameter(request,"elName");
-
-    String panel = ParamUtils.getParameter(request,"panel");
-    if (panel == null) {
-        panel = "frameset";
-    }
-%>
-
-<%  if ("frameset".equals(panel)) { %>
-
-<html>
-<head>
-
-    <title><fmt:message key="user.browser.title" /></title>
-    <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-    <link rel="stylesheet" type="text/css" href="/style/global.css">
-</head>
-
-
-    <script language="JavaScript" type="text/javascript">
-    var users = new Array();
-    function getUserListDisplay() {
-        var display = "";
-        var sep = ", ";
-        for (var i=0; i<users.length; i++) {
-            if ((i+1) == users.length) {
-                sep = "";
-            }
-            display += (users[i] + sep);
-        }
-        return display;
-    }
-    function printUsers(theForm) {
-        theForm.users.value = getUserListDisplay();
-    }
-    function addUser(theForm, username) {
-        users[users.length] = username;
-        printUsers(theForm);
-    }
-    function closeWin() {
-        window.close();
-    }
-    function done() {
-        closeWin();
-    }
-    </script>
-    <frameset rows="*,105">
-        <frame name="main" src="user-browser.jsp?panel=main"
-                marginwidth="5" marginheight="5" scrolling="auto" frameborder="0">
-        <frame name="bottom" src="user-browser.jsp?panel=bottom&formName=<%= formName %>&elName=<%= elName %>"
-                marginwidth="5" marginheight="5" scrolling="no" frameborder="0">
-    </frameset>
-</html>
-
-<%  } else if ("bottom".equals(panel)) { %>
-
-    <jsp:include page="header.jsp" flush="true" />
-
-    <style type="text/css">
-    .mybutton {
-        width : 100%;
-    }
-    </style>
-
-    <form name="f" onsubmit="return false;">
-
-    <table cellpadding="3" cellspacing="0" border="0" width="100%">
-    <tr>
-        <td width="99%">
-
-            <textarea rows="4" cols="40" style="width:100%;" name="users" wrap="virtual"></textarea>
-
-        </td>
-        <td width="1%" nowrap>
-
-            <table cellpadding="0" cellspacing="0" border="0" width="75">
-            <tr>
-                <td>
-                <script language="javascript">
-                  var currentValue = parent.opener.document.<%= formName %>.<%= elName %>.value;
-                  if(currentValue.length > 0){
-                    currentValue = ","+currentValue;
-                  }
-                </script>
-                    <input type="submit" name="" value="<fmt:message key="global.done" />" class="mybutton"
-                     onclick="if(parent.getUserListDisplay()!=''){parent.opener.document.<%= formName %>.<%= elName %>.value=parent.getUserListDisplay()+currentValue;}parent.done();return false;">
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="submit" name="" value="<fmt:message key="global.cancel" />" class="mybutton"
-                     onclick="parent.closeWin();return false;">
-                </td>
-            </tr>
-            </table>
-
-        </td>
-    </tr>
-    </table>
-
-    </form>
-<jsp:include page="footer.jsp" flush="true" />
-
-<%  } else if ("main".equals(panel)) { %>
-
-    <%  // Get the user manager
-        int userCount = webManager.getUserManager().getUserCount();
-
-        // paginator vars
-        int numPages = (int)Math.ceil((double)userCount/(double)range);
-        int curPage = (start/range) + 1;
-    %>
-
-    <html>
-<head>
-
-    <title><fmt:message key="user.browser.title" /></title>
-    <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-    <link rel="stylesheet" type="text/css" href="/style/global.css">
-</head>
-<body class="jive-body">
-
-    <p>
-    <fmt:message key="user.summary.total_user" />: <%= webManager.getUserManager().getUserCount() %>,
-    <%  if (numPages > 1) { %>
-
-        <fmt:message key="global.showing" /> <%= (start+1) %>-<%= (start+range) %>,
-
-    <%  } %>
-    <fmt:message key="user.summary.sorted" />.
-    </p>
-
-    <p>
-    <fmt:message key="user.browser.viewing_page" /> <%= curPage %>
-    </p>
-
-    <p><fmt:message key="user.browser.info" />.
-    </p>
-
-    <%  if (numPages > 1) { %>
-
-        <p>
-        <fmt:message key="global.pages" />:
-        [
-        <%  for (int i=0; i<numPages; i++) {
-                String sep = ((i+1)<numPages) ? " " : "";
-                boolean isCurrent = (i+1) == curPage;
-        %>
-            <a href="user-browser.jsp?panel=main&start=<%= (i*range) %>"
-             class="<%= ((isCurrent) ? "jive-current" : "") %>"
-             ><%= (i+1) %></a><%= sep %>
-
-        <%  } %>
-        ]
-        </p>
-
-    <%  } %>
-    <fieldset>
-    <legend><fmt:message key="user.browser.legend" /></legend>
-    <table class="jive-table" cellpadding="3" cellspacing="1" border="0" width="100%">
-
-        <th>&nbsp;</th>
-        <th><fmt:message key="user.browser.username" /></th>
-        <th><fmt:message key="user.browser.name" /></th>
-        <th align="center"><fmt:message key="global.add" /></th>
-
-    <%  // Print the list of users
-        Iterator users = webManager.getUserManager().getUsers(start, range).iterator();
-        if (!users.hasNext()) {
-    %>
-        <tr>
-            <td align="center" colspan="4">
-                <fmt:message key="user.browser.no_users" />.
-            </td>
-        </tr>
-
-    <%
-        }
-        int i = start;
-        while (users.hasNext()) {
-            User user = (User)users.next();
-            i++;
-    %>
-        <tr class="jive-<%= (((i%2)==0) ? "even" : "odd") %>">
-            <td width="1%">
-                <%= i %>
-            </td>
-            <td width="60%">
-                <%= user.getUsername() %>
-            </td>
-            <td width="50%">
-            <% String name = user.getName();
-               if(name == null || name.trim().length() == 0){
-                   name = "&nbsp;";
-               }
-           %>
-                <%= name %>
-            </td>
-            <td width="1%" align="center">
-                <input type="submit" name="" value="<fmt:message key="user.browser.add_user" />" class="jive-sm-button"
-                 onclick="parent.addUser(parent.frames['bottom'].document.f,'<%= user.getUsername() %>');">
-            </td>
-        </tr>
-
-    <%
-        }
-    %>
-    </table>
-    </fieldset>
-    </div>
-
-    <%  if (numPages > 1) { %>
-
-        <p>
-        <fmt:message key="global.pages" />:
-        [
-        <%  for (i=0; i<numPages; i++) {
-                String sep = ((i+1)<numPages) ? " " : "";
-                boolean isCurrent = (i+1) == curPage;
-        %>
-            <a href="user-browser.jsp?panel=main&start=<%= (i*range) %>"
-             class="<%= ((isCurrent) ? "jive-current" : "") %>"
-             ><%= (i+1) %></a><%= sep %>
-
-        <%  } %>
-        ]
-        </p>
-
-    <%  } %>
-<jsp:include page="footer.jsp" flush="true" />
-
-<%  } %>