Code commits
Openfire (master)
-
daryl herzmann <akrherz@iastate.edu> 58229569e25a505b152df0340f64b1470bec7522
Merge pull request #1141 from GregDThomas/OF-1479
OF-1479: Show the number of cache culls in the last three hours -
GregDThomas <greg.d.thomas@gmail.com> a6515649f0c8ba1877f2661c7606be24f1dfef64
OF-1479: Show the number of cache culls in the last 3/6/12 hours
- i18n/src/main/resources/openfire_i18n_en.properties (version a6515649f0c8ba1877f2661c7606be24f1dfef64)
- src/java/org/jivesoftware/util/StringUtils.java (version a6515649f0c8ba1877f2661c7606be24f1dfef64)
- src/java/org/jivesoftware/util/cache/DefaultCache.java (version a6515649f0c8ba1877f2661c7606be24f1dfef64)
- src/web/system-cache.jsp (version a6515649f0c8ba1877f2661c7606be24f1dfef64)
-
daryl herzmann <akrherz@iastate.edu> 4deeab0a371c7c06dd76c7244045013807b73244
Merge pull request #1136 from guusdk/OF-1592_VCard-read-only-verbosity
OF-1592: Be less verbose when VCard updates fail expectedly. -
Guus der Kinderen 0b383f2ff1cfe49886a5186b1e08ee1226957003
OF-1592: Be less verbose when VCard updates fail expectedly.
When the VCard provider is read-only, there's no need to log a VCard update attempt
to the 'error' level. This commit reduces the log verbosity, and improves the error
sent back to the client.- i18n/src/main/resources/openfire_i18n_en.properties (version 0b383f2ff1cfe49886a5186b1e08ee1226957003)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 0b383f2ff1cfe49886a5186b1e08ee1226957003)
- src/java/org/jivesoftware/openfire/handler/IQvCardHandler.java (version 0b383f2ff1cfe49886a5186b1e08ee1226957003)
-
Guus der Kinderen 061f5a086af7b4e598443eebe1e9cdc3682ba9b2
OF-1592: Don't echo back potentially binary data in VCard error.
- src/java/org/jivesoftware/openfire/handler/IQvCardHandler.java (version 061f5a086af7b4e598443eebe1e9cdc3682ba9b2)
-
daryl herzmann <akrherz@iastate.edu> 6217ac97f38b5864d8fc3899cbdca4437520a4be
Merge pull request #1143 from guusdk/OF-1491_Set-monitor-interval
OF-1491: Instruct log4j2 to re-read logfile periodically. -
Guus der Kinderen f8ebe94c6db59a7a007fdb73b8eeb130e84732d8
OF-1491: Instruct log4j2 to re-read logfile periodically.
- starter/src/main/resources/log4j2.xml (version f8ebe94c6db59a7a007fdb73b8eeb130e84732d8)
-
daryl herzmann <akrherz@iastate.edu> 46232180c7b5c167890f4c84c9d268de9122961c
Merge pull request #1147 from GregDThomas/OF-546-starter-module
OF-546: Move the source for "startup.jar" in to the starter module file system tree -
akrherz <akrherz@iastate.edu> d56a44b629a92961de7f4df64dead97d9aa86571
bump externalservicediscovery version to 1.0.2-SNAPSHOT as per #1144
- src/plugins/externalservicediscovery/pom.xml (version d56a44b629a92961de7f4df64dead97d9aa86571)
-
daryl herzmann <akrherz@iastate.edu> de98cb77c8862125ac4e1c3b85f4d32ecd2f548d
Merge pull request #1144 from guusdk/OF-1595_ExtServiceDisco_adminconsole-udp-bug
OF-1595 ext service disco adminconsole udp bug -
daryl herzmann <akrherz@iastate.edu> 84e34460df4159d7133490f3d9e8437a4f499af4
Merge pull request #1149 from GregDThomas/OF-546-tld-module
OF-546: Move the source for the various JSP tags to webadmintld -
daryl herzmann <akrherz@iastate.edu> 98be49fd963a55d3ddfb370b92a31f702ad8d991
Merge pull request #1150 from GregDThomas/admin-header-psd
Remove unused, legacy file -
GregDThomas <greg.d.thomas@gmail.com> 3b96f7d262f1419f37e5de4350673a45e8626e4b
Remove unused, legacy file
- src/resources/images-dev/admin-header.psd (version 3b96f7d262f1419f37e5de4350673a45e8626e4b)
-
GregDThomas <greg.d.thomas@gmail.com> e784596385024695e989b72afb40e3c189477fed
OF-546: Move the source for the various JSP tags to the webadmintld module
- webadmintld/pom.xml (version e784596385024695e989b72afb40e3c189477fed)
- webadmintld/src/main/java/org/jivesoftware/admin/ASN1DERTag.java (version e784596385024695e989b72afb40e3c189477fed)
- webadmintld/src/main/java/org/jivesoftware/admin/JSTLFunctions.java (version e784596385024695e989b72afb40e3c189477fed)
- webadmintld/src/main/java/org/jivesoftware/admin/SidebarTag.java (version e784596385024695e989b72afb40e3c189477fed)
- webadmintld/src/main/java/org/jivesoftware/admin/SubSidebarTag.java (version e784596385024695e989b72afb40e3c189477fed)
- webadmintld/src/main/java/org/jivesoftware/admin/SubnavTag.java (version e784596385024695e989b72afb40e3c189477fed)
- webadmintld/src/main/java/org/jivesoftware/admin/TabsTag.java (version e784596385024695e989b72afb40e3c189477fed)
-
daryl herzmann <akrherz@iastate.edu> f3cf4f4324b9c3cfaf37d2086c99bb1960860c17
Merge pull request #1148 from GregDThomas/OF-546-i18n-module
OF-546: Move the source for i18n to the i18n project tree -
daryl herzmann <akrherz@iastate.edu> 177d555f2d25257869965a246a0e8c281ad7428e
Merge pull request #1134 from akrherz/murbuildfixes
WIP: rollup of some more build refinements -
GregDThomas <greg.d.thomas@gmail.com> 88390751383d39a9493aaf7cbcb1985c1ae35034
OF-546: Move the source for i18n to the i18n project tree
- i18n/pom.xml (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_cs_CZ.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_de.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_en.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_es.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_fr.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_ja_JP.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_pl_PL.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_pt_BR.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_pt_PT.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_ru_RU.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_sk.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
- i18n/src/main/resources/openfire_i18n_zh_CN.properties (version 88390751383d39a9493aaf7cbcb1985c1ae35034)
-
GregDThomas <greg.d.thomas@gmail.com> 43dfb65d7251ea34e21ed23c6093b5d0bf98325d
OF-546: Move the source for "starter.jar" to the starter project tree
- starter/libs/README.txt (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- starter/libs/i4jruntime.jar (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- starter/pom.xml (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- starter/src/main/java/org/jivesoftware/openfire/launcher/DroppableFrame.java (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- starter/src/main/java/org/jivesoftware/openfire/launcher/DroppableTextPane.java (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- starter/src/main/java/org/jivesoftware/openfire/launcher/GraphicUtils.java (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- starter/src/main/java/org/jivesoftware/openfire/launcher/Launcher.java (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- starter/src/main/java/org/jivesoftware/openfire/launcher/Uninstaller.java (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- starter/src/main/java/org/jivesoftware/openfire/launcher/package-info.java (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- starter/src/main/java/org/jivesoftware/openfire/starter/JiveClassLoader.java (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- starter/src/main/java/org/jivesoftware/openfire/starter/ServerStarter.java (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- starter/src/main/resources/log4j2.xml (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
- xmppserver/pom.xml (version 43dfb65d7251ea34e21ed23c6093b5d0bf98325d)
-
Roman Soldatow <Redor@users.noreply.github.com> c8e682ae4225f239f83c960d50bf90571ba86e39
Merge pull request #1145 from dbh/REST-ChatHistory-NPE-On-RoomNotFound
Safety checks around MUC Room Get ChatHistory. Return 404 if room do… -
dharrison <dharrison@psionline.com> 9bd910981a684143516c4048dd78354b54a36a3a
Safety checks around MUC Room Get ChatHistory. Return 404 if room does not exist. Check for null and empty string props on a message.
- src/plugins/restAPI/changelog.html (version 9bd910981a684143516c4048dd78354b54a36a3a)
- src/plugins/restAPI/plugin.xml (version 9bd910981a684143516c4048dd78354b54a36a3a)
- src/plugins/restAPI/pom.xml (version 9bd910981a684143516c4048dd78354b54a36a3a)
- src/plugins/restAPI/src/java/org/jivesoftware/openfire/plugin/rest/controller/MUCRoomController.java (version 9bd910981a684143516c4048dd78354b54a36a3a)
- src/plugins/restAPI/src/java/org/jivesoftware/openfire/plugin/rest/service/MUCRoomService.java (version 9bd910981a684143516c4048dd78354b54a36a3a)
-
Guus der Kinderen 5e8ee18e19de1454c24c7d401ae299fac9d6884d
Denote release 1.0.1 of the External Service Discovery plugin.
- src/plugins/externalservicediscovery/changelog.html (version 5e8ee18e19de1454c24c7d401ae299fac9d6884d)
- src/plugins/externalservicediscovery/plugin.xml (version 5e8ee18e19de1454c24c7d401ae299fac9d6884d)
- src/plugins/externalservicediscovery/pom.xml (version 5e8ee18e19de1454c24c7d401ae299fac9d6884d)
-
Guus der Kinderen 56f58c888fd6c20e23103a97a764e8ed60d381f1
OF-1595: External Service Discovery plugin, admin console fix for transport type.
- src/plugins/externalservicediscovery/changelog.html (version 56f58c888fd6c20e23103a97a764e8ed60d381f1)
- src/plugins/externalservicediscovery/src/web/external-service-discovery-config.jsp (version 56f58c888fd6c20e23103a97a764e8ed60d381f1)
-
daryl herzmann <akrherz@iastate.edu> 1e6b2e5d8eb040f90d4d083d6cd4617ace9055fc
Merge pull request #1142 from Redor/master
REST API Plugin update to 1.3.6 -
Roman S. <r.soldatow@gmail.com> 61a58a7661c4bf865a33326395b47cff2fa96501
REST API Plugin update to 1.3.6
Fixed: Important security issue, that allowed to use REST API without
authentication- src/plugins/restAPI/changelog.html (version 61a58a7661c4bf865a33326395b47cff2fa96501)
- src/plugins/restAPI/plugin.xml (version 61a58a7661c4bf865a33326395b47cff2fa96501)
- src/plugins/restAPI/pom.xml (version 61a58a7661c4bf865a33326395b47cff2fa96501)
- src/plugins/restAPI/src/java/org/jivesoftware/openfire/plugin/rest/service/JerseyWrapper.java (version 61a58a7661c4bf865a33326395b47cff2fa96501)
-
Gugli <code@gugli.me> c3ce228d641e1fdfe8255f8b7839c98a383c8267
First attempt to standardize the String-intern-as-a-mutex hack. For now, only applies to usernames.
It fixes some deadlocks between PrivacyListManager and RosterManager.
It is related to the two following issues
https://issues.igniterealtime.org/browse/OF-1337
https://issues.igniterealtime.org/browse/OF-944- src/java/org/jivesoftware/openfire/group/GroupManager.java (version c3ce228d641e1fdfe8255f8b7839c98a383c8267)
- src/java/org/jivesoftware/openfire/lockout/LockOutManager.java (version c3ce228d641e1fdfe8255f8b7839c98a383c8267)
- src/java/org/jivesoftware/openfire/privacy/PrivacyListManager.java (version c3ce228d641e1fdfe8255f8b7839c98a383c8267)
- src/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java (version c3ce228d641e1fdfe8255f8b7839c98a383c8267)
- src/java/org/jivesoftware/openfire/roster/RosterManager.java (version c3ce228d641e1fdfe8255f8b7839c98a383c8267)
- src/java/org/jivesoftware/openfire/user/UserManager.java (version c3ce228d641e1fdfe8255f8b7839c98a383c8267)
- src/java/org/jivesoftware/openfire/vcard/DefaultVCardProvider.java (version c3ce228d641e1fdfe8255f8b7839c98a383c8267)
-
wroot <wrooot@users.noreply.github.com> ba521348e55092c782f1a2a5b0f5dd366f01884d
OF-1593 mention MAM in readme
- src/plugins/monitoring/readme.html (version ba521348e55092c782f1a2a5b0f5dd366f01884d)
-
akrherz <akrherz@iastate.edu> 218a1c5b66e27ab0b371b4cf004f44b1e361d371 m
OF-1532 keep rpmbuild stuff in source dir, not $HOME
- .gitignore (version 218a1c5b66e27ab0b371b4cf004f44b1e361d371)
- build/rpm/build_rpms.sh (version 218a1c5b66e27ab0b371b4cf004f44b1e361d371)
-
Dave Cridland <dave@cridland.net> 40ba5b2fe612244f51bdec4f13165bf15e24f4f8 m
Alter Debian package script for TeamCity
Also remove ant as a build dependency.- build/debian/build_debs.sh (version 40ba5b2fe612244f51bdec4f13165bf15e24f4f8)
- build/debian/control (version 40ba5b2fe612244f51bdec4f13165bf15e24f4f8)