Build #489

Plan branch:

Code commits

Openfire (master)

  • Greg Thomas <greg.d.thomas@bt.com>

    Greg Thomas <greg.d.thomas@bt.com> e7740847e0270836e4f2901469ad93ef1a1dc502

    OF-1932: Ensure we use the correct password when running tests

    • xmppserver/src/main/webapp/setup/setup-ldap-group_test.jsp (version e7740847e0270836e4f2901469ad93ef1a1dc502)
    • xmppserver/src/main/webapp/setup/setup-ldap-user_test.jsp (version e7740847e0270836e4f2901469ad93ef1a1dc502)
  • Marcel Heckel <marcel.heckel@ivi.fraunhofer.de>

    Marcel Heckel <marcel.heckel@ivi.fraunhofer.de> 864ae177ee47f258d60fa694dcda97b3df35345d

    Added support for flatting nested groups.
    Nested / complex / hierarchic groups are flattened. This means: if
    group A is member of group B, the members of group A will also be
    members of group B.

    Cyclic paths are detected and followed only once.

    The features is disable by default.
    Set property "ldap.flattenNestedGroups" to "true" to enable it.

    • xmppserver/pom.xml (version 864ae177ee47f258d60fa694dcda97b3df35345d)
    • xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version 864ae177ee47f258d60fa694dcda97b3df35345d)
    • xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 864ae177ee47f258d60fa694dcda97b3df35345d)
    • xmppserver/src/main/java/org/jivesoftware/openfire/user/UserManager.java (version 864ae177ee47f258d60fa694dcda97b3df35345d)
    • xmppserver/src/test/java/org/jivesoftware/openfire/ldap/FlattenNestedGroupsTest.java (version 864ae177ee47f258d60fa694dcda97b3df35345d)
    • xmppserver/src/test/resources/org/jivesoftware/openfire/ldap/flattenNestedGroups.ldif (version 864ae177ee47f258d60fa694dcda97b3df35345d)