OF-953: Old JSP libraries should be upgraded. #305
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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)
|
I noticed there were a handful of functional changes here and there in several of the plugins and the admin console. Hopefully we can enlist a few testing volunteers to give these components a shakedown after the merge. Otherwise looks good. Thanks Guus! |
|
I tried to build the old JSP pages with Maven and I got this error: Failed to execute goal org.apache.sling:maven-jspc-plugin:2.0.8:jspc (compile-jsp) on project xmppserver: The absolute uri: http://java.sun.com/jstl/fmt_rt cannot be resolved in either web.xml or the jar files deployed with this application I think the fixed taglibs should solve this issue. This PR is generally a good idea, although there are a lot of changes. |
sco0ter
added a commit
to sco0ter/Openfire
that referenced
this pull request
Nov 18, 2015
The Maven structure is: -/ --dbutil (used by xmppserver) --i18n (used by starter and xmppserver) --starter (launcher and starter package, startup.jar) --xmppserver (nearly everything in the src dir, openfire.jar) --webadmin (admin plugin) --plugins ---broadcast ---... I've also added Maven plugins to mimic partial behavior of the Ant build (copying dependencies, bin/conf folder, ...) This commit addresses issues OF-546. I reconfigured the pom.xmls to work with the existing directory structure, (instead of default src/main/java), so that the current src folder stays untouched. What it can do: - Run tests successfully - Generate JavaDoc - Assemble most plugin jars (without JSP) - Assemble admin plugin (without JSP) - Generate a source zip/tar.gz for distribution (as the download page offers it currently) - Build the startup.jar and openfire.jar, copy it in the right directory, so that Openfire can be run with `java -jar startup.jar` What it can't do: - Build executables for every platform (e.g. install4j, *.dmg, ...) - Compile JSP pages (waiting for PR igniterealtime#305) - Build some plugins (e.g. ofmeet) due to non-Maven dependencies. Todos: - Fix these issues - Move source code to the correct paths, e.g. /src to xmppserver/src/main/java
|
@deleolajide Do you have a comment on this change? It touches Ofmeet. |
|
Please note, that I rebased this branch on master, resolved the conflicts and pushed it to the upstream branch |
|
@akrherz , thanks for the heads up. +1 for the change and I will have to resolve any issues that crop up. |
|
committed to master, thanks to @sco0ter rebase |
sco0ter
added a commit
to sco0ter/Openfire
that referenced
this pull request
Nov 19, 2015
The Maven structure is: -/ --dbutil (used by xmppserver) --i18n (used by starter and xmppserver) --starter (launcher and starter package, startup.jar) --xmppserver (nearly everything in the src dir, openfire.jar) --webadmin (admin plugin) --plugins ---broadcast ---... I've also added Maven plugins to mimic partial behavior of the Ant build (copying dependencies, bin/conf folder, ...) This commit addresses issues OF-546. I reconfigured the pom.xmls to work with the existing directory structure, (instead of default src/main/java), so that the current src folder stays untouched. What it can do: - Run tests successfully - Generate JavaDoc - Assemble most plugin jars (without JSP) - Assemble admin plugin (without JSP) - Generate a source zip/tar.gz for distribution (as the download page offers it currently) - Build the startup.jar and openfire.jar, copy it in the right directory, so that Openfire can be run with `java -jar startup.jar` What it can't do: - Build executables for every platform (e.g. install4j, *.dmg, ...) - Compile JSP pages (waiting for PR igniterealtime#305) - Build some plugins (e.g. ofmeet) due to non-Maven dependencies. Todos: - Fix these issues - Move source code to the correct paths, e.g. /src to xmppserver/src/main/java
sco0ter
added a commit
to sco0ter/Openfire
that referenced
this pull request
Nov 19, 2015
The Maven structure is: -/ --dbutil (used by xmppserver) --i18n (used by starter and xmppserver) --starter (launcher and starter package, startup.jar) --xmppserver (nearly everything in the src dir, openfire.jar) --webadmin (admin plugin) --plugins ---broadcast ---... I've also added Maven plugins to mimic partial behavior of the Ant build (copying dependencies, bin/conf folder, ...) This commit addresses issues OF-546. I reconfigured the pom.xmls to work with the existing directory structure, (instead of default src/main/java), so that the current src folder stays untouched. What it can do: - Run tests successfully - Generate JavaDoc - Assemble most plugin jars (without JSP) - Assemble admin plugin (without JSP) - Generate a source zip/tar.gz for distribution (as the download page offers it currently) - Build the startup.jar and openfire.jar, copy it in the right directory, so that Openfire can be run with `java -jar startup.jar` What it can't do: - Build executables for every platform (e.g. install4j, *.dmg, ...) - Compile JSP pages (waiting for PR igniterealtime#305) - Build some plugins (e.g. ofmeet) due to non-Maven dependencies. Todos: - Fix these issues - Move source code to the correct paths, e.g. /src to xmppserver/src/main/java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: