From 038556b4aec13737fcdee9da4a45bc2c7b31e590 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Thu, 14 Nov 2024 11:56:30 +0100
Subject: [PATCH] fixes #22: Compatibility with Openfire 4.9.0 and later

In Openfire 4.9.0, a deprecated API was removed that was used by this plugin. This commit replaces that usage with usage of an API that was introduced in Openfire 4.8.0. As a result, this plugin now requires Openfire 4.8.0 or later.

As the plugin no longer is compatible with older versions of Openfire, a backwards-compatibily hack for JSP compilation was removed.
---
 changelog.html                                |  4 ++-
 plugin.xml                                    |  4 +--
 pom.xml                                       | 11 +------
 .../jasper/runtime/JspSourceImports.java      | 30 -------------------
 .../openfire/plugin/MotDPlugin.java           |  3 +-
 5 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 src/java/org/apache/jasper/runtime/JspSourceImports.java

diff --git a/changelog.html b/changelog.html
index dada08dcc..feee57a46 100644
--- a/changelog.html
+++ b/changelog.html
@@ -44,11 +44,13 @@ <h1>MotD Plugin Changelog</h1>
 
 <p><b>1.2.5</b> -- To Be Determined</p>
 <ul>
+    <li>Requires Openfire 4.8.0 or later.</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-motd-plugin/issues/22'>Issue #22</a>] - Users cannot connect when enabled in Openfire 4.9.0 or later</li>
 </ul>
 
 <p><b>1.2.4</b> -- November 21, 2023</p>
 <ul>
-    <li>Added Frenc (fr) translations provided by Vincent Vauchey</li>
+    <li>Added French (fr) translations provided by Vincent Vauchey</li>
     <li>Added Portuguese (pt_PT) translations</li>
 </ul>
 
diff --git a/plugin.xml b/plugin.xml
index fc99dfe74..e8d0f0b85 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -6,8 +6,8 @@
    <description>Allows admins to have a message sent to users each time they log in.</description>
    <author>Ryan Graham</author>
    <version>${project.version}</version>
-   <date>2022-11-21</date>
-   <minServerVersion>4.0.0</minServerVersion>
+   <date>2024-11-14</date>
+   <minServerVersion>4.8.0</minServerVersion>
    <minJavaVersion>1.8</minJavaVersion>
 
    <adminconsole>
diff --git a/pom.xml b/pom.xml
index 7586ba735..ede9532e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.3.0</version>
+        <version>4.8.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>motd</artifactId>
@@ -48,15 +48,6 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-jspc-maven-plugin</artifactId>
-                <!-- Use the old version for Openfire 4.2 compatibility -->
-                <version>9.2.14.v20151106</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.igniterealtime.openfire</groupId>
-                        <artifactId>xmppserver</artifactId>
-                        <version>${openfire.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/src/java/org/apache/jasper/runtime/JspSourceImports.java b/src/java/org/apache/jasper/runtime/JspSourceImports.java
deleted file mode 100644
index 09f58d822..000000000
--- a/src/java/org/apache/jasper/runtime/JspSourceImports.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jasper.runtime;
-
-import java.util.Set;
-
-/**
- * The EL engine needs access to the imports used in the JSP page to configure
- * the ELContext. The imports are available at compile time but the ELContext
- * is created lazily per page. This interface exposes the imports at runtime so
- * that they may be added to the ELContext when it is created.
- */
-public interface JspSourceImports {
-    Set<String> getPackageImports();
-    Set<String> getClassImports();
-}
diff --git a/src/java/org/jivesoftware/openfire/plugin/MotDPlugin.java b/src/java/org/jivesoftware/openfire/plugin/MotDPlugin.java
index aae05a479..110a98bde 100644
--- a/src/java/org/jivesoftware/openfire/plugin/MotDPlugin.java
+++ b/src/java/org/jivesoftware/openfire/plugin/MotDPlugin.java
@@ -1,6 +1,7 @@
 package org.jivesoftware.openfire.plugin;
 
 import java.io.File;
+import java.time.Duration;
 import java.util.TimerTask;
 
 import org.jivesoftware.util.JiveGlobals;
@@ -85,7 +86,7 @@ public void run() {
                }
             };
 
-            TaskEngine.getInstance().schedule(messageTask, 5000);
+            TaskEngine.getInstance().schedule(messageTask, Duration.ofSeconds(5));
          }
       }