Code commits
Openfire (master)
-
daryl herzmann <akrherz@iastate.edu> 7e6f6d55883ddf5d9cb9f77647ee9341d4e99f1e
Merge pull request #1848 from guusdk/loginlimitmanagertest
Using unique values to prevent inter-test interference -
Guus der Kinderen 6defa12ad2286ae5da15223ae036ab27d1bd6e2d
Using unique values to prevent inter-test interference
By using different values for username and address, there's less of a chance of individual tests affecting the others (like what we've seen happen in Github Actions).- xmppserver/src/test/java/org/jivesoftware/admin/LoginLimitManagerTest.java (version 6defa12ad2286ae5da15223ae036ab27d1bd6e2d)
-
daryl herzmann <akrherz@iastate.edu> 5719a411aab197d2ddef3568528db61775f9312b
Merge pull request #1847 from akrherz/ubuntu
use older ubuntu for connectivity tests -
akrherz <akrherz@iastate.edu> a6ecbdab81f1aae7d1c8359239ca28acfef916e3
revert previous sleep increase to 10 from 2
- runConnectivityIntegrationTests (version a6ecbdab81f1aae7d1c8359239ca28acfef916e3)
-
akrherz <akrherz@iastate.edu> 89a1232b4d77af3c1f0a0feffffbf9030abbb97f
use older ubuntu for connectivity tests
- .github/workflows/continuous-integration-workflow.yml (version 89a1232b4d77af3c1f0a0feffffbf9030abbb97f)
-
Guus der Kinderen 64941251162c841160a47c3deb638b2499db58dc
Remove AIOXMPP retries, as they're expected to fail anyways.
- .github/workflows/continuous-integration-workflow.yml (version 64941251162c841160a47c3deb638b2499db58dc)
-
Guus der Kinderen 13882e66c09f30561419de7fbb853f7b22cb0686
Bump up verbosity of Openfire logging
- distribution/src/resources/log4j2.xml (version 13882e66c09f30561419de7fbb853f7b22cb0686)
-
Guus der Kinderen 3423c386ea52b9b3499ed9fa43ffb4ffcc786e34
Expose Openfire Logs when running aioxmpop tests in Github Actions
- .github/workflows/continuous-integration-workflow.yml (version 3423c386ea52b9b3499ed9fa43ffb4ffcc786e34)
-
Hamza Öztürk <hamza.ozturk@busoft.com.tr> 80b29eef6fbfdfe8daeb9333ca0c2b5ea1c90dc0
Consider using OfflineMessage instead of Message in OfflineMessageListener
- xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageListener.java (version 80b29eef6fbfdfe8daeb9333ca0c2b5ea1c90dc0)
- xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStore.java (version 80b29eef6fbfdfe8daeb9333ca0c2b5ea1c90dc0)
- xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStrategy.java (version 80b29eef6fbfdfe8daeb9333ca0c2b5ea1c90dc0)
-
Hamza Öztürk <hamza.ozturk@busoft.com.tr> 238886be2d679869fd1f209d3e8e8a501ec948ea
Do not store offline messages that are already stored
- xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStore.java (version 238886be2d679869fd1f209d3e8e8a501ec948ea)
-
Guus der Kinderen b99fec88619f3a818ed15cc1a5d439b5e608b09e
OF-2265: Websocket delivery should not depend on XmppSession being present
Although normally, an XmppSession will be available, that won't be the case when, for example, sending an error about the XmppSession not being available.
Not doing packet accounting (and resetting an idle time) is preferable to not delivering the message due to a NullPointerException.- xmppserver/src/main/java/org/jivesoftware/openfire/websocket/XmppWebSocket.java (version b99fec88619f3a818ed15cc1a5d439b5e608b09e)
-
Guus der Kinderen d75714104831c89afef4f07de5398816d8f2ae94
OF-2259: Allow pre-load of MUC rooms to be configurable
Up until this commit, Openfire would always, when it started, load in memory all MUC rooms for which activity was recorded in the last X days. On instances with large amounts of rooms, this leads to a significant delay in boot time.
This commit makes this pre-loading behavior configurable. The amount of days can be configured (independently from the 'cleanup' duration, which it was previously tied to) but the behavior can also be disabled completely.- i18n/src/main/resources/openfire_i18n.properties (version d75714104831c89afef4f07de5398816d8f2ae94)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version d75714104831c89afef4f07de5398816d8f2ae94)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version d75714104831c89afef4f07de5398816d8f2ae94)
- xmppserver/src/main/webapp/muc-service-edit-form.jsp (version d75714104831c89afef4f07de5398816d8f2ae94)
-
Guus der Kinderen 7ef18b36316cb7a7a6dd9356c15e1c2f49882fbf
OF-2259: Re-use XML parser when loading messages from database.
When profiling Openfire that was starting up from a database that contained a lot of MUC rooms with a lot of messages (ofMucConversationLog), a hotspot was identified in the code that parses the database content into XMPP messages. The parser that is used was recreated for every message, which added considerable overhead.
This commit ensures that the parser that parses database content into messages (as used during the initial load at boot-time) is re-used.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java (version 7ef18b36316cb7a7a6dd9356c15e1c2f49882fbf)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version 7ef18b36316cb7a7a6dd9356c15e1c2f49882fbf)
-
Guus der Kinderen 5a594c4f7a425e70ee485e91a663af04628f335e
OF-2263: Use ListPager in MUC summary admin page
This prevents the page from listing every page number, when there are many pages.
Instead of listing every page number between `1` and `35781` (taking up a considerable amount of space on the page), the page now shows what will be a single line in most browsers:
Pages: [ 1 2 3 ... 5779 5780 5781 5782 5783 ... 35779 35780 35781 ]- xmppserver/src/main/webapp/muc-room-summary.jsp (version 5a594c4f7a425e70ee485e91a663af04628f335e)
-
Guus der Kinderen 542ff32df46a1328c26d23ccb35d0551517580a9
OF-2262: Take unloaded rooms into account
Openfire can unload rooms that are inactive from memory. Those rooms remain valid, and will be loaded on-demand.
This commit ensures that these rooms are:
- listed on the admin console
- shown in search results
- are added to room counts- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatService.java (version 542ff32df46a1328c26d23ccb35d0551517580a9)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/GetNewMemberRoomsRequest.java (version 542ff32df46a1328c26d23ccb35d0551517580a9)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceInfo.java (version 542ff32df46a1328c26d23ccb35d0551517580a9)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 542ff32df46a1328c26d23ccb35d0551517580a9)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCSearchHandler.java (version 542ff32df46a1328c26d23ccb35d0551517580a9)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMuclumbusSearchHandler.java (version 542ff32df46a1328c26d23ccb35d0551517580a9)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version 542ff32df46a1328c26d23ccb35d0551517580a9)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version 542ff32df46a1328c26d23ccb35d0551517580a9)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCRoomSearchInfo.java (version 542ff32df46a1328c26d23ccb35d0551517580a9)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 542ff32df46a1328c26d23ccb35d0551517580a9)
- xmppserver/src/main/webapp/muc-room-summary.jsp (version 542ff32df46a1328c26d23ccb35d0551517580a9)
- xmppserver/src/main/webapp/muc-service-delete.jsp (version 542ff32df46a1328c26d23ccb35d0551517580a9)
-
Guus der Kinderen 9f1b42d9de5cac51998a4ee7855c0ee07bd6ffeb
OF-2261: Re-word MUC room memory management
The admin console used wording that suggested that MUC rooms were destroyed after a certain amount of inactivity. That's misleading, as they're only
unloaded from memory. This commit re-organizes the corresponding admin console page, and improves wording.- i18n/src/main/resources/openfire_i18n.properties (version 9f1b42d9de5cac51998a4ee7855c0ee07bd6ffeb)
- xmppserver/src/main/webapp/muc-service-edit-form.jsp (version 9f1b42d9de5cac51998a4ee7855c0ee07bd6ffeb)
-
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 8ba15d4d917107818076286baf00293127d3aab0
Bump commons-io from 2.6 to 2.7 in /xmppserver
Bumps commons-io from 2.6 to 2.7.
Signed-off-by: dependabot[bot] <support@github.com>- xmppserver/pom.xml (version 8ba15d4d917107818076286baf00293127d3aab0)