Prep for merge with master
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7ded3c80 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ded3c80 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ded3c80 Branch: refs/heads/ldapplugin Commit: 7ded3c803d6b979be09b807a2051720ee435159a Parents: fb7eb06 bdba0dd Author: Ian Duffy <[email protected]> Authored: Sat Aug 31 21:55:27 2013 +0100 Committer: Ian Duffy <[email protected]> Committed: Sat Aug 31 21:55:27 2013 +0100 ---------------------------------------------------------------------- .gitignore | 3 +- .../configuration/ConfigurationService.java | 8 - .../org/apache/cloudstack/api/ApiConstants.java | 11 - .../apache/cloudstack/api/LdapValidator.java | 5 + .../cloudstack/api/ResponseGenerator.java | 3 - .../api/command/admin/ldap/LDAPConfigCmd.java | 205 ----------- .../api/command/admin/ldap/LDAPRemoveCmd.java | 71 ---- .../api/response/LDAPConfigResponse.java | 105 ------ .../api/response/LDAPRemoveResponse.java | 26 -- .../classes/resources/messages.properties | 1 + client/tomcatconf/applicationContext.xml.in | 7 +- client/tomcatconf/commands.properties.in | 17 +- client/tomcatconf/componentContext.xml.in | 4 +- client/tomcatconf/nonossComponentContext.xml.in | 4 +- .../tomcatconf/simulatorComponentContext.xml.in | 4 +- docs/en-US/LDAP-for-user-authentication.xml | 31 +- .../example-activedirectory-configuration.xml | 4 +- docs/en-US/example-openldap-configuration.xml | 4 +- docs/en-US/images/add-ldap-configuration-ad.png | Bin 31803 -> 70112 bytes .../images/add-ldap-configuration-openldap.png | Bin 30176 -> 65270 bytes .../ratelimit/ApiRateLimitServiceImpl.java | 1 - plugins/user-authenticators/ldap/pom.xml | 119 +++++-- .../server/auth/LDAPUserAuthenticator.java | 174 ---------- .../api/command/LdapAddConfigurationCmd.java | 82 +++++ .../api/command/LdapCreateAccountCmd.java | 167 +++++++++ .../api/command/LdapDeleteConfigurationCmd.java | 78 +++++ .../api/command/LdapListConfigurationCmd.java | 110 ++++++ .../api/command/LdapListUsersCmd.java | 123 +++++++ .../api/command/LdapUserSearchCmd.java | 98 ++++++ .../api/response/LdapConfigurationResponse.java | 62 ++++ .../api/response/LdapUserResponse.java | 99 ++++++ .../cloudstack/ldap/LdapAuthenticator.java | 71 ++++ .../cloudstack/ldap/LdapConfiguration.java | 145 ++++++++ .../cloudstack/ldap/LdapConfigurationVO.java | 66 ++++ .../cloudstack/ldap/LdapContextFactory.java | 136 ++++++++ .../org/apache/cloudstack/ldap/LdapManager.java | 57 ++++ .../apache/cloudstack/ldap/LdapManagerImpl.java | 232 +++++++++++++ .../org/apache/cloudstack/ldap/LdapUser.java | 77 +++++ .../apache/cloudstack/ldap/LdapUserManager.java | 140 ++++++++ .../org/apache/cloudstack/ldap/LdapUtils.java | 62 ++++ .../ldap/NoLdapUserMatchingQueryException.java | 32 ++ .../ldap/NoSuchLdapUserException.java | 31 ++ .../ldap/dao/LdapConfigurationDao.java | 32 ++ .../ldap/dao/LdapConfigurationDaoImpl.java | 72 ++++ .../ldap/BasicNamingEnumerationImpl.groovy | 56 ++++ .../ldap/LdapAddConfigurationCmdSpec.groovy | 89 +++++ .../ldap/LdapAuthenticatorSpec.groovy | 99 ++++++ .../ldap/LdapConfigurationDaoImplSpec.groovy | 29 ++ .../ldap/LdapConfigurationResponseSpec.groovy | 49 +++ .../ldap/LdapConfigurationSpec.groovy | 223 ++++++++++++ .../ldap/LdapConfigurationVOSpec.groovy | 36 ++ .../ldap/LdapContextFactorySpec.groovy | 127 +++++++ .../ldap/LdapCreateAccountCmdSpec.groovy | 155 +++++++++ .../ldap/LdapDeleteConfigurationCmdSpec.groovy | 68 ++++ .../ldap/LdapListConfigurationCmdSpec.groovy | 98 ++++++ .../cloudstack/ldap/LdapListUsersCmdSpec.groovy | 123 +++++++ .../cloudstack/ldap/LdapManagerImplSpec.groovy | 336 +++++++++++++++++++ .../ldap/LdapSearchUserCmdSpec.groovy | 72 ++++ .../cloudstack/ldap/LdapUserManagerSpec.groovy | 206 ++++++++++++ .../cloudstack/ldap/LdapUserResponseSpec.groovy | 67 ++++ .../apache/cloudstack/ldap/LdapUserSpec.groovy | 101 ++++++ .../apache/cloudstack/ldap/LdapUtilsSpec.groovy | 68 ++++ .../NoLdapUserMatchingQueryExceptionSpec.groovy | 30 ++ .../ldap/NoSuchLdapUserExceptionSpec.groovy | 30 ++ .../ldap/test/resources/cloudstack.org.ldif | 295 ++++++++++++++++ server/src/com/cloud/api/ApiResponseHelper.java | 15 - server/src/com/cloud/configuration/Config.java | 19 +- .../configuration/ConfigurationManagerImpl.java | 172 ---------- .../com/cloud/server/ManagementServerImpl.java | 4 - .../cloud/vpc/MockConfigurationManagerImpl.java | 31 +- setup/db/db/schema-410to420.sql | 20 ++ test/integration/component/test_ldap.py | 287 +++++----------- tools/apidoc/gen_toc.py | 2 +- ui/css/cloudstack3.css | 97 +++++- ui/dictionary.jsp | 3 +- ui/index.jsp | 61 +++- ui/scripts/accounts.js | 307 ++++------------- ui/scripts/accountsWizard.js | 288 ++++++++++++++++ ui/scripts/globalSettings.js | 145 +------- ui/scripts/sharedFunctions.js | 18 +- ui/scripts/ui-custom/accountsWizard.js | 169 ++++++++++ 81 files changed, 5306 insertions(+), 1468 deletions(-) ----------------------------------------------------------------------
