Build: #1321 was successful Changes by daryl herzmann <akrherz@iastate.edu> and Guus der Kinderen
Code commits
Openfire (master)
-
daryl herzmann <akrherz@iastate.edu> 56a16b4f394fc7abeb10d3d2a759b656ddf00ba3
Merge pull request #828 from guusdk/OF-1353_maxServerVersion
Various plugin-related improvements. -
Guus der Kinderen 414074f2c0a88997716b03b79999ea4d910d4abf
Adds an EditorConfig file. (#831)
EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs.- .editorconfig (version 414074f2c0a88997716b03b79999ea4d910d4abf)
-
Guus der Kinderen 2c82359e3a9e7653f551e47379abe731c1a889de m
not longer -> no longer
- src/i18n/openfire_i18n_en.properties (version 2c82359e3a9e7653f551e47379abe731c1a889de)
- src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/AgentSession.java (version 2c82359e3a9e7653f551e47379abe731c1a889de)
-
Guus der Kinderen 1cb144fe48d6ec3826699928214a85fcf933f009 m
OF-1353: Change from 'maxServerVersion' to 'priorToServerVersion'
'max' implies to specify a server version that still supports the plugin, while typically, one would like to specify the first version in which support was dropped. That version should thus be 'exclusive'.- src/i18n/openfire_i18n_en.properties (version 1cb144fe48d6ec3826699928214a85fcf933f009)
- src/java/org/jivesoftware/openfire/container/PluginManager.java (version 1cb144fe48d6ec3826699928214a85fcf933f009)
- src/java/org/jivesoftware/openfire/container/PluginMetadata.java (version 1cb144fe48d6ec3826699928214a85fcf933f009)
- src/java/org/jivesoftware/openfire/container/PluginMetadataHelper.java (version 1cb144fe48d6ec3826699928214a85fcf933f009)
- src/java/org/jivesoftware/openfire/update/AvailablePlugin.java (version 1cb144fe48d6ec3826699928214a85fcf933f009)
- src/java/org/jivesoftware/openfire/update/UpdateManager.java (version 1cb144fe48d6ec3826699928214a85fcf933f009)
- src/web/plugin-admin.jsp (version 1cb144fe48d6ec3826699928214a85fcf933f009)
-
Guus der Kinderen 92450df2cac015ef2469d4794d0976e70d522699 m
Allow icons to be served for extracted but not loaded plugins.
- src/java/org/jivesoftware/openfire/container/PluginIconServlet.java (version 92450df2cac015ef2469d4794d0976e70d522699)
- src/java/org/jivesoftware/openfire/container/PluginManager.java (version 92450df2cac015ef2469d4794d0976e70d522699)
-
Guus der Kinderen fee25623124b744b843889b1cf5f2f416ad4193a m
OF-1353: Adding maxServerVersion (and more)
This commit started with the intention of adding a maxServerVersion attribute for plugins, but resulted in a partial rewrite. Changes:
- Removed the License enumeration - now, a simple string is used.
- Split off the admin console page that shows the content of readme and changelog files to a dedicated page, instead of plugin-admin.jsp
- Better define the difference between the plugin (human readable) name ("Avatar Resizer") and its canonical name ("avatarresizer")
- The admin console now shows plugins that have been downloaded/installed, but cannot be loaded. Where possible, an update is suggested.
- Support for maxServerVersion - plugins can now define a version of Openfire in which they will no longer load.- src/i18n/openfire_i18n_en.properties (version fee25623124b744b843889b1cf5f2f416ad4193a)
- src/java/org/jivesoftware/openfire/container/License.java (version fee25623124b744b843889b1cf5f2f416ad4193a)
- src/java/org/jivesoftware/openfire/container/PluginManager.java (version fee25623124b744b843889b1cf5f2f416ad4193a)
- src/java/org/jivesoftware/openfire/container/PluginMetadata.java (version fee25623124b744b843889b1cf5f2f416ad4193a)
- src/java/org/jivesoftware/openfire/container/PluginMetadataHelper.java (version fee25623124b744b843889b1cf5f2f416ad4193a)
- src/java/org/jivesoftware/openfire/container/PluginMonitor.java (version fee25623124b744b843889b1cf5f2f416ad4193a)
- src/java/org/jivesoftware/openfire/update/AvailablePlugin.java (version fee25623124b744b843889b1cf5f2f416ad4193a)
- src/java/org/jivesoftware/openfire/update/UpdateManager.java (version fee25623124b744b843889b1cf5f2f416ad4193a)
- src/web/available-plugins.jsp (version fee25623124b744b843889b1cf5f2f416ad4193a)
- src/web/plugin-admin.jsp (version fee25623124b744b843889b1cf5f2f416ad4193a)
- src/web/plugin-showfile.jsp (version fee25623124b744b843889b1cf5f2f416ad4193a)
-
Guus der Kinderen f701008894992cc5942b960c51fc5636a122bc72 m
Adding custom JSTL functions.
- src/java/org/jivesoftware/admin/JSTLFunctions.java (version f701008894992cc5942b960c51fc5636a122bc72)
- webadmintld/src/main/resources/META-INF/admin.tld (version f701008894992cc5942b960c51fc5636a122bc72)
-
Guus der Kinderen 93f818483a2bd7fe4dd8ab263ecdb8189f99bff0 m
OF-546: Remove duplicated tag library definitions.
- src/web/WEB-INF/admin.tld (version 93f818483a2bd7fe4dd8ab263ecdb8189f99bff0)
- src/web/WEB-INF/tags/admin/contentBox.tagx (version 93f818483a2bd7fe4dd8ab263ecdb8189f99bff0)
- src/web/WEB-INF/tags/admin/infoBox.tagx (version 93f818483a2bd7fe4dd8ab263ecdb8189f99bff0)
- webadmin/pom.xml (version 93f818483a2bd7fe4dd8ab263ecdb8189f99bff0)