Build #195

Plan branch:

Build: #195 was successful Scheduled with changes by Greg Thomas <greg.d.thomas@gmail.com> and GregDThomas <greg.d.thomas@gmail.com>

Code commits

Openfire (master)

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

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

    Merge pull request #1230 from GregDThomas/OF-1323
    OF-1323: Trivial performance optimisation

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

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

    Merge pull request #1241 from GregDThomas/OF-1649
    OF-1649: Solve race condition when adding/housekeeping users

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

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

    Merge pull request #1271 from GregDThomas/default-cache-improvements
    Default cache improvements

  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> 4e805ec1f4d9433d0b87477257648eb57a232e36

    OF-1687: Migrate logging settings to SystemProperty

    • xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java (version 4e805ec1f4d9433d0b87477257648eb57a232e36)
    • xmppserver/src/main/java/org/jivesoftware/util/Log.java (version 4e805ec1f4d9433d0b87477257648eb57a232e36)
    • xmppserver/src/main/webapp/logviewer.jsp (version 4e805ec1f4d9433d0b87477257648eb57a232e36)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> ff5e3085be409b46981b0f899bf52aa932cb2b18

    OF-1687: Add support for Collections with Generics (I fought the generics, and for once I won!)

    • xmppserver/src/main/java/org/jivesoftware/openfire/admin/DefaultAdminProvider.java (version ff5e3085be409b46981b0f899bf52aa932cb2b18)
    • xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java (version ff5e3085be409b46981b0f899bf52aa932cb2b18)
    • xmppserver/src/test/java/org/jivesoftware/util/SystemPropertyTest.java (version ff5e3085be409b46981b0f899bf52aa932cb2b18)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> c0b809d70f00ca2c0d1bd365a015461a49cd8aa2

    OF-1687: Add support for Sets

    • xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java (version c0b809d70f00ca2c0d1bd365a015461a49cd8aa2)
    • xmppserver/src/test/java/org/jivesoftware/util/SystemPropertyTest.java (version c0b809d70f00ca2c0d1bd365a015461a49cd8aa2)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> 73510ebaf134ef8e87d6490e34c11f19190c1f25

    OF-1687: Add support for List types

    • i18n/src/main/resources/openfire_i18n_en.properties (version 73510ebaf134ef8e87d6490e34c11f19190c1f25)
    • xmppserver/src/main/java/org/jivesoftware/openfire/admin/DefaultAdminProvider.java (version 73510ebaf134ef8e87d6490e34c11f19190c1f25)
    • xmppserver/src/main/java/org/jivesoftware/util/StringUtils.java (version 73510ebaf134ef8e87d6490e34c11f19190c1f25)
    • xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java (version 73510ebaf134ef8e87d6490e34c11f19190c1f25)
    • xmppserver/src/test/java/org/jivesoftware/util/SystemPropertyTest.java (version 73510ebaf134ef8e87d6490e34c11f19190c1f25)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> ec2b1852ded1c2b51fbdca11af0a7a259884f8f2

    OF-1687: UpdateManager to use a SystemProperty

    • xmppserver/src/main/java/org/jivesoftware/openfire/update/PluginDownloadManager.java (version ec2b1852ded1c2b51fbdca11af0a7a259884f8f2)
    • xmppserver/src/main/java/org/jivesoftware/openfire/update/UpdateManager.java (version ec2b1852ded1c2b51fbdca11af0a7a259884f8f2)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> a064ee7b6731f7c020b5a4db4ada8526856a310f

    OF-1687: Add support for Enums

    • xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java (version a064ee7b6731f7c020b5a4db4ada8526856a310f)
    • xmppserver/src/test/java/org/jivesoftware/util/SystemPropertyTest.java (version a064ee7b6731f7c020b5a4db4ada8526856a310f)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> 52beec3b493056d693c0716b7e42098bdb2855c7

    OF-1687: Migrate SessionManager to use a SystemProperty

    • xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version 52beec3b493056d693c0716b7e42098bdb2855c7)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> b52d0487739a871ad3fb97efc39e8ec00e6876d8

    OF-1687: Remember the documentation for JIDs!

    • xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java (version b52d0487739a871ad3fb97efc39e8ec00e6876d8)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> 3479b64146a35e049e2dd99582923bc1090d878d

    OF-1687: Add support for JIDs

    • xmppserver/src/main/java/org/jivesoftware/openfire/admin/DefaultAdminProvider.java (version 3479b64146a35e049e2dd99582923bc1090d878d)
    • xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java (version 3479b64146a35e049e2dd99582923bc1090d878d)
    • xmppserver/src/test/java/org/jivesoftware/util/SystemPropertyTest.java (version 3479b64146a35e049e2dd99582923bc1090d878d)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> 4b75a6afacfd7fa22911e9fe470e547ed8a5338c

    OF-1687: Introduce SystemProperty class

    • i18n/src/main/resources/openfire_i18n_en.properties (version 4b75a6afacfd7fa22911e9fe470e547ed8a5338c)
    • xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemPropertiesServlet.java (version 4b75a6afacfd7fa22911e9fe470e547ed8a5338c)
    • xmppserver/src/main/java/org/jivesoftware/util/ListPager.java (version 4b75a6afacfd7fa22911e9fe470e547ed8a5338c)
    • xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java (version 4b75a6afacfd7fa22911e9fe470e547ed8a5338c)
    • xmppserver/src/main/resources/admin-sidebar.xml (version 4b75a6afacfd7fa22911e9fe470e547ed8a5338c)
    • xmppserver/src/main/webapp/WEB-INF/web.xml (version 4b75a6afacfd7fa22911e9fe470e547ed8a5338c)
    • xmppserver/src/main/webapp/system-properties.jsp (version 4b75a6afacfd7fa22911e9fe470e547ed8a5338c)
    • xmppserver/src/test/java/org/jivesoftware/util/SystemPropertyTest.java (version 4b75a6afacfd7fa22911e9fe470e547ed8a5338c)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> d60f00373f64ecbb9b9f9b6ff8059a07ffc05f61

    OF-1687: Migrate AuthFactory / HybridAuthProvider to use a SystemProperty

    • xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthFactory.java (version d60f00373f64ecbb9b9f9b6ff8059a07ffc05f61)
    • xmppserver/src/main/java/org/jivesoftware/openfire/auth/HybridAuthProvider.java (version d60f00373f64ecbb9b9f9b6ff8059a07ffc05f61)
  • GregDThomas <greg.d.thomas@gmail.com>

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

    OF-1679: Be very explicit with Cache#values() entrySet() and keySet() 1) Make it clear in the documentation that they are read only 2) In the CacheWrapper, make the collections unmodifiable to attempt to modify them are immediately spotted 3) Update GroupManager to no longer modify the collections (the only place that the code base attempted to do so)

    • xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupManager.java (version fd6ba02bb6beb9989ef09f26b57cd04087f05ef5)
    • xmppserver/src/main/java/org/jivesoftware/util/cache/Cache.java (version fd6ba02bb6beb9989ef09f26b57cd04087f05ef5)
    • xmppserver/src/main/java/org/jivesoftware/util/cache/CacheWrapper.java (version fd6ba02bb6beb9989ef09f26b57cd04087f05ef5)
    • xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultCache.java (version fd6ba02bb6beb9989ef09f26b57cd04087f05ef5)
  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 9bd8bc98ea8987509351b213928c828d76d2d6d2 m

    Tidy up some IntelliJ highlighted inspections - no functional changes

    • xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultCache.java (version 9bd8bc98ea8987509351b213928c828d76d2d6d2)
  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 3ebaecb404076f1872e17b7cefad5f5ec347905e m

    OF-1649: Enhance the API to allow the lock status to be queried etc.

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 3ebaecb404076f1872e17b7cefad5f5ec347905e)
    • xmppserver/src/main/java/org/jivesoftware/util/AutoCloseableReentrantLock.java (version 3ebaecb404076f1872e17b7cefad5f5ec347905e)
    • xmppserver/src/main/java/org/jivesoftware/util/QuietAutoCloseable.java (version 3ebaecb404076f1872e17b7cefad5f5ec347905e)
    • xmppserver/src/test/java/org/jivesoftware/util/AutoCloseableReentrantLockTest.java (version 3ebaecb404076f1872e17b7cefad5f5ec347905e)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> e01d316d2968739a7ad6c53dba8b158abdda3322 m

    Keep a (weak) reference to the key in the value, so all instances of the class can share the same key (as in key1 == key2) preventing the GC from removing entries from the WeakHashMap erroneously.

    • xmppserver/src/main/java/org/jivesoftware/util/AutoCloseableReentrantLock.java (version e01d316d2968739a7ad6c53dba8b158abdda3322)
  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 6df7cf36e86cfc9f695ddac2d4ce1eecd61558ef m

    OF-1649: Ensure that user housekeeping cannot run at the same as user creation

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 6df7cf36e86cfc9f695ddac2d4ce1eecd61558ef)
  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 71ee4c2bfe10d8393612f5f3ba071def19244f73 m

    General code tidy up. Mostly IntelliJ suggested inspections, but also (a) Fix tiniest possibility of a race condition in LocalMUCRoomManager#removeRoom (b) Stop removing the room as a listener in MultiUserChatServiceImpl#removeChatRoom as it's already done in LocalMUCRoomManager#removeRoom

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version 71ee4c2bfe10d8393612f5f3ba071def19244f73)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 71ee4c2bfe10d8393612f5f3ba071def19244f73)
  • GregDThomas <greg.d.thomas@gmail.com>

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

    OF-1649: Add an AutoCloseableReentrantLock to allow finer locking

    • xmppserver/pom.xml (version a62c3d9772b5cc4d1d81fac9522926da1a35bc56)
    • xmppserver/src/main/java/org/jivesoftware/util/AutoCloseableReentrantLock.java (version a62c3d9772b5cc4d1d81fac9522926da1a35bc56)
    • xmppserver/src/main/java/org/jivesoftware/util/QuietAutoCloseable.java (version a62c3d9772b5cc4d1d81fac9522926da1a35bc56)
    • xmppserver/src/test/java/org/jivesoftware/util/AutoCloseableReentrantLockTest.java (version a62c3d9772b5cc4d1d81fac9522926da1a35bc56)
  • GregDThomas <greg.d.thomas@gmail.com>

    GregDThomas <greg.d.thomas@gmail.com> 7b16cb5dba170d40f560531b094373fedb815f64 m

    OF-1323: Trivial performance optimisation

    • xmppserver/src/main/java/org/jivesoftware/openfire/nio/XMLLightweightParser.java (version 7b16cb5dba170d40f560531b094373fedb815f64)