Build #106

Plan branch:

Build: #106 was successful Scheduled with changes by daryl herzmann <akrherz@iastate.edu> and GregDThomas <greg.d.thomas@gmail.com>

Code commits

Openfire (master)

  • daryl herzmann <akrherz@iastate.edu>

    daryl herzmann <akrherz@iastate.edu> c448f149e88db2b5f72017218b4c0e2dac673112

    Merge pull request #1214 from GregDThomas/OF-1627
    OF-1627 revisited: Add some further properties that are only kept in XML

  • daryl herzmann <akrherz@iastate.edu>

    daryl herzmann <akrherz@iastate.edu> cd48c884f34b6705c79b2ff14b27d38f23d62cf1

    Merge pull request #1222 from GregDThomas/plugin-logging-improvements
    Allow plugins to have their own log4j2.xml file

  • daryl herzmann <akrherz@iastate.edu>

    daryl herzmann <akrherz@iastate.edu> f1867bc84f650aafdbe57bc52be001606add75d7

    Merge pull request #1221 from GregDThomas/logging-improvements
    Stop embedding log4j2.xml in the startup.jar

  • daryl herzmann <akrherz@iastate.edu>

    daryl herzmann <akrherz@iastate.edu> 809b375771e39c965a1d33cfcaad060fef9b2450

    Merge pull request #1220 from GregDThomas/double-starter-jar
    Stop startup.jar from being deployed twice

  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> be8b68dc16d2e136b097f99a0cd16d7706dfcf7c

    Merge pull request #1219 from GregDThomas/OF-1584
    OF-1584 bis: Use the Jetty content type mappings instead of the JRE

  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 1238cde8e2c8b7b572588716a1b2cdc7d63cda95

    Add some synchronization to avoid a rare stack trace when two loggers try to initialise at the "same" time

    • xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java (version 1238cde8e2c8b7b572588716a1b2cdc7d63cda95)
  • daryl herzmann <akrherz@iastate.edu>

    daryl herzmann <akrherz@iastate.edu> 82a5ec207feafd41eb5228dfc3f92dfcc3fa3057

    Merge pull request #1215 from akrherz/oopsy
    OF-1636 move updated inverse files to proper home

  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> db344807ba0f045d4a1dd16920c2d5cf6db814a0

    Allow plugins to have their own log4j2.xml file (and thus their own logging context)

    • xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java (version db344807ba0f045d4a1dd16920c2d5cf6db814a0)
  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 291c2a402f851b20fde91b4462470e68af116a64

    Stop embedding log4j2.xml in the startup.jar This allows admin's to configure logging by editing log4j2.xml directly rather than edit the file embedded in startup.jar. It does require an additional parameter to be passed when starting the server, though.

    • distribution/src/assembly/basic-distribution.xml (version 291c2a402f851b20fde91b4462470e68af116a64)
    • distribution/src/bin/extra/openfire-launchd-wrapper.sh (version 291c2a402f851b20fde91b4462470e68af116a64)
    • distribution/src/bin/extra/redhat/openfire (version 291c2a402f851b20fde91b4462470e68af116a64)
    • distribution/src/bin/openfire.bat (version 291c2a402f851b20fde91b4462470e68af116a64)
    • distribution/src/bin/openfire.sh (version 291c2a402f851b20fde91b4462470e68af116a64)
    • distribution/src/bin/openfirectl (version 291c2a402f851b20fde91b4462470e68af116a64)
    • distribution/src/installer/openfire.install4j (version 291c2a402f851b20fde91b4462470e68af116a64)
    • distribution/src/resources/log4j2.xml (version 291c2a402f851b20fde91b4462470e68af116a64)
    • starter/pom.xml (version 291c2a402f851b20fde91b4462470e68af116a64)
  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 9fb7efc6942a01c366116e8a460431cd9fa4d649

    Stop startup.jar from being deployed twice (once as starter-<version>.jar, once as startup.jar)

    • distribution/pom.xml (version 9fb7efc6942a01c366116e8a460431cd9fa4d649)
    • distribution/src/assembly/basic-distribution.xml (version 9fb7efc6942a01c366116e8a460431cd9fa4d649)
  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> ed6cd96884f3f3cbe0708ece59128a511e540951 m

    OF-1584 bis: Use the Jetty content type mappings instead of the JRE (The JRE doesn't contain a content type for CSS files, for example)

    • xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServlet.java (version ed6cd96884f3f3cbe0708ece59128a511e540951)
  • akrherz <akrherz@iastate.edu>

    akrherz <akrherz@iastate.edu> bb61592b8f0907b0ef8f9023c3aaf06fd193b25b m

    OF-1636 move updated inverse files to proper home

    • plugins/inverse/classes/inverse/css/fullpage.css (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/images/user.svg (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/fonticons/fonts/icomoon.eot (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/fonticons/fonts/icomoon.svg (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/fonticons/fonts/icomoon.ttf (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/fonticons/fonts/icomoon.woff (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/fonticons/selection.json (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/fonticons/style.css (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/fonts/icomoon.eot (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/fonts/icomoon.svg (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/fonts/icomoon.ttf (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/fonts/icomoon.woff (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/selection.json (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/css/webfonts/icomoon/style.css (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/logo/conversejs-filled.svg (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/logo/conversejs-transparent.svg (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/logo/diasporing.svg (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/logo/hostpresto.png (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/logo/keycdn.png (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/logo/keycdn.svg (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/logo/mastodon.svg (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/logo/wikisuite-white.png (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/logo/wikisuite.png (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/sounds/README (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/sounds/msg_received.mp3 (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
    • plugins/inverse/classes/inverse/sounds/msg_received.ogg (version bb61592b8f0907b0ef8f9023c3aaf06fd193b25b)
  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 07d25ed473b4d17db47b04c8e824286226ab791e m

    OF-1627 revisited: Add some further properties that are only kept in XML

    • xmppserver/src/main/java/org/jivesoftware/database/JNDIDataSourceProvider.java (version 07d25ed473b4d17db47b04c8e824286226ab791e)
    • xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java (version 07d25ed473b4d17db47b04c8e824286226ab791e)