Build: #691 was successful Manual run by Guus der Kinderen
Code commits
Openfire (master)
-
akrherz <akrherz@iastate.edu> 41041642078a1e498c4f8b6e6a5b226409b5dbcd
Denote Openfire 4.6.0 Beta Release
- distribution/pom.xml (version 41041642078a1e498c4f8b6e6a5b226409b5dbcd)
- i18n/pom.xml (version 41041642078a1e498c4f8b6e6a5b226409b5dbcd)
- plugins/openfire-plugin-assembly-descriptor/pom.xml (version 41041642078a1e498c4f8b6e6a5b226409b5dbcd)
- plugins/pom.xml (version 41041642078a1e498c4f8b6e6a5b226409b5dbcd)
- pom.xml (version 41041642078a1e498c4f8b6e6a5b226409b5dbcd)
- starter/pom.xml (version 41041642078a1e498c4f8b6e6a5b226409b5dbcd)
- xmppserver/changelog.html (version 41041642078a1e498c4f8b6e6a5b226409b5dbcd)
- xmppserver/pom.xml (version 41041642078a1e498c4f8b6e6a5b226409b5dbcd)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java (version 41041642078a1e498c4f8b6e6a5b226409b5dbcd)
-
daryl herzmann <akrherz@iastate.edu> b8e7df59068b85070c25103bddf3b9ae759094b7
Merge pull request #1640 from guusdk/fmuc
OF-2030: Add support for FMUC -
Guus der Kinderen 8377c627e0d07590b6b0b51eb3de975bb4301887 m
OF-2030: Work around self-presence race-condition
A race condition can occur where 'occupantsByFullJID' does not yet (or no longer, in case of a 'leave') contain
the originator of the presence stanza. To work around this, the "self-presence" is sent after all other occupants
have been processed.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/BroadcastPresenceRequest.java (version 8377c627e0d07590b6b0b51eb3de975bb4301887)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 8377c627e0d07590b6b0b51eb3de975bb4301887)
-
Guus der Kinderen 3e701ce4bc204321dcd9f9f3f3a7988f2fd875a6 m
OF-2030: Send 'leave' presence before removing occupant from room, to allow leave presence to be echo'd back to the occupant that's leaving.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 3e701ce4bc204321dcd9f9f3f3a7988f2fd875a6)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java (version 3e701ce4bc204321dcd9f9f3f3a7988f2fd875a6)
-
Guus der Kinderen 522e93ff00fd57081ffc2ad6ce51e01b044a1c31 m
OF-2030: (FMUC) send room history after node joins FMUC set.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 522e93ff00fd57081ffc2ad6ce51e01b044a1c31)
-
Guus der Kinderen bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62 m
OF-2030: (FMUC) Two-way join direction, separation of concerns
Adding support for both inbound as well as outbound joins.
Separating concerns for FMUC handling from regular FMUC implementation.
Added implementation of processing of most (but not all) stanzas that are exchanged through FMUC.
This commit is the result of a few weeks of work and should probably have been split up in multiple distinct commits.- distribution/src/resources/log4j2.xml (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCMode.java (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCRegisterHandler.java (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRole.java (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/RemoteMUCRole.java (version bac3f2f08fc7e52eb1e5cb5f172edc3aea203a62)
-
Guus der Kinderen e6c4a603638832118ed3413388fcef0920f4a93a m
OF-2030: (FMUC) subject sync on join, lots of debug logging
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version e6c4a603638832118ed3413388fcef0920f4a93a)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version e6c4a603638832118ed3413388fcef0920f4a93a)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java (version e6c4a603638832118ed3413388fcef0920f4a93a)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version e6c4a603638832118ed3413388fcef0920f4a93a)
-
Guus der Kinderen 69ec27ee646d5027a42ecf6b89150b756af7e0d9 m
OF-2030: (FMUC) Fix detection of 'delay' element.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 69ec27ee646d5027a42ecf6b89150b756af7e0d9)
-
Guus der Kinderen 9d0e397a055038108a0c9ede799e6b660ee389ef m
OF-2030: (FMUC) introduce new admin panel page
- i18n/src/main/resources/openfire_i18n.properties (version 9d0e397a055038108a0c9ede799e6b660ee389ef)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 9d0e397a055038108a0c9ede799e6b660ee389ef)
- xmppserver/src/main/resources/admin-sidebar.xml (version 9d0e397a055038108a0c9ede799e6b660ee389ef)
- xmppserver/src/main/webapp/muc-room-edit-form.jsp (version 9d0e397a055038108a0c9ede799e6b660ee389ef)
- xmppserver/src/main/webapp/muc-room-federation.jsp (version 9d0e397a055038108a0c9ede799e6b660ee389ef)
-
Guus der Kinderen 3ae7eb9012f9895be16a324e70481a9ea743dbab m
OF-2030: (FMUC) fix addressing of stanzas arriving from other nodes.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 3ae7eb9012f9895be16a324e70481a9ea743dbab)
-
Guus der Kinderen 4d03dd5c89665e1b166eb2e88408fb51071575d5 m
OF-2030: Remove from config the verbose log level used during develoment.
- distribution/src/resources/log4j2.xml (version 4d03dd5c89665e1b166eb2e88408fb51071575d5)
-
Guus der Kinderen a25c929537254ec270576c28ba1c1c95493447b9 m
OF-2030: Make FMUC enabling/disabling a system property, dynamic, and its status displayed on the admin console page.
- i18n/src/main/resources/openfire_i18n.properties (version a25c929537254ec270576c28ba1c1c95493447b9)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version a25c929537254ec270576c28ba1c1c95493447b9)
- xmppserver/src/main/webapp/muc-room-federation.jsp (version a25c929537254ec270576c28ba1c1c95493447b9)
-
Guus der Kinderen 4cbb5a59703845b5c5732d1eecbf49c50d9cbb06 m
OF-2030: Fix javadoc
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 4cbb5a59703845b5c5732d1eecbf49c50d9cbb06)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 4cbb5a59703845b5c5732d1eecbf49c50d9cbb06)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java (version 4cbb5a59703845b5c5732d1eecbf49c50d9cbb06)
-
Guus der Kinderen 358e864c11cbcb889a2c4be4ddb2e22d5ec8c41e m
OF-2030: Disable FMUC by default
Use a normal property instead of a muc service property. A normal property can easily be modified in the admin console.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 358e864c11cbcb889a2c4be4ddb2e22d5ec8c41e)
-
Guus der Kinderen 9e4c08d25e58f3a411afc553cee00056a471af65 m
OF-2030: (FMUC) Make outbound joins configurable
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 9e4c08d25e58f3a411afc553cee00056a471af65)
- xmppserver/src/main/webapp/muc-room-edit-form.jsp (version 9e4c08d25e58f3a411afc553cee00056a471af65)
-
Guus der Kinderen 41510d2bec2c38fe9e0ce2a48518b6695b6fcfac m
OF-2030: (FMUC) Enhance admin console
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 41510d2bec2c38fe9e0ce2a48518b6695b6fcfac)
- xmppserver/src/main/webapp/muc-room-federation.jsp (version 41510d2bec2c38fe9e0ce2a48518b6695b6fcfac)
-
Guus der Kinderen fd08b031011caedddad0c37be2b742f8b2fb4692 m
OF-2030: Do not process FMUC if FMUC is disabled.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version fd08b031011caedddad0c37be2b742f8b2fb4692)
-
Guus der Kinderen 18ad82c0eef3e0f86308f81685d2285f397751cb m
OF-2030: Stop processing a join stanza after the stanza has been deemed invalid
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java (version 18ad82c0eef3e0f86308f81685d2285f397751cb)
-
Guus der Kinderen 1f8837f92ab81e238d8f84a08edc8c3ca98faa05 m
OF-2030: Allow FMUC configuration to be changed when join is in progress.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 1f8837f92ab81e238d8f84a08edc8c3ca98faa05)
-
Guus der Kinderen 4034831358c2a2cf6a15dede0ed79b8821de705e m
OF-2030: Show pending FMUC federation on admin console.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 4034831358c2a2cf6a15dede0ed79b8821de705e)
- xmppserver/src/main/webapp/muc-room-federation.jsp (version 4034831358c2a2cf6a15dede0ed79b8821de705e)
-
Guus der Kinderen 9b54bbca0093d1d94c27bf9432813516b079e0ad m
OF-2030: (FMUC) Improve scenario where occupants are leaving.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 9b54bbca0093d1d94c27bf9432813516b079e0ad)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 9b54bbca0093d1d94c27bf9432813516b079e0ad)
-
Guus der Kinderen 62d39c93f6d44baba291b7bf1bddcfa922295933 m
OF-2030: Allow FMUC sessions to be terminated from the admin console.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 62d39c93f6d44baba291b7bf1bddcfa922295933)
- xmppserver/src/main/webapp/muc-room-federation.jsp (version 62d39c93f6d44baba291b7bf1bddcfa922295933)
-
Guus der Kinderen 8776829815c7989623790841873d8df682bc7047 m
OF-2030: (FMUC) queue stanzas to be shared with FMUC while federation is in process of being set up.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 8776829815c7989623790841873d8df682bc7047)
-
Guus der Kinderen 146c5027a4cba80317f9e2884d57f0c04c416dc0 m
OF-2030: (FMUC) Basic support for stopping and starting FMUC independent directly (eg: not depending on user presence)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 146c5027a4cba80317f9e2884d57f0c04c416dc0)
-
Guus der Kinderen 8ceed8670cdc0b640f421c9dfeb3a72eb1bf2f9f m
OF-2030: (FMUC) reject federation request from a node we're configured to federate with.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 8ceed8670cdc0b640f421c9dfeb3a72eb1bf2f9f)
-
Guus der Kinderen 8304c94b0960e28017dc38fe9db1521b984fd40e m
OF-2030: (FMUC) Remove occupant only after the leave stanzas have been processed.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 8304c94b0960e28017dc38fe9db1521b984fd40e)
-
Guus der Kinderen e4e1aac100f8f8000cbf3180d39c92a5978ed784 m
OF-2030: Always show federated FMUC nodes, even if they have no occupants.
- xmppserver/src/main/webapp/muc-room-federation.jsp (version e4e1aac100f8f8000cbf3180d39c92a5978ed784)
-
Guus der Kinderen ce136a55a324559ea65c4d75145a604d5529a8e5 m
Refactoring of LocalMUCUser
Splitting up the large, complex methods in LocalMUCUser to have a better separation of responsibilities and more manageble code.
Added human readible text to most of the errors generated in this class.
Introduced the @Nullable and @Nonnull annotations to aid IDEs with problem detection.
Added lots of debug logging.
This commit should not have introduced significant functional changes.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java (version ce136a55a324559ea65c4d75145a604d5529a8e5)
-
Guus der Kinderen 428eac2876121e6dd2e2eb8a282a2b8640208e19 m
fixed typo in comment
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java (version 428eac2876121e6dd2e2eb8a282a2b8640208e19)
-
Guus der Kinderen 81e9add493e12278baffa2adce3fc63a79f9b2b3 m
OF-2030: (FMUC) process inbound join from joining node
This adds processing that processes a presence-stanza based join from a remote, joining FMUC node.
A basic MUC Service property (room.fmucEnabled) is used to reject or allow the FMUC join. Upon rejection, a proper error is returned. Allowing the join currently does not yet invoke any FMUC-specific functionality.
TODO: Make enabling FMUC support configurable per room (it's now a per service setting).- xmppserver/src/main/java/org/jivesoftware/openfire/muc/FMUCException.java (version 81e9add493e12278baffa2adce3fc63a79f9b2b3)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 81e9add493e12278baffa2adce3fc63a79f9b2b3)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 81e9add493e12278baffa2adce3fc63a79f9b2b3)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java (version 81e9add493e12278baffa2adce3fc63a79f9b2b3)
-
Guus der Kinderen 4ed229834513afd7c008261402528bfbad9f48a7 m
OF-2030: (FMUC) ensure fmuc element in outbound data
When fmuc data is sent from a local room to a joined room on a different domain, an 'fmuc' element including the 'from' address of original sender of the data should be present. This commit adds those.
TODO:
- As the data is parsed late in the stanza flow, the 'form' is deduced based on the nickname of the user that sent the stanza. This makes it impossible to determine what resource sent the data, when the user joined the chatroom with more than one device (using the same nickname). As a compromise, Openfire will use a bare JID (as opposed to a full JID) to populate the 'from' value in the 'fmuc' element. It is yet to be determined if this is an acceptable compromise (but for now, it allows for basic functionality).
- Determine how presence updates from users on joined FMUC nodes should be processed.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRole.java (version 4ed229834513afd7c008261402528bfbad9f48a7)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantAddedEvent.java (version 4ed229834513afd7c008261402528bfbad9f48a7)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRole.java (version 4ed229834513afd7c008261402528bfbad9f48a7)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 4ed229834513afd7c008261402528bfbad9f48a7)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/RemoteMUCRole.java (version 4ed229834513afd7c008261402528bfbad9f48a7)
-
Guus der Kinderen 4db169ca653e91fb0e8febbd1af6d7c2cc4267c8 m
Refactoring of LocalMUCRoom's 'joinRoom' method
Splitting up the large, complex method 'joinRoom' in LocalMUCRoom to have a better separation of responsibilities and more manageble code.
Added human readible text to most of the errors generated in this class.
Introduced the @Nullable and @Nonnull annotations to aid IDEs with problem detection.
Added lots of debug logging.
This commit should not have introduced significant functional changes.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 4db169ca653e91fb0e8febbd1af6d7c2cc4267c8)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 4db169ca653e91fb0e8febbd1af6d7c2cc4267c8)