Build #2,295

Plan branch:

Build: #2295 was successful Manual run by daryl herzmann

Code commits

Openfire (master)

  • Guus der Kinderen

    Guus der Kinderen 4cf2d68493776ae8f888f0bc15362f40cb9cb090

    Reduce verbosity of 'remove chatroom' logging

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 4cf2d68493776ae8f888f0bc15362f40cb9cb090)
  • Guus der Kinderen

    Guus der Kinderen 6b778ce4855f820ebe083dbb917e541bb445c0af

    OF-2861: Rename MUCRole to MUCOccupant
    Renames the class, and removes all deprecated methods that were still using it.

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryRequest.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCOccupant.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatService.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCvCardHandler.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/java/org/jivesoftware/util/cache/ConsistencyChecks.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/webapp/muc-room-edit-form.jsp (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/main/webapp/muc-room-occupants.jsp (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/test/java/org/jivesoftware/openfire/muc/MUCOccupantTest.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
    • xmppserver/src/test/java/org/jivesoftware/openfire/muc/MUCRoomTest.java (version 6b778ce4855f820ebe083dbb917e541bb445c0af)
  • Guus der Kinderen

    Guus der Kinderen e8dfe9505a60bb9f690a4e9659c7be93f7fa0fc3

    OF-2871: Support password for alternate, when destroying room
    Per XEP-0045, the room destruction command and notification can include an alternate room, as well as an optional password to be used for that alternate room.

    This commit adds support for the optional password.

    • i18n/src/main/resources/openfire_i18n.properties (version e8dfe9505a60bb9f690a4e9659c7be93f7fa0fc3)
    • i18n/src/main/resources/openfire_i18n_nl.properties (version e8dfe9505a60bb9f690a4e9659c7be93f7fa0fc3)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version e8dfe9505a60bb9f690a4e9659c7be93f7fa0fc3)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java (version e8dfe9505a60bb9f690a4e9659c7be93f7fa0fc3)
    • xmppserver/src/main/webapp/muc-room-delete.jsp (version e8dfe9505a60bb9f690a4e9659c7be93f7fa0fc3)
  • Guus der Kinderen

    Guus der Kinderen 2877d5bb47e366b3408c3fcf1935f0c9d8862a20

    OF-2862: Refactor MUC 'role' and 'affiliation' usage
    Many privileges in multi-user chat are tied to either ‘roles’ or ‘permissions’, as defined in XEP-0045. Openfire’s existing implementation bases the ‘MUCRole' implementation as the source of much. As the ‘MUCRole' class is available only when a user is currently in the chat room, this prevents functionality that’s aught to be allowable when a user is not.

    Refactor Openfire’s implementation to explicitly base permission handing based on roles and affiliations.

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventDelegate.java (version 2877d5bb47e366b3408c3fcf1935f0c9d8862a20)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRole.java (version 2877d5bb47e366b3408c3fcf1935f0c9d8862a20)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 2877d5bb47e366b3408c3fcf1935f0c9d8862a20)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java (version 2877d5bb47e366b3408c3fcf1935f0c9d8862a20)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCRegisterHandler.java (version 2877d5bb47e366b3408c3fcf1935f0c9d8862a20)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java (version 2877d5bb47e366b3408c3fcf1935f0c9d8862a20)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version 2877d5bb47e366b3408c3fcf1935f0c9d8862a20)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version 2877d5bb47e366b3408c3fcf1935f0c9d8862a20)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 2877d5bb47e366b3408c3fcf1935f0c9d8862a20)
    • xmppserver/src/main/webapp/muc-room-occupants.jsp (version 2877d5bb47e366b3408c3fcf1935f0c9d8862a20)
    • xmppserver/src/test/java/org/jivesoftware/openfire/muc/spi/MucPrivilegesTest.java (version 2877d5bb47e366b3408c3fcf1935f0c9d8862a20)
  • Guus der Kinderen

    Guus der Kinderen 050ab64c0b0c2fe535acf6aecbee05995128141c

    OF-2861: Move MUCRole.Role and MUCRole.Affiliation to upper level
    Both public enums are first-class citizens, being explicitly defined in the XEP and used throughout the code.

    As the MUCRole class is plenty large, lets move these two enums to a class of their own.

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/Affiliation.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRole.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/Role.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCRegisterHandler.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/main/webapp/muc-room-edit-form.jsp (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/test/java/org/jivesoftware/openfire/muc/MUCRoleTest.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
    • xmppserver/src/test/java/org/jivesoftware/openfire/muc/MUCRoomTest.java (version 050ab64c0b0c2fe535acf6aecbee05995128141c)
  • Guus der Kinderen

    Guus der Kinderen 6befa6f2c29c256719de34d177d31cece1a1d5b9

    OF-2862: Restore functionality lost in refactoring
    When kicking a user from a room, the reason for kicking, as well as a reference to the actor, should be part of the presence stanza that's sent out.

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 6befa6f2c29c256719de34d177d31cece1a1d5b9)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java (version 6befa6f2c29c256719de34d177d31cece1a1d5b9)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version 6befa6f2c29c256719de34d177d31cece1a1d5b9)
  • Guus der Kinderen

    Guus der Kinderen e9b377ad9dc85407d73aad43460889501a773471

    OF-2865: A moderator SHOULD NOT be allowed to revoke moderation privileges from someone with a higher affiliation than themselves

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version e9b377ad9dc85407d73aad43460889501a773471)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java (version e9b377ad9dc85407d73aad43460889501a773471)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version e9b377ad9dc85407d73aad43460889501a773471)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version e9b377ad9dc85407d73aad43460889501a773471)
    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version e9b377ad9dc85407d73aad43460889501a773471)