net-im/openfire: Update to 4.8.0

ChangeLog:
https://download.igniterealtime.org/openfire/docs/4.8.0/changelog.html

PR:		277054
Reported by:	nikita@druba.su (maintainer)
Reviewed by:	polarian@polarian.dev
MFH:		2024Q2 (security fixes)
Security:	CVE-2023-32315

(cherry picked from commit d5618a3ac4a1a72c27bc06062108df22dff6caa5)

3 files changed, 141 insertions, 98 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 07cb94968f20..8b19ce817bdc 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openfire
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.7.5
+DISTVERSION=	4.8.0
 PORTEPOCH=	1
 CATEGORIES=	net-im java
 
@@ -21,7 +21,6 @@ USE_GITHUB=	YES
 GH_ACCOUNT=	igniterealtime
 GH_PROJECT=	Openfire
 USE_JAVA=	yes
-JAVA_VERSION=	8+
 
 USE_RC_SUBR=	${PORTNAME}
 NO_ARCH=	yes
@@ -37,8 +36,9 @@ PLIST_SUB+=	VARDB=${VARDB} \
 		VARLOG=${VARLOG}
 
 OPTIONS_DEFINE=		DOCS TEST
-OPTIONS_DEFAULT=	MAVEN_LOCAL
-OPTIONS_SINGLE=		MAVEN
+OPTIONS_DEFAULT=	MAVEN_LOCAL OPENJDK11
+OPTIONS_SINGLE=		MAVEN JAVA
+OPTIONS_SINGLE_JAVA=	OPENJDK11 OPENJDK17
 OPTIONS_SINGLE_MAVEN=	MAVEN_LOCAL MAVEN_ONLINE
 
 MAVEN_DESC=		Source of Maven build plugins
@@ -52,6 +52,14 @@ MVN_TARGET=	package
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MOPENJDK11}
+JAVA_VERSION=	11
+.endif
+
+.if ${PORT_OPTIONS:MOPENJDK17}
+JAVA_VERSION=	17
+.endif
+
 .if ${PORT_OPTIONS:MTEST}
 MVN_OPTS=	-DskipTests=false
 .else
@@ -67,8 +75,8 @@ MVN_OPTS+=	-U
 .endif
 
 do-build:
-	${ECHO_CMD} "cd ${WRKSRC} && ${MVN} ${MVN_OPTS} ${MVN_TARGET}"
-	@(cd ${WRKSRC} && ${MVN} ${MVN_OPTS} ${MVN_TARGET})
+	${ECHO_CMD} "cd ${WRKSRC &&} JAVA_VERSION=${JAVA_VERSION} ${MVN} ${MVN_OPTS} ${MVN_TARGET}"
+	@(cd ${WRKSRC} && JAVA_VERSION=${JAVA_VERSION} ${MVN} ${MVN_OPTS} ${MVN_TARGET})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index 859276e97d61..64b780d57bda 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1686316122
-SHA256 (igniterealtime-Openfire-v4.7.5_GH0.tar.gz) = 7c2c4cad2879606404d966a6183c33c77ecf885b814b45845e64aea4f0aaa305
-SIZE (igniterealtime-Openfire-v4.7.5_GH0.tar.gz) = 7423544
-SHA256 (FreeBSD-openfire-4.7.5-maven-repository.tar.gz) = 012f3bafc66d726de7a6b8ec4030eed23cca393a3433befeed352a4d2d828cde
-SIZE (FreeBSD-openfire-4.7.5-maven-repository.tar.gz) = 258158024
+TIMESTAMP = 1707929810
+SHA256 (igniterealtime-Openfire-v4.8.0_GH0.tar.gz) = 20d919a9eec6a530189ba75b859501b3d99845df0e18b9e12ed3e646e67dd568
+SIZE (igniterealtime-Openfire-v4.8.0_GH0.tar.gz) = 8836109
+SHA256 (FreeBSD-openfire-4.8.0-maven-repository.tar.gz) = 55b1c50a7c62092af476ef6ce75b9937df5098e1aee13906445e95c72dd0ca5b
+SIZE (FreeBSD-openfire-4.8.0-maven-repository.tar.gz) = 289799753
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index 69706846645c..ba9e322be7fd 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -9,9 +9,19 @@
 @mode
 @dir %%DATADIR%%
 @dir %%DATADIR%%/plugins
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-mellium.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-moxxmpp.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-smack.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-stanzajs.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-stropejs.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-twistedwords.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-xmppdotnet.html
 %%PORTDOCS%%%%DOCSDIR%%/database-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/database.html
+%%PORTDOCS%%%%DOCSDIR%%/db-clustering-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/db-integration-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/diagrams/netty-message-handling.md
+%%PORTDOCS%%%%DOCSDIR%%/diagrams/netty-server-bootstrap.md
 %%PORTDOCS%%%%DOCSDIR%%/docker.html
 %%PORTDOCS%%%%DOCSDIR%%/ide-vscode-setup.html
 %%PORTDOCS%%%%DOCSDIR%%/images/VSCode-1.png
@@ -26,16 +36,36 @@
 %%PORTDOCS%%%%DOCSDIR%%/images/active_directory.png
 %%PORTDOCS%%%%DOCSDIR%%/images/header_logo.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/launcher.png
+%%PORTDOCS%%%%DOCSDIR%%/images/netty-in-openfire.png
+%%PORTDOCS%%%%DOCSDIR%%/images/netty-message-handling.png
+%%PORTDOCS%%%%DOCSDIR%%/images/netty-overview.png
+%%PORTDOCS%%%%DOCSDIR%%/images/netty-pipelines.png
+%%PORTDOCS%%%%DOCSDIR%%/images/netty-server-bootstrap.png
+%%PORTDOCS%%%%DOCSDIR%%/images/network-dns-override.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/network-hub-and-spoke.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/network-mesh.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/one-time-access-token-login.png
 %%PORTDOCS%%%%DOCSDIR%%/images/setup_ldap.png
+%%PORTDOCS%%%%DOCSDIR%%/images/setup_pgcluster_enable_clustering.png
+%%PORTDOCS%%%%DOCSDIR%%/images/setup_pgcluster_install_hazelcast.png
+%%PORTDOCS%%%%DOCSDIR%%/images/setup_pgcluster_jdbc.png
+%%PORTDOCS%%%%DOCSDIR%%/images/setup_pgcluster_recovery.png
+%%PORTDOCS%%%%DOCSDIR%%/images/setup_pgcluster_second_primary.png
 %%PORTDOCS%%%%DOCSDIR%%/images/sitemesh.png
 %%PORTDOCS%%%%DOCSDIR%%/images/spark_debug.png
 %%PORTDOCS%%%%DOCSDIR%%/images/windows_service.png
+%%PORTDOCS%%%%DOCSDIR%%/implementing-authprovider-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/implementing-groupprovider-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/implementing-userprovider-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/internal-networking.html
 %%PORTDOCS%%%%DOCSDIR%%/ldap-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-dom4j.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-jaxen.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-xpp3.txt
+%%PORTDOCS%%%%DOCSDIR%%/load-balancing.html
+%%PORTDOCS%%%%DOCSDIR%%/one-time-access-token-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/openfire.doap
 %%PORTDOCS%%%%DOCSDIR%%/overlay.html
 %%PORTDOCS%%%%DOCSDIR%%/pluggable-roster-support-guide.html
@@ -46,6 +76,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/ssl-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/translator-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/trunking-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/upgrade-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/wildfire-ent-3_2_0-upgrade.html
 %%PORTDOCS%%%%DOCSDIR%%/wildfire-openfire-upgrade.html
@@ -53,19 +84,18 @@
 %%DATADIR%%/conf
 %%DATADIR%%/embedded-db
 %%DATADIR%%/lib/activation-1.1.jar
-%%DATADIR%%/lib/apache-el-8.5.54.jar
-%%DATADIR%%/lib/apache-jsp-8.5.54.jar
-%%DATADIR%%/lib/apache-jsp-9.4.43.v20210629.jar
-%%DATADIR%%/lib/asm-9.1.jar
-%%DATADIR%%/lib/asm-analysis-9.1.jar
-%%DATADIR%%/lib/asm-commons-9.1.jar
-%%DATADIR%%/lib/asm-tree-9.1.jar
-%%DATADIR%%/lib/bcpg-jdk15on-1.70.jar
-%%DATADIR%%/lib/bcpkix-jdk15on-1.70.jar
-%%DATADIR%%/lib/bcprov-jdk15on-1.70.jar
-%%DATADIR%%/lib/bcutil-jdk15on-1.70.jar
+%%DATADIR%%/lib/apache-el-9.0.52.jar
+%%DATADIR%%/lib/apache-jsp-10.0.18.jar
+%%DATADIR%%/lib/apache-jsp-9.0.52.jar
+%%DATADIR%%/lib/asm-9.6.jar
+%%DATADIR%%/lib/asm-commons-9.6.jar
+%%DATADIR%%/lib/asm-tree-9.6.jar
+%%DATADIR%%/lib/bcpg-jdk18on-1.76.jar
+%%DATADIR%%/lib/bcpkix-jdk18on-1.76.jar
+%%DATADIR%%/lib/bcprov-jdk18on-1.76.jar
+%%DATADIR%%/lib/bcutil-jdk18on-1.76.jar
 %%DATADIR%%/lib/caffeine-2.7.0.jar
-%%DATADIR%%/lib/checker-qual-3.5.0.jar
+%%DATADIR%%/lib/checker-qual-3.31.0.jar
 %%DATADIR%%/lib/common-image-3.9.4.jar
 %%DATADIR%%/lib/common-io-3.9.4.jar
 %%DATADIR%%/lib/common-lang-3.9.4.jar
@@ -73,100 +103,124 @@
 %%DATADIR%%/lib/commons-dbcp2-2.9.0.jar
 %%DATADIR%%/lib/commons-fileupload-1.5.jar
 %%DATADIR%%/lib/commons-io-2.11.0.jar
+%%DATADIR%%/lib/commons-ip-math-1.32.jar
 %%DATADIR%%/lib/commons-lang3-3.9.jar
 %%DATADIR%%/lib/commons-logging-1.2.jar
 %%DATADIR%%/lib/commons-pool2-2.9.0.jar
 %%DATADIR%%/lib/commons-text-1.10.0.jar
-%%DATADIR%%/lib/dom4j-2.1.3.jar
+%%DATADIR%%/lib/dom4j-2.1.4.jar
 %%DATADIR%%/lib/dwr-3.0.2-RELEASE.jar
-%%DATADIR%%/lib/ecj-3.19.0.jar
-%%DATADIR%%/lib/error_prone_annotations-2.3.4.jar
+%%DATADIR%%/lib/ecj-3.26.0.jar
+%%DATADIR%%/lib/error_prone_annotations-2.18.0.jar
 %%DATADIR%%/lib/failureaccess-1.0.1.jar
-%%DATADIR%%/lib/guava-30.1-jre.jar
-%%DATADIR%%/lib/hsqldb-2.4.1.jar
+%%DATADIR%%/lib/guava-32.0.1-jre.jar
+%%DATADIR%%/lib/hsqldb-2.7.1.jar
 %%DATADIR%%/lib/httpclient-4.5.13.jar
 %%DATADIR%%/lib/httpcore-4.4.13.jar
-%%DATADIR%%/lib/i18n-4.7.5.jar
+%%DATADIR%%/lib/i18n-4.8.0.jar
 %%DATADIR%%/lib/imageio-bmp-3.9.4.jar
 %%DATADIR%%/lib/imageio-core-3.9.4.jar
 %%DATADIR%%/lib/istack-commons-runtime-3.0.11.jar
-%%DATADIR%%/lib/j2objc-annotations-1.3.jar
+%%DATADIR%%/lib/j2objc-annotations-2.8.jar
 %%DATADIR%%/lib/jakarta.activation-1.2.2.jar
+%%DATADIR%%/lib/jakarta.annotation-api-1.3.5.jar
+%%DATADIR%%/lib/jakarta.transaction-api-1.3.3.jar
 %%DATADIR%%/lib/jakarta.xml.bind-api-2.3.3.jar
 %%DATADIR%%/lib/jansi-1.18.jar
-%%DATADIR%%/lib/javassist-3.24.1-GA.jar
 %%DATADIR%%/lib/javax.activation-api-1.2.0.jar
-%%DATADIR%%/lib/javax.annotation-api-1.3.2.jar
 %%DATADIR%%/lib/javax.mail-1.6.2.jar
-%%DATADIR%%/lib/javax.servlet-api-3.1.0.jar
 %%DATADIR%%/lib/jaxb-api-2.3.1.jar
 %%DATADIR%%/lib/jaxb-runtime-2.3.3.jar
 %%DATADIR%%/lib/jaxen-1.2.0.jar
 %%DATADIR%%/lib/jcip-annotations-1.0.jar
-%%DATADIR%%/lib/jcl-over-slf4j-1.7.36.jar
-%%DATADIR%%/lib/jdom2-2.0.6.jar
-%%DATADIR%%/lib/jetty-annotations-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-client-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-continuation-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-http-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-io-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-jmx-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-jndi-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-plus-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-schemas-3.1.2.jar
-%%DATADIR%%/lib/jetty-security-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-server-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-servlet-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-servlets-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-util-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-util-ajax-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-webapp-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-xml-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jcl-over-slf4j-2.0.9.jar
+%%DATADIR%%/lib/jetty-annotations-10.0.18.jar
+%%DATADIR%%/lib/jetty-http-10.0.18.jar
+%%DATADIR%%/lib/jetty-io-10.0.18.jar
+%%DATADIR%%/lib/jetty-jmx-10.0.18.jar
+%%DATADIR%%/lib/jetty-jndi-10.0.18.jar
+%%DATADIR%%/lib/jetty-plus-10.0.18.jar
+%%DATADIR%%/lib/jetty-schemas-4.0.3.jar
+%%DATADIR%%/lib/jetty-security-10.0.18.jar
+%%DATADIR%%/lib/jetty-server-10.0.18.jar
+%%DATADIR%%/lib/jetty-servlet-10.0.18.jar
+%%DATADIR%%/lib/jetty-servlet-api-4.0.6.jar
+%%DATADIR%%/lib/jetty-servlets-10.0.18.jar
+%%DATADIR%%/lib/jetty-util-10.0.18.jar
+%%DATADIR%%/lib/jetty-webapp-10.0.18.jar
+%%DATADIR%%/lib/jetty-xml-10.0.18.jar
 %%DATADIR%%/lib/jmdns-1.0.jar
 %%DATADIR%%/lib/jsmpp-2.3.10.jar
+%%DATADIR%%/lib/json-20231013.jar
 %%DATADIR%%/lib/jsr305-3.0.2.jar
 %%DATADIR%%/lib/jtds-1.3.1.jar
 %%DATADIR%%/lib/jzlib-1.1.3.jar
 %%DATADIR%%/lib/libidn-1.35.jar
 %%DATADIR%%/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
-%%DATADIR%%/lib/log4j-api-2.17.1.jar
-%%DATADIR%%/lib/log4j-core-2.17.1.jar
-%%DATADIR%%/lib/log4j-slf4j-impl-2.17.1.jar
+%%DATADIR%%/lib/log4j-api-2.20.0.jar
+%%DATADIR%%/lib/log4j-core-2.20.0.jar
+%%DATADIR%%/lib/log4j-slf4j2-impl-2.20.0.jar
 %%DATADIR%%/lib/log4j2.xml
-%%DATADIR%%/lib/mina-core-2.1.3.jar
-%%DATADIR%%/lib/mina-filter-compression-2.1.3.jar
-%%DATADIR%%/lib/mina-integration-beans-2.1.3.jar
-%%DATADIR%%/lib/mina-integration-jmx-2.1.3.jar
-%%DATADIR%%/lib/mina-integration-ognl-2.1.3.jar
-%%DATADIR%%/lib/mssql-jdbc-9.4.1.jre8.jar
-%%DATADIR%%/lib/mysql-connector-j-8.0.32.jar
-%%DATADIR%%/lib/ognl-3.2.10.jar
-%%DATADIR%%/lib/postgresql-42.4.1.jar
-%%DATADIR%%/lib/rome-1.15.0.jar
-%%DATADIR%%/lib/rome-utils-1.15.0.jar
+%%DATADIR%%/lib/mssql-jdbc-9.4.1.jre11.jar
+%%DATADIR%%/lib/mysql-connector-j-8.2.0.jar
+%%DATADIR%%/lib/netty-all-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-buffer-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-dns-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-haproxy-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-http-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-http2-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-memcache-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-mqtt-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-redis-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-smtp-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-socks-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-stomp-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-xml-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-common-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-handler-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-handler-proxy-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-handler-ssl-ocsp-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-resolver-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-resolver-dns-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-resolver-dns-classes-macos-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-resolver-dns-native-macos-4.1.100.Final-osx-aarch_64.jar
+%%DATADIR%%/lib/netty-resolver-dns-native-macos-4.1.100.Final-osx-x86_64.jar
+%%DATADIR%%/lib/netty-transport-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-classes-epoll-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-classes-kqueue-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-native-epoll-4.1.100.Final-linux-aarch_64.jar
+%%DATADIR%%/lib/netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
+%%DATADIR%%/lib/netty-transport-native-kqueue-4.1.100.Final-osx-aarch_64.jar
+%%DATADIR%%/lib/netty-transport-native-kqueue-4.1.100.Final-osx-x86_64.jar
+%%DATADIR%%/lib/netty-transport-native-unix-common-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-rxtx-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-sctp-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-udt-4.1.100.Final.jar
+%%DATADIR%%/lib/postgresql-42.6.0.jar
 %%DATADIR%%/lib/shaj-0.5.jar
 %%DATADIR%%/lib/sitemesh-2.4.2.jar
-%%DATADIR%%/lib/slf4j-api-1.7.36.jar
+%%DATADIR%%/lib/slf4j-api-2.0.9.jar
 %%DATADIR%%/lib/startup.jar
 %%DATADIR%%/lib/taglibs-standard-impl-1.2.5.jar
 %%DATADIR%%/lib/taglibs-standard-spec-1.2.5.jar
 %%DATADIR%%/lib/tinder-2.0.0.jar
 %%DATADIR%%/lib/txw2-2.3.3.jar
-%%DATADIR%%/lib/websocket-api-9.4.43.v20210629.jar
-%%DATADIR%%/lib/websocket-client-9.4.43.v20210629.jar
-%%DATADIR%%/lib/websocket-common-9.4.43.v20210629.jar
-%%DATADIR%%/lib/websocket-server-9.4.43.v20210629.jar
-%%DATADIR%%/lib/websocket-servlet-9.4.43.v20210629.jar
-%%DATADIR%%/lib/xmppserver-4.7.5.jar
+%%DATADIR%%/lib/websocket-core-common-10.0.18.jar
+%%DATADIR%%/lib/websocket-core-server-10.0.18.jar
+%%DATADIR%%/lib/websocket-jetty-api-10.0.18.jar
+%%DATADIR%%/lib/websocket-jetty-common-10.0.18.jar
+%%DATADIR%%/lib/websocket-jetty-server-10.0.18.jar
+%%DATADIR%%/lib/websocket-servlet-10.0.18.jar
+%%DATADIR%%/lib/xmppserver-4.8.0.jar
 %%DATADIR%%/lib/xpp3-1.1.4c.jar
 %%DATADIR%%/logs
 %%DATADIR%%/plugins/admin/plugin.xml
-%%DATADIR%%/plugins/admin/webapp/META-INF/admin.tld
-%%DATADIR%%/plugins/admin/webapp/META-INF/tags/admin/contentBox.tagx
-%%DATADIR%%/plugins/admin/webapp/META-INF/tags/admin/infoBox.tagx
-%%DATADIR%%/plugins/admin/webapp/META-INF/tags/admin/security/identityStoreConfig.tagx
-%%DATADIR%%/plugins/admin/webapp/META-INF/tags/admin/security/trustStoreConfig.tagx
-%%DATADIR%%/plugins/admin/webapp/WEB-INF/admin.tld
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/META-INF/admin.tld
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/META-INF/tags/admin/contentBox.tagx
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/META-INF/tags/admin/infoBox.tagx
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/META-INF/tags/admin/security/identityStoreConfig.tagx
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/META-INF/tags/admin/security/trustStoreConfig.tagx
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/openfire_init.xml
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/decorators.xml
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/dwr.xml
@@ -300,26 +354,8 @@
 %%DATADIR%%/plugins/admin/webapp/images/yahoo.gif
 %%DATADIR%%/plugins/admin/webapp/index.html
 %%DATADIR%%/plugins/admin/webapp/js/behaviour.js
-%%DATADIR%%/plugins/admin/webapp/js/builder.js
-%%DATADIR%%/plugins/admin/webapp/js/controls.js
 %%DATADIR%%/plugins/admin/webapp/js/cookies.js
-%%DATADIR%%/plugins/admin/webapp/js/dragdrop.js
-%%DATADIR%%/plugins/admin/webapp/js/effects.js
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-setup.js
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-win2k-1.css
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-win2k-cold-1.css
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar.js
-%%DATADIR%%/plugins/admin/webapp/js/lightbox.js
-%%DATADIR%%/plugins/admin/webapp/js/pngfix.js
-%%DATADIR%%/plugins/admin/webapp/js/prototype.js
-%%DATADIR%%/plugins/admin/webapp/js/scriptaculous.js
 %%DATADIR%%/plugins/admin/webapp/js/setup.js
-%%DATADIR%%/plugins/admin/webapp/js/slider.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/domLib.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/domTT.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/domTT_drag.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/fadomatic.js
-%%DATADIR%%/plugins/admin/webapp/js/unittest.js
 %%DATADIR%%/plugins/admin/webapp/setup/setup-style.css
 %%DATADIR%%/plugins/admin/webapp/style/framework/css/bootstrap.min.css
 %%DATADIR%%/plugins/admin/webapp/style/framework/css/font-awesome.min.css
@@ -331,7 +367,6 @@
 %%DATADIR%%/plugins/admin/webapp/style/framework/fonts/fontawesome-webfontd41d.eot
 %%DATADIR%%/plugins/admin/webapp/style/global.css
 %%DATADIR%%/plugins/admin/webapp/style/ldap.css
-%%DATADIR%%/plugins/admin/webapp/style/lightbox.css
 %%DATADIR%%/plugins/admin/webapp/style/login.css
 %%DATADIR%%/plugins/admin/webapp/style/setup.css
 %%DATADIR%%/resources/database/openfire_db2.sql