OF-953: Old JSP libraries should be upgraded.

By replacing Jetty 6.x era libraries with 9.x-based variants, JSP support
will be brought back up-to-date. Additionally, Openfire will no longer
have a mix of dependencies from various versions of Jetty. This commit
contains a number of changes that go hand-in-hand:
- Replaces JAR files
- Applies uniformity to the buildscript where JSPC is executed
- Replaces JSTL 1.0 taglibs with later versions
- Adds a simple logger to the build process (to stop it from complaining)

build/build.xml

@@ -180,7 +180,7 @@
     <path id="javadoc.dependencies">
         <fileset dir="${lib.build.dir}" includes="*.jar" excludes="junit.jar"/>
         <path refid="libs.to.merge" />
-        <fileset dir="${lib.dist.dir}" includes="servlet-api.jar, servlet-api-schemas.jar, mail.jar, jdic.jar"/>
+        <fileset dir="${lib.dist.dir}" includes="mail.jar, jdic.jar"/>
         <fileset dir="${lib.dist.dir}" includes="bcpg-jdk15on.jar, bcpkix-jdk15on.jar, bcprov-jdk15on.jar"/>
     </path>
 
@@ -451,9 +451,14 @@
             <fileset dir="${lib.dist.dir}" includes="*.*"/>
         </copy>
 
-        <!-- Copy in tag library support -->
+        <!-- Copy in JSP support -->
         <copy todir="${jar.dest.dir}">
-            <fileset dir="${lib.build.dir}" includes="commons-el.jar"/>
+            <fileset dir="${lib.build.dir}" includes="org.apache.taglibs.taglibs-standard-impl.jar"/>
+            <fileset dir="${lib.build.dir}" includes="org.apache.taglibs.taglibs-standard-spec.jar"/>
+            <fileset dir="${lib.build.dir}" includes="org.eclipse.jetty.apache-jsp.jar"/>
+            <fileset dir="${lib.build.dir}" includes="org.eclipse.jetty.orbit.org.eclipse.jdt.core.jar"/>
+            <fileset dir="${lib.build.dir}" includes="org.mortbay.jasper.apache-el.jar"/>
+            <fileset dir="${lib.build.dir}" includes="org.mortbay.jasper.apache-jsp.jar"/>
         </copy>
 
         <!-- Copy in jasper runtime jar -->
@@ -1433,26 +1438,20 @@
                             </fileset>
                         </copy>
 
-                        <!-- Declare the jspc task with our plugin's classpath -->
-                        <taskdef classname="org.apache.jasper.JspC" name="jasper2" loaderref="jasperB">
+                        <!-- JSP to Java -->
+                        <java classname="org.apache.jasper.JspC" fork="true">
                             <classpath>
                                 <pathelement location="${java.home}/../lib/tools.jar"/>
-                                <pathelement
-                                        location="${plugin.dev.dest.dir}/@{plugin}/target/lib/plugin-@{plugin}.jar"/>
-                                <path refid="jspc.dependencies"/>
                                 <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target" includes="lib/*.jar"/>
+                                <pathelement location="${plugin.dev.dest.dir}/@{plugin}/target/lib/plugin-@{plugin}.jar"/>
                                 <pathelement path="${compile.dir}"/>
+                                <path refid="jspc.dependencies"/>
                             </classpath>
-                        </taskdef>
-
-                        <!-- JSP to Java -->
-                        <jasper2
-                                validateXml="false"
-                                uriroot="${plugin.dev.dest.dir}/@{plugin}/target/web"
-                                outputDir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/java"
-                                package="org.jivesoftware.openfire.plugin.@{plugin}"
-                                webXml="${plugin.dev.dest.dir}/@{plugin}/target/jspc/web.xml"
-                                />
+                            <arg line="-uriroot '${plugin.dev.dest.dir}/@{plugin}/target/web'"/>
+                            <arg line="-d '${plugin.dev.dest.dir}/@{plugin}/target/jspc/java'"/>
+                            <arg line="-p org.jivesoftware.openfire.plugin.@{plugin}"/>
+                            <arg line="-webxml '${plugin.dev.dest.dir}/@{plugin}/target/jspc/web.xml'"/>
+                        </java>
 
                         <!-- Use xmltask to merge the generated web.xml file and a developer one (if any) -->
                         <available property="plugin.@{plugin}.webxml.available"

build/lib/versions.txt

@@ -9,7 +9,6 @@ bcprov-jdk15on.jar                  | 1.51
 cglib.jar                           | 2.1.3 (JMock 2.1.0)                                          |
 commons-lang.jar                    | 2.3                                                          | Apache 2.0
 commons-logging.jar                 | Jetty 5.1.10                                                 | Apache 2.0
-commons-el.jar                      | Jetty 6.0.1 (1.0)                                            | Apache 2.0
 commons-httpclient.jar              | 3.1                                                          | Apache 2.0
 commons-codec.jar                   | 1.9                                                          | Apache 2.0
 dom4j.jar                           | 1.6.1                                                        | BSD (http://www.dom4j.org/dom4j-1.6.1/license.html)
@@ -20,7 +19,8 @@ jetty-continuation.jar              | Jetty 9.2.9.v20150224
 jetty-http.jar                      | Jetty 9.2.9.v20150224                                        | Apache 2.0, Eclipse 1.0
 jetty-io.jar                        | Jetty 9.2.9.v20150224                                        | Apache 2.0, Eclipse 1.0
 jetty-jmx.jar                       | Jetty 9.2.9.v20150224                                        | Apache 2.0, Eclipse 1.0
-jetty-schemas.jar                   | Jetty 9.2.9.v20150224                                        | Apache 2.0, Eclipse 1.0
+jetty-plus.jar                      | Jetty 9.2.9.v20150224                                        | Apache 2.0, Eclipse 1.0
+jetty-schemas.jar                   | 3.1 - from Jetty 9.2.9.v20150224                             | Apache 2.0, Eclipse 1.0
 jetty-security.jar                  | Jetty 9.2.9.v20150224                                        | Apache 2.0, Eclipse 1.0
 jetty-server.jar                    | Jetty 9.2.9.v20150224                                        | Apache 2.0, Eclipse 1.0
 jetty-servlet.jar                   | Jetty 9.2.9.v20150224                                        | Apache 2.0, Eclipse 1.0
@@ -41,16 +41,18 @@ websocket-servlet.jar               | Jetty 9.2.9.v20150224
 javax-websocket-client-impl.jar     | Jetty 9.2.9.v20150224                                        | Apache 2.0, Eclipse 1.0
 javax-websocket-server-impl.jar     | Jetty 9.2.9.v20150224                                        | Apache 2.0, Eclipse 1.0
 javax.websocket-api.jar             | Jetty 9.2.9.v20150224                                        | CDDL+GPL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
-jasper-compiler.jar                 | Jetty 6.1.0 (5.5.15)                                         |
-jasper-runtime.jar                  | Jetty 6.1.0 (5.5.15)                                         |
+org.apache.taglibs.taglibs-standard-impl.jar     | 1.2.1           (from Jetty 9.2.9.v20150224)    | Apache 2.0
+org.apache.taglibs.taglibs-standard-spec.jar     | 1.2.1           (from Jetty 9.2.9.v20150224)    | Apache 2.0
+org.eclipse.jetty.apache-jsp.jar                 | 9.2.9.v20150224 (from Jetty 9.2.9.v20150224)    | Apache 2.0, Eclipse 1.0
+org.eclipse.jetty.orbit.org.eclipse.jdt.core.jar | 3.8.2.v20130121 (from Jetty 9.2.9.v20150224)    | Eclipse 1.0
+org.mortbay.jasper.apache-el.jar                 | 8.0.9.M3        (from Jetty 9.2.9.v20150224)    | Apache 2.0
+org.mortbay.jasper.apache-jsp.jar                | 8.0.9.M3        (from Jetty 9.2.9.v20150224)    | Apache 2.0
 jaxen.jar                           | 1.1 beta 4 (from DOM4J 1.6.1)                                | Apache 1.1
 jdom.jar                            | 1.0 (required by rome)                                       | Apache 1.1
-jstl.jar                            | Jakarta standard taglib 1.1.2                                |
 jmdns.jar                           | PRE 1.0, patched                                             | Apache 2.0
 jmock.jar                           | 2.1.0                                                        |
 jmock-junit4.jar                    | 2.1.0                                                        |
 jmock-legacy.jar                    | 2.1.0                                                        |
-jsp-api.jar                         | Jetty 6.0.1 (2.0)                                            |
 jtds.jar                            | 1.3.1                                                        | LGPL
 junit.jar                           | 4.11                                                         | EPL 1.0
 hamcrest-core.jar                   | 1.3 (required by junit)                                      | new BSD licence
@@ -77,6 +79,7 @@ shaj.jar                            | 0.5
 sitemesh.jar                        | 2.2.1                                                        | Apache 1.1
 slf4j-api                           | 1.7.7                                                        | http://www.slf4j.org/license.html
 slf4j-log4j12                       | 1.7.7                                                        | http://www.slf4j.org/license.html
+slf4j-simple                        | 1.7.7                                                        | http://www.slf4j.org/license.html
 standard.jar                        | Jakarta standard taglib 1.1.2                                |
 tinder.jar                          | 1.3.0-SNAPSHOT (Bamboo nightly build 960, SVN revision 13509)| Apache 2.0
 xmltask.jar                         | 1.11                                                         | Apache 1.1

documentation/docs/plugin-dev-guide.html

@@ -346,8 +346,8 @@ procedure:
     <li>Convert Strings in your JSP files to refer to the internationalized keys. For example:
 
         <pre>
-        &lt;%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %&gt;
-        &lt;%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %&gt;
+        &lt;%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %&gt;
+        &lt;%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %&gt;
         ...
         &lt;fmt:message key="some.key.name" /&gt;
         </pre>

src/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java

@@ -22,8 +22,13 @@ package org.jivesoftware.openfire.container;
 import java.io.File;
 import java.security.KeyStore;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.tomcat.InstanceManager;
+import org.apache.tomcat.SimpleInstanceManager;
+import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
+import org.eclipse.jetty.plus.annotation.ContainerInitializer;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
@@ -338,6 +343,13 @@ public class AdminConsolePlugin implements Plugin {
             context = new WebAppContext(contexts, pluginDir.getAbsoluteFile() + File.separator + "webapp",
                     "/");
         }
+
+        // Ensure the JSP engine is initialized correctly (in order to be able to cope with Tomcat/Jasper precompiled JSPs).
+        final List<ContainerInitializer> initializers = new ArrayList<>();
+        initializers.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+        context.setAttribute("org.eclipse.jetty.containerInitializers", initializers);
+        context.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
+
         context.setWelcomeFiles(new String[]{"index.jsp"});
     }
 

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

@@ -490,23 +490,17 @@ public class PluginServlet extends HttpServlet {
             jspc.setCompile(true);
 
             jspc.setClassPath(getClasspathForPlugin(plugin));
-            try {
-                jspc.execute();
-
-                try {
-                    Object servletInstance = pluginManager.loadClass(plugin, "org.apache.jsp." +
-                        relativeDir + filename).newInstance();
-                    HttpServlet servlet = (HttpServlet)servletInstance;
-                    servlet.init(servletConfig);
-                    servlet.service(request, response);
-                    return true;
-                }
-                catch (Exception e) {
-                    Log.error(e.getMessage(), e);
-                }
+            jspc.execute();
 
+            try {
+                Object servletInstance = pluginManager.loadClass(plugin, "org.apache.jsp." +
+                    relativeDir + filename).newInstance();
+                HttpServlet servlet = (HttpServlet)servletInstance;
+                servlet.init(servletConfig);
+                servlet.service(request, response);
+                return true;
             }
-            catch (JasperException e) {
+            catch (Exception e) {
                 Log.error(e.getMessage(), e);
             }
         }

src/java/org/jivesoftware/openfire/http/HttpBindManager.java

@@ -23,17 +23,18 @@ package org.jivesoftware.openfire.http;
 import java.io.File;
 import java.security.KeyStore;
 import java.security.cert.X509Certificate;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 
+import org.apache.tomcat.InstanceManager;
+import org.apache.tomcat.SimpleInstanceManager;
+import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
 import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.plus.annotation.ContainerInitializer;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.ForwardedRequestCustomizer;
 import org.eclipse.jetty.server.Handler;
@@ -569,6 +570,13 @@ public final class HttpBindManager {
     private void createBoshHandler(ContextHandlerCollection contexts, String boshPath)
     {
         ServletContextHandler context = new ServletContextHandler(contexts, boshPath, ServletContextHandler.SESSIONS);
+
+        // Ensure the JSP engine is initialized correctly (in order to be able to cope with Tomcat/Jasper precompiled JSPs).
+        final List<ContainerInitializer> initializers = new ArrayList<>();
+        initializers.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+        context.setAttribute("org.eclipse.jetty.containerInitializers", initializers);
+        context.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
+
         context.addServlet(new ServletHolder(new HttpBindServlet()),"/*");
         if (isHttpCompressionEnabled()) {
 	        Filter gzipFilter = new AsyncGzipFilter() {
@@ -593,6 +601,13 @@ public final class HttpBindManager {
 	private void createCrossDomainHandler(ContextHandlerCollection contexts, String crossPath)
     {
         ServletContextHandler context = new ServletContextHandler(contexts, crossPath, ServletContextHandler.SESSIONS);
+
+        // Ensure the JSP engine is initialized correctly (in order to be able to cope with Tomcat/Jasper precompiled JSPs).
+        final List<ContainerInitializer> initializers = new ArrayList<>();
+        initializers.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+        context.setAttribute("org.eclipse.jetty.containerInitializers", initializers);
+        context.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
+
         context.addServlet(new ServletHolder(new FlashCrossDomainServlet()),"");
     }
 

src/plugins/clientControl/src/i18n/clientcontrol_i18n.properties

@@ -127,7 +127,7 @@ spark.download.emailtemplate.template.part1 = We've deployed a new instant messa
   features. Getting up and running only takes a few minutes. Download the installer from:
 spark.download.emailtemplate.template.part2 = Once you've performed the initial installation, \
   the client will automatically notify you when updates are available.
-spark.download.emailtemplate.template.part3 = When the client starts, enter your username and password along with the server name {0}.
+spark.download.emailtemplate.template.part3 = When the client starts, enter your username and password along with the server name <b>{0}</b>.
 spark.download.emailtemplate.template.part4 = Please contact me for your username and password.
 
 

src/plugins/clientControl/src/i18n/clientcontrol_i18n_cs_CZ.properties

@@ -109,7 +109,7 @@ spark.download.emailtemplate.template.part1 = Nasadili jsme nov\u00fd syst\u00e9
   mo\u017enost\u00ed. Nasazen\u00ed a rozb\u011bhnut\u00ed zabere pouze n\u011bkolik minut. St\u00e1hn\u011bte si instal\u00e1tor z:
 spark.download.emailtemplate.template.part2 = Jakmile provedete prvotn\u00ed instalaci, \
   bude v\u00e1s klient automaticky upozor\u0148ovat, kdy\u017e budou k dispozici aktualizace.
-spark.download.emailtemplate.template.part3 = P\u0159i startu klienta zadejte va\u0161e u\u017eivatelsk\u00e9 jm\u00e9no a heslo spolu se jm\u00e9nem serveru {0}.
+spark.download.emailtemplate.template.part3 = P\u0159i startu klienta zadejte va\u0161e u\u017eivatelsk\u00e9 jm\u00e9no a heslo spolu se jm\u00e9nem serveru <b>{0}</b>.
 spark.download.emailtemplate.template.part4 = Pros\u00edm kontaktujte m\u011b pro z\u00edsk\u00e1n\u00ed va\u0161eho u\u017eivatelsk\u00e9ho jm\u00e9na a hesla.
 
 

src/plugins/clientControl/src/i18n/clientcontrol_i18n_es.properties

@@ -120,7 +120,7 @@ spark.download.emailtemplate.template.part1 = Hemos instalado un nuevo sistema d
   importantes. Instalar y utilizarlos es cuestion de minutos. Descargue el instalador de:
 spark.download.emailtemplate.template.part2 = Una vez que ha concluido la instalaci\u00f3n inicial, \
   el cliente le notificar\u00e1 autom\u00e1ticamente cuando haya nuevas actualizaciones.
-spark.download.emailtemplate.template.part3 = Cuando el cliente arranque ingrese su nombre de usuario y clave junto con el nombre del servidor {0}.
+spark.download.emailtemplate.template.part3 = Cuando el cliente arranque ingrese su nombre de usuario y clave junto con el nombre del servidor <b>{0}</b>.
 spark.download.emailtemplate.template.part4 = Contacteme para su nombre de usuario y clave.
 
 archive.settings.title = Seteos de Almacenamiento

src/plugins/clientControl/src/i18n/clientcontrol_i18n_fr.properties

@@ -241,7 +241,7 @@ spark.download.emailtemplate=Matrice Email
 spark.download.emailtemplate.instructions=Vous pouvez utiliser le texte suivant comme matrice pour indiquer aux utilisateurs o\u00f9 t\u00e9l\u00e9charger le client d'IM Spark.
 spark.download.emailtemplate.template.part1=Nous avons d\u00e9ploy\u00e9 un nouveau syst\u00e8me de messagerie avec le serveur Openfire et sont client de messagerie s\u00e9curis\u00e9 Spark. La mise en route ne prends que quelques minutes, t\u00e9l\u00e9chargez l'installeur sur:
 spark.download.emailtemplate.template.part2=Une fois l'installation termin\u00e9e, le client vous notifieras automatiquement lorsque des mises \u00e0 jour seront disponible.
-spark.download.emailtemplate.template.part3=Lorsque le programme d\u00e9marrera, entrez votre nom d'utilisateur et votre mot de passe ainsi que le nom du serveur {0}.
+spark.download.emailtemplate.template.part3=Lorsque le programme d\u00e9marrera, entrez votre nom d'utilisateur et votre mot de passe ainsi que le nom du serveur <b>{0}</b>.
 spark.download.emailtemplate.template.part4=Veuillez me contacter pour votre nom d'utilisateur et mot de passe.
 spark.download.instructions=Pour t\u00e9l\u00e9charger Spark directement, utilisez les liens suivants:
 spark.download.mac=Mac OSX:

src/plugins/clientControl/src/i18n/clientcontrol_i18n_pt_BR.properties

@@ -136,13 +136,13 @@ spark.download.nix = Linux/Unix:
 spark.download.emailtemplate = Modelo de Email
 spark.download.emailtemplate.instructions = Voc\u00ea pode utilizar o texto seguinte como modelo para \
   avisar usu\u00e1rios sobre onde efetuar o download do cliente Spark IM.
-spark.download.emailtemplate.template.part1 = N\u00f3s distribu\u00edmos um novo sistema de mensagens instantâneas baseado \
+spark.download.emailtemplate.template.part1 = N\u00f3s distribu\u00edmos um novo sistema de mensagens instant�neas baseado \
   no sevidor Openfire e no cliente Spark IM que tem uma seguran\u00e7a s\u00f3lida e bastantes funcionalidades. \
   Para concluir a instala\u00e7\u00e3o, leva somente alguns minutos. Fa\u00e7a o download do instalador em:
 spark.download.emailtemplate.template.part2 = Ap\u00f3s a instala\u00e7\u00e3o inicial, o cliente ir\u00e1 te avisar quando \
   atualiza\u00e7\u00f5es estiverem dispon\u00edveis.
 spark.download.emailtemplate.template.part3 = Quando o cliente inicia, insira o seu nome de usu\u00e1rio e senha junto com o\
-  nome do servidor {0}.
+  nome do servidor <b>{0}</b>.
 spark.download.emailtemplate.template.part4 = Por favor, contacte-me caso necessite seu nome de usu\u00e1rio e senha.
 
 archive.settings.title = Ajustes de Arquivamento
@@ -201,7 +201,7 @@ archive.search.pdf.duration = Dura\u00e7\u00e3o:
 archive.search.pdf.messagecount = N\u00famero de Mensagens:
 archive.search.submit = Busca
 archive.search.results = Resultados da Pesquisa:
-archive.search.results.description = Sua pesquisa retornou {0} resultados. Selecione o resultado à esquerda para \
+archive.search.results.description = Sua pesquisa retornou {0} resultados. Selecione o resultado � esquerda para \
   visualizar a conversa.
 archive.search.results.xofy = de\
   of
@@ -269,7 +269,7 @@ bookmark.url.name = Nome da URL
 bookmark.url.name.description = ex. Nosso Website Interno
 bookmark.url = URL
 bookmark.url.manager.title = Gerenciador de Marcadores de URL
-bookmark.url.manager.description = Permite a cria\u00e7\u00e3o de Marcadores de URL no cliente de IM dos usu\u00e1rios. Marcadores de URL permitem acesso r\u00e1pido para links utilizados com freqü\u00eancia, diretamente do cliente deles.
+bookmark.url.manager.description = Permite a cria\u00e7\u00e3o de Marcadores de URL no cliente de IM dos usu\u00e1rios. Marcadores de URL permitem acesso r\u00e1pido para links utilizados com freq�\u00eancia, diretamente do cliente deles.
 bookmark.url.success = Um marcador de URL foi criado com sucesso.
 bookmark.url.deleted = Marcador de URL exclu\u00eddo com sucesso.
 bookmark.url.users = Usu\u00e1rios

src/plugins/clientControl/src/web/client-features.jsp

@@ -2,8 +2,8 @@
 <%@ page import="org.jivesoftware.util.JiveGlobals"%>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page import="org.jivesoftware.openfire.plugin.ClientControlPlugin" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     String broadcastEnabledString = JiveGlobals.getProperty("broadcast.enabled", "true");

src/plugins/clientControl/src/web/confirm-bookmark-delete.jsp

@@ -6,8 +6,8 @@
 <%@ page import="org.jivesoftware.openfire.muc.MUCRoom" %>
 <%@ page import="org.jivesoftware.openfire.muc.MultiUserChatService" %>
 <%@ page import="java.util.Collection" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 
 <%

src/plugins/clientControl/src/web/create-bookmark.jsp

@@ -13,8 +13,8 @@
 <%@ page import="java.util.StringTokenizer" %>
 <%@ page import="org.jivesoftware.util.NotFoundException"%>
 <%@ page import="org.jivesoftware.util.LocaleUtils"%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%
     boolean urlType = false;
     boolean groupchatType = false;

src/plugins/clientControl/src/web/groupchat-bookmarks.jsp

@@ -3,8 +3,8 @@
 <%@ page import="org.jivesoftware.openfire.plugin.spark.SparkUtil" %>
 <%@ page import="org.jivesoftware.util.LocaleUtils" %>
 <%@ page import="java.util.Collection"%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     boolean bookmarkCreated = request.getParameter("bookmarkCreated") != null;

src/plugins/clientControl/src/web/permitted-clients.jsp

@@ -4,8 +4,8 @@
 <%@ page import="java.util.StringTokenizer" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page import="org.jivesoftware.openfire.plugin.ClientControlPlugin" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 
 <%!

src/plugins/clientControl/src/web/spark-download.jsp

 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page import="org.jivesoftware.util.JiveGlobals" %>
 <%@ page import="java.io.File" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <html>
 <head>
@@ -106,7 +106,7 @@
     <br/><br/>
     <fmt:message key="spark.download.emailtemplate.template.part2"/>
     <fmt:message key="spark.download.emailtemplate.template.part3">
-        <fmt:param value="<%= "<b>" + XMPPServer.getInstance().getServerInfo().getXMPPDomain() + "</b>" %>" />
+        <fmt:param value="<%=XMPPServer.getInstance().getServerInfo().getXMPPDomain()%>" />
     </fmt:message>
     <fmt:message key="spark.download.emailtemplate.template.part4"/>
 </p>

src/plugins/clientControl/src/web/spark-form.jsp

@@ -11,8 +11,8 @@
 <%@ page import="org.apache.commons.fileupload.FileItem"%>
 <%@ page import="java.util.Iterator"%>
 <%@ page import="java.io.FileOutputStream"%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <html>
 <head>

src/plugins/clientControl/src/web/url-bookmarks.jsp

@@ -2,8 +2,8 @@
 <%@ page import="org.jivesoftware.openfire.plugin.spark.BookmarkManager" %>
 <%@ page import="org.jivesoftware.openfire.plugin.spark.SparkUtil" %>
 <%@ page import="java.util.Collection" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     boolean urlBookmarkCreated = request.getParameter("urlCreated") != null;

src/plugins/clustering/src/web/system-clustering-node.jsp

@@ -15,8 +15,8 @@
 <% webManager.init(request, response, session, application, out ); %>
 
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <html>
 <head>

src/plugins/contentFilter/src/web/contentfilter-props-edit-form.jsp

@@ -6,8 +6,8 @@
 %>
 <%@ page import="java.util.regex.Pattern"%>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     boolean save = request.getParameter("save") != null;

src/plugins/dbaccess/src/web/db-access.jsp

 <%@ page import="org.jivesoftware.database.DbConnectionManager" %>
 <%@ page import="java.sql.*" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     // Get parameters

src/plugins/emailListener/src/web/email-listener.jsp

@@ -21,8 +21,8 @@
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Map" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     // get parameters

src/plugins/fastpath/src/web/workgroup-delete-success.jsp

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

src/plugins/fastpath/src/web/workgroup-delete.jsp

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

src/plugins/fastpath/src/web/workgroup-macros.jsp

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

src/plugins/fastpath/src/web/workgroup-offline.jsp

-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <% try { %>
 <%@ page import=" org.jivesoftware.xmpp.workgroup.utils.ModelUtil,
                  org.jivesoftware.xmpp.workgroup.WorkgroupManager,

src/plugins/fastpath/src/web/workgroup-properties.jsp

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

src/plugins/fastpath/src/web/workgroup-queue-agents.jsp

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

src/plugins/fastpath/src/web/workgroup-queue-create.jsp

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

src/plugins/fastpath/src/web/workgroup-queue-manage.jsp

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

src/plugins/fastpath/src/web/workgroup-queue-rules.jsp

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

src/plugins/fastpath/src/web/workgroup-queues.jsp

@@ -3,7 +3,7 @@
    -	$Revision: 32926 $
    -	$Date: 2006-08-04 15:39:24 -0700 (Fri, 04 Aug 2006) $
 --%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="org.jivesoftware.xmpp.workgroup.RequestQueue,
                  org.jivesoftware.xmpp.workgroup.Workgroup,
                  org.jivesoftware.util.ParamUtils,

src/plugins/fastpath/src/web/workgroup-settings.jsp

@@ -3,7 +3,7 @@
   -	$Revision: 32109 $
   -	$Date: 2006-07-12 21:59:06 -0700 (Wed, 12 Jul 2006) $
 --%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="org.jivesoftware.xmpp.workgroup.WorkgroupManager,
                  java.util.*,
                  org.jivesoftware.util.ParamUtils,

src/plugins/fastpath/src/web/workgroup-transcript-config.jsp

-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <% try { %>
 <%@ page import="org.jivesoftware.xmpp.workgroup.utils.ModelUtil,
                  org.jivesoftware.xmpp.workgroup.WorkgroupManager,

src/plugins/gojara/src/web/gojara-RegistrationsOverview.jsp

@@ -12,7 +12,7 @@
 <%@ page import="java.util.Date"%>
 <%@ page import="java.util.ArrayList"%>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
 <%
 	TransportSessionManager transportManager = TransportSessionManager.getInstance();

src/plugins/gojara/src/web/liveStats.jsp

@@ -12,8 +12,8 @@
 <%@ page import="java.util.List"%>
 <%@ page import="java.util.Date"%>
 <%@ page import="org.jivesoftware.util.ParamUtils"%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 
 <%

src/plugins/gojara/src/web/rr-main.jsp

@@ -11,8 +11,8 @@
 <%@ page import="java.util.Map"%>
 <%@ page import="java.util.List"%>
 <%@ page import="org.jivesoftware.util.ParamUtils"%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <%

src/plugins/hazelcast/src/web/system-clustering-node.jsp

@@ -24,8 +24,8 @@
 <% webManager.init(request, response, session, application, out ); %>
 
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <html>
 <head>

src/plugins/jingleNodes/src/web/jingle-nodes.jsp

@@ -27,8 +27,8 @@
 --%>
 
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%
 
     boolean update = request.getParameter("update") != null;

src/plugins/justmarried/src/web/married.jsp

 <%@ page
 	import="org.jivesoftware.openfire.plugin.married.JustMarriedPlugin"%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <%

src/plugins/kraken/src/i18n/kraken_i18n.properties

@@ -702,7 +702,7 @@ gateway.web.registrations.never=never
 gateway.web.registrations.page=Page
 gateway.web.registrations.perpage=per page
 gateway.web.registrations.filterby=Filter by
-gateway.web.registrations.xofy={0} of {1}
+gateway.web.registrations.xofy=<strong>{0}-{1}</strong> of <strong>{2}</strong>
 gateway.web.registrations.select=select
 gateway.web.registrations.node=Node
 gateway.web.registrations.local=local

src/plugins/kraken/src/i18n/kraken_i18n_de.properties

@@ -292,7 +292,7 @@ gateway.web.registrations.never=noch nie
 gateway.web.registrations.page=Seite
 gateway.web.registrations.perpage=pro Seite
 gateway.web.registrations.filterby=Filter by
-gateway.web.registrations.xofy={0} of {1}
+gateway.web.registrations.xofy=<strong>{0}-{1}</strong> of <strong>{2}</strong>
 gateway.web.registrations.select=select
 gateway.web.registrations.node=Node
 gateway.web.registrations.local=local

src/plugins/kraken/src/i18n/kraken_i18n_es.properties

@@ -292,7 +292,7 @@ gateway.web.registrations.never=nunca
 gateway.web.registrations.page=P\u0087gina
 gateway.web.registrations.perpage=por p\u0087gina
 gateway.web.registrations.filterby=Filtrar por
-gateway.web.registrations.xofy={0} of {1}
+gateway.web.registrations.xofy=<strong>{0}-{1}</strong> of <strong>{2}</strong>
 gateway.web.registrations.select=select
 gateway.web.registrations.node=Node
 gateway.web.registrations.local=local

src/plugins/kraken/src/i18n/kraken_i18n_fr.properties

@@ -297,7 +297,7 @@ gateway.web.registrations.never=jamais
 gateway.web.registrations.page=Page
 gateway.web.registrations.perpage=par page
 gateway.web.registrations.filterby=Filtrer par
-gateway.web.registrations.xofy={0} of {1}
+gateway.web.registrations.xofy=<strong>{0}-{1}</strong> of <strong>{2}</strong>
 gateway.web.registrations.select=select
 gateway.web.registrations.node=Node
 gateway.web.registrations.local=local

src/plugins/kraken/src/i18n/kraken_i18n_it.properties

@@ -292,7 +292,7 @@ gateway.web.registrations.never=mai
 gateway.web.registrations.page=Pagina
 gateway.web.registrations.perpage=per Pagina
 gateway.web.registrations.filterby=Filtro per
-gateway.web.registrations.xofy={0} of {1}
+gateway.web.registrations.xofy=<strong>{0}-{1}</strong> of <strong>{2}</strong>
 gateway.web.registrations.select=select
 gateway.web.registrations.node=Node
 gateway.web.registrations.local=local

src/plugins/kraken/src/i18n/kraken_i18n_ja_JP.properties

@@ -292,7 +292,7 @@ gateway.web.registrations.never=\u6c7a\u3057\u3066
 gateway.web.registrations.page=\u30da\u30fc\u30b8
 gateway.web.registrations.perpage=\u30da\u30fc\u30b8\u3054\u3068
 gateway.web.registrations.filterby=\u30d5\u30a3\u30eb\u30bf\u30fc
-gateway.web.registrations.xofy={0} of {1}
+gateway.web.registrations.xofy=<strong>{0}-{1}</strong> of <strong>{2}</strong>
 gateway.web.registrations.select=select
 gateway.web.registrations.node=Node
 gateway.web.registrations.local=local

src/plugins/kraken/src/i18n/kraken_i18n_pt_BR.properties

@@ -292,7 +292,7 @@ gateway.web.registrations.never=nunca
 gateway.web.registrations.page=P\u00e1gina
 gateway.web.registrations.perpage=por p\u00e1gina
 gateway.web.registrations.filterby=Filtrar por
-gateway.web.registrations.xofy={0} of {1}
+gateway.web.registrations.xofy=<strong>{0}-{1}</strong> of <strong>{2}</strong>
 gateway.web.registrations.select=select
 gateway.web.registrations.node=Node
 gateway.web.registrations.local=local

src/plugins/kraken/src/i18n/kraken_i18n_sk.properties

@@ -292,7 +292,7 @@ gateway.web.registrations.never=nikdy
 gateway.web.registrations.page=Str\u00E1nka
 gateway.web.registrations.perpage=na str\u00E1nku
 gateway.web.registrations.filterby=Filtrova\u0165 pod\u013Ea
-gateway.web.registrations.xofy={0} z {1}
+gateway.web.registrations.xofy=<strong>{0}-{1}</strong> z <strong>{2}</strong>
 gateway.web.registrations.select=vybra\u0165
 gateway.web.registrations.node=Uzol
 gateway.web.registrations.local=lok\u00E1lne

src/plugins/kraken/src/i18n/kraken_i18n_zh_CN.properties

@@ -292,7 +292,7 @@ gateway.web.registrations.never=\u6C38\u4E0D
 gateway.web.registrations.page=\u9875
 gateway.web.registrations.perpage=\u6BCF\u9875
 gateway.web.registrations.filterby=\u8FC7\u6EE4
-gateway.web.registrations.xofy={0} of {1}
+gateway.web.registrations.xofy=<strong>{0}-{1}</strong> of <strong>{2}</strong>
 gateway.web.registrations.select=\u9009\u62E9
 gateway.web.registrations.node=\u8282\u70B9
 gateway.web.registrations.local=\u672C\u5730

src/plugins/kraken/src/web/error.jsp

@@ -3,7 +3,7 @@
                  org.jivesoftware.openfire.auth.UnauthorizedException"
     isErrorPage="true"
 %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%  boolean debug = "true".equals(JiveGlobals.getProperty("skin.default.debug"));
     if (debug) {
         exception.printStackTrace();

src/plugins/kraken/src/web/kraken-registrations.jsp

@@ -20,8 +20,8 @@
 <%@ page import="net.sf.kraken.session.TransportSession" %>
 <%@ page import="net.sf.kraken.BaseTransport" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 
@@ -520,7 +520,7 @@
 
 	<!-- BEGIN results -->
 	<div class="jive-registrations-results">
-		<fmt:message key="gateway.web.registrations.registrations" />: <fmt:message key="gateway.web.registrations.xofy"><fmt:param value="<%= "<strong>"+(start+1)+"-"+topRange+"</strong>" %>"/><fmt:param value="<%= "<strong>"+resCount+"</strong>" %>"/></fmt:message>
+		<fmt:message key="gateway.web.registrations.registrations" />: <fmt:message key="gateway.web.registrations.xofy"><fmt:param value="<%=(start+1)%>"/><fmt:param value="<%=topRange%>"/><fmt:param value="<%=resCount%>"/></fmt:message>
 	</div>
 	<!-- END results -->
 

src/plugins/kraken/src/web/kraken-settings.jsp

@@ -12,8 +12,8 @@
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     final KrakenPlugin plugin =

src/plugins/kraken/src/web/kraken-transports.jsp

@@ -16,8 +16,8 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="org.apache.log4j.Logger" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     final KrakenPlugin plugin =

src/plugins/monitoring/src/i18n/monitoring_i18n.properties

@@ -229,7 +229,7 @@ archive.group_conversation.close=Close
 archive.group_conversation.participants=Participants
 archive.group_conversation.participants.title=Group Chat Participants
 archive.group_conversation.participants.description=The table below shows the users that participated in the group \
-  conversation that took place in the room: {0}.
+  conversation that took place in the room: <b>{0}</b>.
 archive.group_conversation.participants.participant=Users
 archive.group_conversation.participants.empty=No participants were found.
 

src/plugins/monitoring/src/web/archive-conversation-participants.jsp

@@ -11,8 +11,8 @@
 <%@ page import="org.xmpp.packet.JID" %>
 <%@ page import="java.util.*" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     long conversationID = ParamUtils.getLongParameter(request, "conversationID", -1);
@@ -26,6 +26,7 @@
     ConversationManager conversationmanager = (ConversationManager) plugin.getModule(ConversationManager.class);
     List<String[]> values = new ArrayList<String[]>();
     JID room = null;
+    String roomName = "";
     try {
         Conversation conversation = conversationmanager.getConversation(conversationID);
         List<JID> participants = new ArrayList<JID>(conversation.getParticipants());
@@ -40,6 +41,9 @@
             }
         });
         room = conversation.getRoom();
+        if (room != null) {
+            roomName = room.getNode();
+        }
     }
     catch (NotFoundException e) {
         Log.error("Conversation not found: " + conversationID, e);
@@ -131,7 +135,7 @@
 		<h2><fmt:message key="archive.group_conversation.participants.title"/></h2>
 
 		<p><fmt:message key="archive.group_conversation.participants.description">
-                <fmt:param value="<%= room != null ? "<b>"+room.getNode()+"</b>" : "" %>" />
+                <fmt:param value="<%=roomName%>" />
             </fmt:message>
         </p>
 

src/plugins/monitoring/src/web/archive-search.jsp

@@ -13,8 +13,8 @@
 <%@ page import="java.text.SimpleDateFormat" %>
 <%@ page import="java.util.*" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%
     // Get handle on the Monitoring plugin
     MonitoringPlugin plugin = (MonitoringPlugin) XMPPServer.getInstance().getPluginManager().getPlugin(

src/plugins/monitoring/src/web/archiving-settings.jsp

@@ -7,8 +7,8 @@
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Map" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     // Get handle on the Monitoring plugin

src/plugins/monitoring/src/web/conversations.jsp

@@ -10,8 +10,8 @@
 <%@ page import="java.net.URLEncoder" %>
 <%@ page import="org.jivesoftware.util.StringUtils" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     // Get handle on the Monitoring plugin
@@ -174,10 +174,11 @@ function updateConversations(data) {
                         <%= StringUtils.escapeHTMLTags(jid.toBareJID()) %><br/>
                     <% } %>
                 <% } %>
-            <% } else { %>
+            <% } else {
+                pageContext.setAttribute( "roomBareJID", URLEncoder.encode(conversation.getRoom().toBareJID(), "UTF-8") ); %>
                 <fmt:message key="archive.group_conversation">
-                    <fmt:param value="<%= "<a href='../../muc-room-occupants.jsp?roomJID=" + URLEncoder.encode(conversation.getRoom().toBareJID(), "UTF-8") + "'>" %>" />
-                    <fmt:param value="<%= "</a>" %>" />
+                    <fmt:param value="<a href=\"../../muc-room-occupants.jsp?roomJID=${roomBareJID}\">" />
+                    <fmt:param value="</a>" />
                 </fmt:message>
             <% } %>
         </td>

src/plugins/monitoring/src/web/stats-dashboard.jsp

@@ -15,8 +15,8 @@
 <%@ page import="java.util.*"%>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page import="org.jivesoftware.openfire.plugin.MonitoringPlugin" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     String sessionKey = StatisticsModule.SESSIONS_KEY;

src/plugins/monitoring/src/web/stats-reporter.jsp

@@ -10,8 +10,8 @@
 <%@ page import="java.util.List"%>
 <%@ page import="org.jivesoftware.openfire.plugin.MonitoringPlugin" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     List<String> statList = Arrays.asList(getStatsViewer().getAllHighLevelStatKeys());

src/plugins/motd/src/web/motd-form.jsp

@@ -6,8 +6,8 @@
            java.util.Map"
    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"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <%
 	boolean save = request.getParameter("save") != null;	

src/plugins/nodejs/src/web/nodejs.jsp

@@ -3,8 +3,8 @@
 <%@ page import="org.jivesoftware.openfire.*" %>
 <%@ page import="org.jivesoftware.util.*" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%
 
     boolean update = request.getParameter("update") != null;

src/plugins/ofmeet/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetPlugin.java

@@ -25,6 +25,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.*;
 import java.text.*;
 import java.util.regex.*;
+import org.apache.tomcat.InstanceManager;
+import org.apache.tomcat.SimpleInstanceManager;
 import org.xmpp.packet.*;
 
 import org.jivesoftware.util.*;
@@ -50,6 +52,8 @@ import org.xmpp.component.ComponentManagerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
+import org.eclipse.jetty.plus.annotation.ContainerInitializer;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -194,9 +198,21 @@ public class OfMeetPlugin implements Plugin, ClusterEventListener  {
 			Log.info("OfMeet Plugin - Initialize websockets ");
 			ServletContextHandler context = new ServletContextHandler(contexts, "/ofmeetws", ServletContextHandler.SESSIONS);
 			context.addServlet(new ServletHolder(new XMPPServlet()),"/server");
+			// Ensure the JSP engine is initialized correctly (in order to be able to cope with Tomcat/Jasper precompiled JSPs).
+			final List<ContainerInitializer> initializers = new ArrayList<>();
+			initializers.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+			context.setAttribute("org.eclipse.jetty.containerInitializers", initializers);
+			context.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
 
 			WebAppContext context2 = new WebAppContext(contexts, pluginDirectory.getPath(), "/ofmeet");
 			context2.setClassLoader(this.getClass().getClassLoader());
+
+			// Ensure the JSP engine is initialized correctly (in order to be able to cope with Tomcat/Jasper precompiled JSPs).
+			final List<ContainerInitializer> initializers2 = new ArrayList<>();
+			initializers2.add(new ContainerInitializer(new JettyJasperInitializer(), null));
+			context2.setAttribute("org.eclipse.jetty.containerInitializers", initializers2);
+			context2.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
+
 			context2.setWelcomeFiles(new String[]{"index.html"});
 
 			String securityEnabled = JiveGlobals.getProperty("ofmeet.security.enabled", "true");

src/plugins/ofmeet/src/web/ofmeet-calendar.jsp

@@ -24,8 +24,8 @@
 <%@ page import="org.jivesoftware.openfire.plugin.spark.BookmarkManager" %>
 
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%
 
     String roomName = ParamUtils.getParameter(request,"name");

src/plugins/ofmeet/src/web/ofmeet-expire.jsp

@@ -24,8 +24,8 @@
     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" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <% webManager.init(request, response, session, application, out ); %>
 

src/plugins/ofmeet/src/web/ofmeet-planner.jsp

@@ -4,8 +4,8 @@
 <%@ page import="java.util.Collection"%>
 <%@ page import="org.xmpp.packet.JID" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     final Collection<Bookmark> bookmarks = BookmarkManager.getBookmarks();

src/plugins/ofmeet/src/web/ofmeet-settings.jsp

@@ -11,8 +11,8 @@
 <%@ page import="java.io.File" %>
 <%@ page import="java.net.InetAddress" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%
 
     boolean update = request.getParameter("update") != null;

src/plugins/ofmeet/src/web/ofmeet-summary.jsp

@@ -27,8 +27,8 @@
 %>
 <%@ page import="org.xmpp.packet.JID" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
 <% webManager.init(request, response, session, application, out ); %>
 

src/plugins/packetFilter/src/web/delete-rule.jsp

@@ -5,8 +5,8 @@
 <%@ page import="org.jivesoftware.openfire.plugin.rules.Rule" %>
 <%@ page import="org.jivesoftware.openfire.plugin.rules.RuleManager" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <% webManager.init(request, response, session, application, out ); %>

src/plugins/packetFilter/src/web/pf-main.jsp

@@ -8,8 +8,8 @@
 <%@ page import="org.xmpp.packet.JID" %>
 <%@ page import="java.util.List" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
 <%

src/plugins/packetFilter/src/web/rule-edit-form.jsp

@@ -14,8 +14,8 @@
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
 <%

src/plugins/packetFilter/src/web/rule-form.jsp

@@ -11,8 +11,8 @@
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="org.jivesoftware.openfire.RoutingTable" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
 <%

src/plugins/presence/src/web/presence-service.jsp

@@ -5,8 +5,8 @@
     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" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%
     PresencePlugin plugin = (PresencePlugin)XMPPServer.getInstance().getPluginManager().getPlugin("presence");

src/plugins/rayo/src/web/rayo.jsp

@@ -27,8 +27,8 @@
 --%>
 
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%
 
     boolean update = request.getParameter("update") != null;

src/plugins/registration/src/web/registration-props-form.jsp

@@ -25,8 +25,8 @@
    errorPage="error.jsp"%>
 <%@ page import="org.xmpp.packet.JID" %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <%
     boolean save = request.getParameter("save") != null;

src/plugins/registration/src/web/sign-up.jsp

@@ -23,8 +23,8 @@
                  net.tanesha.recaptcha.*"
 %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <html>
 <head>

src/plugins/restAPI/src/web/rest-api.jsp

@@ -6,8 +6,8 @@
                 org.jivesoftware.openfire.container.PluginManager"
 	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"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />

src/plugins/search/src/web/advance-user-search.jsp

@@ -8,8 +8,8 @@
                  org.xmpp.packet.Presence"
 %>
 
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <html>
     <head>

src/plugins/search/src/web/search-props-edit-form.jsp

@@ -5,8 +5,8 @@
                  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" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%  // Get parameters
     boolean save = request.getParameter("save") != null;

src/plugins/sip/src/i18n/sip_i18n.properties

@@ -51,7 +51,7 @@ sipark.user.create.valid.voicemail=Please specify the number to dial to access t
 sipark.user.delete.title=Delete SIP Mapping?
 sipark.user.delete.delete=Delete
 sipark.user.delete.cancel=Cancel
-sipark.user.delete.confirm=Are you sure you want to delete the mapping for {0} from the system?
+sipark.user.delete.confirm=Are you sure you want to delete the mapping for <a href='./../../user-properties.jsp?username={0}'>{1}</a> from the system?
 
 test = Test
 

src/plugins/sip/src/i18n/sip_i18n_cs_CZ.properties

@@ -99,7 +99,7 @@ sipark.user.create.valid.voicemail=Pros\u00edm zadejte \u010d\u00edslo, kter\u00
 sipark.user.delete.title=Smazat p\u0159i\u0159azen\u00ed SIP?
 sipark.user.delete.delete=Smazat
 sipark.user.delete.cancel=Storno
-sipark.user.delete.confirm=Jste si jist\u00fd(-\u00e1), \u017ee chcete smazat p\u0159i\u0159azen\u00ed pro {0} ze syst\u00e9mu?
+sipark.user.delete.confirm=Jste si jist\u00fd(-\u00e1), \u017ee chcete smazat p\u0159i\u0159azen\u00ed pro <a href='./../../user-properties.jsp?username={0}'>{1}</a> ze syst\u00e9mu?
 call.summary.no-entries=\u017d\u00e1dn\u00e9 z\u00e1znamy protokolu
 call.summary.title=P\u0159ehled vol\u00e1n\u00ed SIP
 call.summary.total_calls=Celkem hovor\u016f

src/plugins/sip/src/i18n/sip_i18n_es.properties

@@ -109,7 +109,7 @@ sipark.user.create.valid.voicemail=Especifique n\u00famero a discar para acceder
 sipark.user.delete.title=\u00bfEliminar mapeo de la cuenta SIP?
 sipark.user.delete.delete=Borrar
 sipark.user.delete.cancel=Cancelar
-sipark.user.delete.confirm=\u00bfDesea elimiar el mapeo de la cuenta SIP {0} del sistema?
+sipark.user.delete.confirm=\u00bfDesea elimiar el mapeo de la cuenta SIP <a href='./../../user-properties.jsp?username={0}'>{1}</a> del sistema?
 
 test = Test