Merge pull request #6 from guusdk/4_openfire-470_and_release

fixes for #4 and #5, and drafting a new release

changelog.html

@@ -43,11 +43,14 @@ <h1>
 Candy Plugin Changelog
 </h1>
 
-<p><b>2.2.0 Release 3</b> -- (tbd)</p>
+<p><b>2.2.0 Release 3</b> -- February 22, 2022</p>
 <ul>
+    <li>Minimum Openfire requirement: 4.7.0</li>
     <li>[<a href='https://issues.igniterealtime.org/browse/OF-1517'>OF-1517</a>] - Don't require i18n source files for all plugins to be encoded.</li>
     <li>[<a href='https://issues.igniterealtime.org/browse/OF-1641'>OF-1641</a>] - Ensure all JSP pages have the correct contentType.</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-candy-plugin/issues/1'>#1</a>] - Fix Maven build</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-candy-plugin/issues/4'>#4</a>] - Compatibility with Openfire 4.7.0 and later.</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-candy-plugin/issues/5'>#5</a>] - Replace usage of deprecated Openfire API.</li>
     <li>Minimum Java requirement: 1.8</li>
 </ul>
 

plugin.xml

@@ -5,8 +5,8 @@
     <description>Adds the (third-party) Candy web client to Openfire.</description>
     <author>Guus der Kinderen</author>
     <version>${project.version}</version>
-    <date>tbc.</date>
-    <minServerVersion>4.1.5</minServerVersion>
+    <date>2022-02-22</date>
+    <minServerVersion>4.7.0</minServerVersion>
     <minJavaVersion>1.8</minJavaVersion>
     <adminconsole>
         <tab id="tab-webclients" name="${admin.sidebar.webclients.name}" description="${admin.sidebar.webclients.description}" url="candy-config.jsp">    

pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.3.0-beta</version>
+        <version>4.7.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>candy</artifactId>
     <name>Candy Webchat Plugin</name>
-    <version>2.2.0-release-3-SNAPSHOT</version>
+    <version>2.2.0-release-4-SNAPSHOT</version>
 
     <build>
         <sourceDirectory>src/java</sourceDirectory>

src/web/candy-config.jsp

@@ -1,5 +1,5 @@
 <!--
-  - Copyright (C) 2017 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -29,6 +29,8 @@
 <%@ page import="org.jivesoftware.openfire.http.HttpBindManager" %>
 <%@ page import="org.igniterealtime.openfire.plugin.candy.Language" %>
 <%@ page import="org.igniterealtime.openfire.plugin.candy.CandyPlugin" %>
+<%@ page import="org.jivesoftware.openfire.spi.ConnectionType" %>
+<%@ page import="org.jivesoftware.openfire.spi.ConnectionManagerImpl" %>
 <%@ 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"  />
@@ -199,14 +201,14 @@
         <fmt:param value=""/>
     </fmt:message>
     <% if ( httpBindManager.isHttpBindActive() ) {
-        final String unsecuredAddress = "http://" + XMPPServer.getInstance().getServerInfo().getHostname() + ":" + httpBindManager.getHttpBindUnsecurePort() + "/candy/";
+        final String unsecuredAddress = "http://" + XMPPServer.getInstance().getServerInfo().getHostname() + ":" + ((ConnectionManagerImpl)XMPPServer.getInstance().getConnectionManager()).getPort(ConnectionType.BOSH_C2S, false) + "/candy/";
     %>
         <fmt:message key="config.page.link.unsecure">
             <fmt:param value="<%=unsecuredAddress%>"/>
         </fmt:message>
     <% } %>
     <% if ( httpBindManager.isHttpsBindActive() ) {
-        final String securedAddress = "https://" + XMPPServer.getInstance().getServerInfo().getHostname() + ":" + httpBindManager.getHttpBindSecurePort() + "/candy/";
+        final String securedAddress = "https://" + XMPPServer.getInstance().getServerInfo().getHostname() + ":" + ((ConnectionManagerImpl)XMPPServer.getInstance().getConnectionManager()).getPort(ConnectionType.BOSH_C2S, true) + "/candy/";
     %>
         <fmt:message key="config.page.link.secure">
             <fmt:param value="<%=securedAddress%>"/>