Build: #2674 was successful
Job: Build was successful
Code commits
Openfire (master)
-
Guus der Kinderen f5415159181d7d068bff3cc227979913e72f3ac4
OF-2925: Have 'multi' providers for Groups
As are available for Users, UserProperties and Auth, this commit now introduces a Hybrid and Mapped provider for Groups.
With these providers, groups can be obtained from more than one external system.
This change is a prerequisite for OF-2923. As both issues were developed at the same time, some concepts related to both issues are applied to this commit. This foreshadows more, similar changes related to OF-2923.- i18n/src/main/resources/openfire_i18n.properties (version f5415159181d7d068bff3cc227979913e72f3ac4)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupMultiProvider.java (version f5415159181d7d068bff3cc227979913e72f3ac4)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupProviderMapper.java (version f5415159181d7d068bff3cc227979913e72f3ac4)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/HybridGroupProvider.java (version f5415159181d7d068bff3cc227979913e72f3ac4)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/MappedGroupProvider.java (version f5415159181d7d068bff3cc227979913e72f3ac4)
-
Guus der Kinderen 939bce84aaee3c83d5b149466c78b70e8b82c000
OF-2924: Reduce duplicated code in Auth multi-providers
This moves mostly duplicated code from HybridAuthProvider and MappedAuthProvider in a new, common superclass, AuthMultiProvider
Slight functional changes have been introduces, which intent to make behavior more consistent.- xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthMultiProvider.java (version 939bce84aaee3c83d5b149466c78b70e8b82c000)
- xmppserver/src/main/java/org/jivesoftware/openfire/auth/HybridAuthProvider.java (version 939bce84aaee3c83d5b149466c78b70e8b82c000)
- xmppserver/src/main/java/org/jivesoftware/openfire/auth/MappedAuthProvider.java (version 939bce84aaee3c83d5b149466c78b70e8b82c000)
-
Guus der Kinderen ded222e47eb6d2a1e023205c1701af1ee59d64f6
OF-2926: Implement LdapAuthProvider's documented cache config options
This commit fulfills the promise expressed in documentation, by adding the configuration options that are defined for the cache used by LdapAuthProvider.- i18n/src/main/resources/openfire_i18n.properties (version ded222e47eb6d2a1e023205c1701af1ee59d64f6)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthProvider.java (version ded222e47eb6d2a1e023205c1701af1ee59d64f6)
-
Guus der Kinderen a5a942fbd664a80f98aaf52071810b3fc2b2c4b0
OF-2923: Allow for more than one LDAP connection
This change replaces the singleton LDAP Manager (where LDAP connectivity information is stored) with a solution in which multiple, named, LDAP Managers can exist.
Having more than one LDAP configuration allows Openfire (through Mapped or Hybrid providers) to connect to more than one LDAP service. This can be used to combine data from multiple services.
The various Hybrid and Mapped providers that pre-exist have received modifications that allow them to configure providers with an additional string (which is used in the LDAP manager to differentiate between the configuration of different LDAP servers).- i18n/src/main/resources/openfire_i18n.properties (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/main/java/org/jivesoftware/openfire/admin/DefaultAdminProvider.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthMultiProvider.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/main/java/org/jivesoftware/openfire/auth/HybridAuthProvider.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthProvider.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapUserProvider.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/HybridUserProvider.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/UserMultiProvider.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/property/HybridUserPropertyProvider.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyMultiProvider.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
- xmppserver/src/test/java/org/jivesoftware/util/LDAPTest.java (version a5a942fbd664a80f98aaf52071810b3fc2b2c4b0)
-
Guus der Kinderen 3c0b2da7022de8e939a77cbe9488104f5de9def8
Reduce LDAP group log verbosity
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version 3c0b2da7022de8e939a77cbe9488104f5de9def8)
-
Guus der Kinderen 2d8344519f7bcf54413fa1885ce8a1840c65d892
OF-2928: Improve speed of 'multi' providers
Where possible, execute operations on providers in parallel.- xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthMultiProvider.java (version 2d8344519f7bcf54413fa1885ce8a1840c65d892)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/UserMultiProvider.java (version 2d8344519f7bcf54413fa1885ce8a1840c65d892)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyMultiProvider.java (version 2d8344519f7bcf54413fa1885ce8a1840c65d892)
-
Guus der Kinderen 3901fb7d5456015fc9d58db0e623b94a2ac2d899
doc: Integrating with more than one External Data Source
This adds documentation for the functionality introduced in OF-2923.- documentation/index.html (version 3901fb7d5456015fc9d58db0e623b94a2ac2d899)
- documentation/multi-providers.html (version 3901fb7d5456015fc9d58db0e623b94a2ac2d899)
- documentation/separating-admin-users-guide.html (version 3901fb7d5456015fc9d58db0e623b94a2ac2d899)
-
Guus der Kinderen fa4d8f9d05fd7f76e9d0490c131a6aa37017f5b9
OF-2924: Reduce duplicated code in User Property multi-providers
This moves mostly duplicated code from HybridUserPropertyProvider and MappedUserPropertyProvider in a new, common superclass, UserPropertyMultiProvider
Slight functional changes have been introduces, which intent to make behavior more consistent.- xmppserver/src/main/java/org/jivesoftware/openfire/user/property/HybridUserPropertyProvider.java (version fa4d8f9d05fd7f76e9d0490c131a6aa37017f5b9)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/property/MappedUserPropertyProvider.java (version fa4d8f9d05fd7f76e9d0490c131a6aa37017f5b9)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyMultiProvider.java (version fa4d8f9d05fd7f76e9d0490c131a6aa37017f5b9)
-
Guus der Kinderen 0de7f538e1bb266ae809d6a503c3ace1197a5e25
OF-2927: Allow LDAP alternateBaseDN to be configured during setup
This exposes a pre-existing LDAP property in the setup wizard.- xmppserver/src/main/webapp/setup/ldap-server.jspf (version 0de7f538e1bb266ae809d6a503c3ace1197a5e25)
- xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp (version 0de7f538e1bb266ae809d6a503c3ace1197a5e25)
-
Guus der Kinderen 981a08a8b51c757d6554c11e4cd65adf0d630fe0
OF-2924: Unit tests for 'multi' providers
This adds unit tests for most of the 'Hybrid' and 'Mapped' providers for User, UserProperty, Auth and Group.
One bigger issue introduced by the recent (as of yet unreleased) refactoring was identified through these tests, and was fixed in `HybridUserPropertyProvider`
Various smaller issues (mostly with throwing one type of exception while another was expected) have also been addressed by this.- xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthProvider.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/main/java/org/jivesoftware/openfire/auth/HybridAuthProvider.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/HybridGroupProvider.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/HybridUserProvider.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/property/HybridUserPropertyProvider.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyMultiProvider.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/auth/HybridAuthProviderTest.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/auth/MappedAuthProviderTest.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/auth/TestAuthProvider.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/auth/TestAuthProviderMapper.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/group/HybridGroupProviderTest.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/group/MappedGroupProviderTest.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/group/TestGroupProvider.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/group/TestGroupProviderMapper.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/user/HybridUserProviderTest.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/user/MappedUserProviderTest.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/user/TestUserProvider.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/user/TestUserProviderMapper.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/user/property/HybridUserPropertyProviderTest.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/user/property/MappedUserPropertyProviderTest.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/user/property/TestUserPropertyProvider.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
- xmppserver/src/test/java/org/jivesoftware/openfire/user/property/TestUserPropertyProviderMapper.java (version 981a08a8b51c757d6554c11e4cd65adf0d630fe0)
-
Guus der Kinderen a2d2f3b28659dd16a4cd27afb1a227a82d5a0f8a
OF-2924: Reduce duplicated code in User multi-providers
This moves mostly duplicated code from HybridUserProvider and MappedUserProvider in their common superclass, UserMultiProvider
Slight functional changes have been introduces, which intent to make behavior more consistent.- xmppserver/src/main/java/org/jivesoftware/openfire/user/HybridUserProvider.java (version a2d2f3b28659dd16a4cd27afb1a227a82d5a0f8a)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/MappedUserProvider.java (version a2d2f3b28659dd16a4cd27afb1a227a82d5a0f8a)
- xmppserver/src/main/java/org/jivesoftware/openfire/user/UserMultiProvider.java (version a2d2f3b28659dd16a4cd27afb1a227a82d5a0f8a)
-
Guus der Kinderen 16ab3f124d243ae8bf08b7a536f1ef9de998c04e
docs: fix typo in multi-providers guide
- documentation/multi-providers.html (version 16ab3f124d243ae8bf08b7a536f1ef9de998c04e)
-
Guus der Kinderen c311ae0b86d0691cf088a88f45b4cbdadc57821d
Applied (non-functional) changes in response to review feedback.
- documentation/multi-providers.html (version c311ae0b86d0691cf088a88f45b4cbdadc57821d)
- documentation/separating-admin-users-guide.html (version c311ae0b86d0691cf088a88f45b4cbdadc57821d)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupMultiProvider.java (version c311ae0b86d0691cf088a88f45b4cbdadc57821d)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupProvider.java (version c311ae0b86d0691cf088a88f45b4cbdadc57821d)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/HybridGroupProvider.java (version c311ae0b86d0691cf088a88f45b4cbdadc57821d)
-
Guus der Kinderen 3d7a960719801a7a0ef108dbb4f481c677fa7212
Improve LDAP documentation for having multiple hosts
The `ldap.host` property can be used to define hot standby hosts. The existing documentation hints at that, but isn't overly clear. This commit adds more explicit wording.- documentation/ldap-guide.html (version 3d7a960719801a7a0ef108dbb4f481c677fa7212)