Build: #2602 was successful Changes by daryl herzmann
Code commits
Openfire (master)
-
daryl herzmann 8144b2611667d43f916c5464922cf5495ac8856f
Merge pull request #2506 from guusdk/OF-2860_MUCRole-rename-nonbreaking
OF-2860: The non-breaking changes leading up to renaming the class MUCRole -
Guus der Kinderen c131aa1ce493895c41baa4edb85c33dcf8e3ea22 m
OF-2860: Deprecate `org.jivesoftware.openfire.muc.MultiUserChatService#getMUCRoles`
Marks `org.jivesoftware.openfire.muc.MultiUserChatService#getMUCRoles` for removal in 4.10.0.
This introduces a replacement method: `org.jivesoftware.openfire.muc.MultiUserChatService#getOccupants` and refactors all known users from the old to the new method.
In 4.10.0, the replacement method's API will change, which will require users to refactor their code potentially twice (if they choose to use the replacement method prior to 4.10.0).- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatService.java (version c131aa1ce493895c41baa4edb85c33dcf8e3ea22)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version c131aa1ce493895c41baa4edb85c33dcf8e3ea22)
-
Guus der Kinderen 4100e7bf5f052d374b9ab8c6641424489b5bb572 m
OF-2860: Deprecate `org.jivesoftware.openfire.muc.MUCRoom#addOccupantRole`
Marks `org.jivesoftware.openfire.muc.MUCRoom#addOccupantRole` for removal in 4.10.0.
This introduces a replacement method: `org.jivesoftware.openfire.muc.MUCRoom#addOccupant` and refactors all known users from the old to the new method.
In 4.10.0, the replacement method's API will change, which will require users to refactor their code potentially twice (if they choose to use the replacement method prior to 4.10.0).- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 4100e7bf5f052d374b9ab8c6641424489b5bb572)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 4100e7bf5f052d374b9ab8c6641424489b5bb572)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version 4100e7bf5f052d374b9ab8c6641424489b5bb572)
-
Guus der Kinderen 6fa48edaf31dd2532f59fe0154658b1fc6e34ed0 m
OF-2860: Deprecate `org.jivesoftware.openfire.muc.MUCRoom#removeOccupantRole`
Marks `org.jivesoftware.openfire.muc.MUCRoom#removeOccupantRole` for removal in 4.10.0.
This introduces a replacement method: `org.jivesoftware.openfire.muc.MUCRoom#removeOccupant` and refactors all known users from the old to the new method.
In 4.10.0, the replacement method's API will change, which will require users to refactor their code potentially twice (if they choose to use the replacement method prior to 4.10.0).- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 6fa48edaf31dd2532f59fe0154658b1fc6e34ed0)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 6fa48edaf31dd2532f59fe0154658b1fc6e34ed0)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version 6fa48edaf31dd2532f59fe0154658b1fc6e34ed0)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 6fa48edaf31dd2532f59fe0154658b1fc6e34ed0)
-
Guus der Kinderen c7a0214d0d3a064886695808cbc9e33834137103 m
OF-2860: Deprecate `org.jivesoftware.openfire.muc.MUCRole#getRoleAddress`
Marks `org.jivesoftware.openfire.muc.MUCRole#getRoleAddress` for removal in 4.10.0.
This introduces a replacement method: `org.jivesoftware.openfire.muc.MUCRole#getOccupantJID` and refactors all known users from the old to the new method.
The name 'Occupant JID' reflects how the XEP refers to this data.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRole.java (version c7a0214d0d3a064886695808cbc9e33834137103)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version c7a0214d0d3a064886695808cbc9e33834137103)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java (version c7a0214d0d3a064886695808cbc9e33834137103)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version c7a0214d0d3a064886695808cbc9e33834137103)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version c7a0214d0d3a064886695808cbc9e33834137103)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version c7a0214d0d3a064886695808cbc9e33834137103)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version c7a0214d0d3a064886695808cbc9e33834137103)
- xmppserver/src/main/java/org/jivesoftware/util/cache/ConsistencyChecks.java (version c7a0214d0d3a064886695808cbc9e33834137103)
- xmppserver/src/main/webapp/muc-room-edit-form.jsp (version c7a0214d0d3a064886695808cbc9e33834137103)
- xmppserver/src/test/java/org/jivesoftware/openfire/muc/MUCRoleTest.java (version c7a0214d0d3a064886695808cbc9e33834137103)
-
Guus der Kinderen f047eb2b305768ce14166c849383b205d07fcdd5 m
OF-2860: Deprecate `org.jivesoftware.openfire.muc.MUCRole#createRoomRole`
Marks `org.jivesoftware.openfire.muc.MUCRole#createRoomRole` for removal in 4.10.0.
This introduces a replacement method: `org.jivesoftware.openfire.muc.MUCRole#createRoomSelfRepresentation` and refactors all known users from the old to the new method.
In 4.10.0, the replacement method's API will change, which will require users to refactor their code potentially twice (if they choose to use the replacement method prior to 4.10.0).- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRole.java (version f047eb2b305768ce14166c849383b205d07fcdd5)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version f047eb2b305768ce14166c849383b205d07fcdd5)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version f047eb2b305768ce14166c849383b205d07fcdd5)
-
Guus der Kinderen 96184c70175694e73cb45d3447879f033dbc7e04 m
OF-2860: Deprecate `org.jivesoftware.openfire.muc.MUCRoom#getRole()`
Marks `org.jivesoftware.openfire.muc.MUCRoom#getRole()` for removal in 4.10.0.
This introduces a replacement method: `org.jivesoftware.openfire.muc.MUCRoom#getSelfRepresentation()` and refactors all known users from the old to the new method.
In 4.10.0, the replacement method's API will change, which will require users to refactor their code potentially twice (if they choose to use the replacement method prior to 4.10.0).- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventDelegate.java (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRole.java (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCRegisterHandler.java (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/main/webapp/muc-room-affiliations.jsp (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/main/webapp/muc-room-edit-form.jsp (version 96184c70175694e73cb45d3447879f033dbc7e04)
- xmppserver/src/test/java/org/jivesoftware/openfire/muc/MUCRoomTest.java (version 96184c70175694e73cb45d3447879f033dbc7e04)
-
Guus der Kinderen e552553333a6b6fb5cc24120c3a4332ba00c036b m
OF-2860: Rename MUCRole variables
In preparation of the renaming of the MUCRole class, this commit renames all variables (and some comments / log messages). This aims to explicitly distinguish between the XEP-defined term 'role' and the usage of MUCRole, which is now mostly referenced as 'occupant'.
This commit is not supposed to introduce any functional change.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryRequest.java (version e552553333a6b6fb5cc24120c3a4332ba00c036b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRole.java (version e552553333a6b6fb5cc24120c3a4332ba00c036b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version e552553333a6b6fb5cc24120c3a4332ba00c036b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java (version e552553333a6b6fb5cc24120c3a4332ba00c036b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version e552553333a6b6fb5cc24120c3a4332ba00c036b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java (version e552553333a6b6fb5cc24120c3a4332ba00c036b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java (version e552553333a6b6fb5cc24120c3a4332ba00c036b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version e552553333a6b6fb5cc24120c3a4332ba00c036b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version e552553333a6b6fb5cc24120c3a4332ba00c036b)
- xmppserver/src/main/java/org/jivesoftware/util/cache/ConsistencyChecks.java (version e552553333a6b6fb5cc24120c3a4332ba00c036b)
- xmppserver/src/main/webapp/muc-room-occupants.jsp (version e552553333a6b6fb5cc24120c3a4332ba00c036b)
- xmppserver/src/test/java/org/jivesoftware/openfire/muc/MUCRoomTest.java (version e552553333a6b6fb5cc24120c3a4332ba00c036b)