Merge branch 'trunk' into branch-alerts-dev
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/05da121a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/05da121a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/05da121a Branch: refs/heads/trunk Commit: 05da121a58e5768d0d0eda2527bd127c7355a23a Parents: 1f1059c 813f16c Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Wed Sep 10 09:02:43 2014 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Wed Sep 10 09:02:43 2014 -0400 ---------------------------------------------------------------------- .../main/resources/ui/admin-web/app/index.html | 2 + .../resources/ui/admin-web/app/scripts/app.js | 1 + .../controllers/ambariViews/ViewsEditCtrl.js | 8 + .../clusters/ClustersManageAccessCtrl.js | 8 + .../controllers/groups/GroupsEditCtrl.js | 9 + .../scripts/controllers/users/UsersShowCtrl.js | 13 + .../app/scripts/directives/editableList.js | 199 ++++++++ .../ui/admin-web/app/scripts/services/Group.js | 6 + .../ui/admin-web/app/scripts/services/User.js | 7 + .../resources/ui/admin-web/app/styles/main.css | 212 +++++++- .../admin-web/app/views/ambariViews/edit.html | 29 +- .../app/views/clusters/manageAccess.html | 31 +- .../app/views/directives/editableList.html | 44 ++ .../ui/admin-web/app/views/groups/edit.html | 23 +- .../ui/admin-web/app/views/leftNavbar.html | 8 +- .../ui/admin-web/app/views/users/show.html | 22 +- .../src/main/resources/ui/admin-web/bower.json | 3 +- .../libraries/script/script.py | 23 +- ambari-server/conf/unix/ambari.properties | 3 + .../ambari/server/api/AmbariPersistFilter.java | 1 - .../stackadvisor/StackAdvisorHelper.java | 6 +- .../StackAdvisorRequestException.java | 27 + .../stackadvisor/StackAdvisorRunner.java | 34 +- .../commands/StackAdvisorCommand.java | 14 +- .../server/configuration/Configuration.java | 58 ++- .../server/controller/AmbariHandlerList.java | 43 +- .../controller/AmbariManagementController.java | 16 +- .../AmbariManagementControllerImpl.java | 34 +- .../ambari/server/controller/AmbariServer.java | 52 +- .../server/controller/ControllerModule.java | 69 ++- .../controller/FailsafeServletResponse.java | 22 +- .../internal/ControllerResourceProvider.java | 22 +- .../internal/PrivilegeResourceProvider.java | 6 +- .../RecommendationResourceProvider.java | 9 +- .../internal/ValidationResourceProvider.java | 9 +- .../internal/ViewInstanceResourceProvider.java | 44 +- .../ViewPermissionResourceProvider.java | 8 +- .../internal/ViewPrivilegeResourceProvider.java | 28 +- .../internal/ViewVersionResourceProvider.java | 6 +- .../apache/ambari/server/orm/dao/GroupDAO.java | 30 +- .../apache/ambari/server/orm/dao/MemberDAO.java | 34 +- .../ambari/server/orm/dao/PrincipalDAO.java | 27 +- .../ambari/server/orm/dao/PrincipalTypeDAO.java | 29 +- .../apache/ambari/server/orm/dao/UserDAO.java | 49 +- .../server/orm/entities/MemberEntity.java | 7 +- .../server/orm/entities/PrincipalEntity.java | 2 +- .../ambari/server/orm/entities/UserEntity.java | 5 +- .../ambari/server/orm/entities/ViewEntity.java | 9 + .../server/orm/entities/ViewInstanceEntity.java | 89 ++++ .../ambari/server/security/SecurityFilter.java | 2 +- .../AmbariAuthorizationFilter.java | 35 +- .../authorization/AmbariLdapDataPopulator.java | 409 --------------- .../server/security/authorization/User.java | 2 +- .../server/security/authorization/Users.java | 158 +++++- .../security/ldap/AmbariLdapDataPopulator.java | 430 ++++++++++++++++ .../server/security/ldap/LdapBatchDto.java | 67 +++ .../server/security/ldap/LdapGroupDto.java | 113 +++++ .../server/security/ldap/LdapSyncDto.java | 72 +++ .../server/security/ldap/LdapUserDto.java | 133 +++++ .../security/ldap/LdapUserGroupMemberDto.java | 82 +++ .../ambari/server/state/ConfigHelper.java | 3 +- .../apache/ambari/server/view/ViewRegistry.java | 4 + ambari-server/src/main/python/ambari-server.py | 6 +- .../src/main/resources/META-INF/persistence.xml | 4 + .../src/main/resources/scripts/stack_advisor.py | 8 +- .../1.3.2/hooks/before-START/scripts/params.py | 23 +- .../HDFS/package/scripts/hdfs_client.py | 6 + .../services/HDFS/package/scripts/params.py | 16 +- .../MAPREDUCE/configuration/mapred-env.xml | 20 + .../MAPREDUCE/package/scripts/client.py | 7 + .../MAPREDUCE/package/scripts/params.py | 13 + .../HDP/1.3.2/services/SQOOP/metainfo.xml | 2 +- .../stacks/HDP/1.3.2/services/stack_advisor.py | 19 +- .../2.0.6/services/HIVE/package/scripts/hcat.py | 2 +- .../2.0.6/services/HIVE/package/scripts/hive.py | 118 ++--- .../services/HIVE/package/scripts/params.py | 9 +- .../stacks/HDP/2.0.6/services/stack_advisor.py | 37 +- .../stacks/HDP/2.1/services/stack_advisor.py | 8 +- .../stacks/HDP/2.2.1/repos/repoinfo.xml | 4 +- .../stackadvisor/StackAdvisorRunnerTest.java | 44 +- .../commands/StackAdvisorCommandTest.java | 29 +- .../ViewInstanceResourceProviderTest.java | 123 +++++ .../ViewPermissionResourceProviderTest.java | 133 +++++ .../ViewPrivilegeResourceProviderTest.java | 8 +- .../server/orm/entities/ViewEntityTest.java | 17 + .../orm/entities/ViewInstanceEntityTest.java | 16 + .../AmbariLdapDataPopulatorTest.java | 261 ---------- .../ldap/AmbariLdapDataPopulatorTest.java | 202 ++++++++ .../security/ldap/LdapPerformanceTest.java | 94 ++++ .../ambari/server/view/ViewRegistryTest.java | 39 ++ .../stacks/1.3.2/HDFS/test_hdfs_client.py | 59 +++ .../1.3.2/MAPREDUCE/test_mapreduce_client.py | 36 +- .../python/stacks/1.3.2/configs/default.json | 10 +- .../stacks/2.0.6/HIVE/test_hive_client.py | 286 ++++++----- .../stacks/2.0.6/HIVE/test_hive_metastore.py | 413 +++++++-------- .../stacks/2.0.6/HIVE/test_hive_server.py | 504 ++++++++++--------- .../stacks/2.0.6/common/test_stack_advisor.py | 157 +++++- .../stacks/2.1/HIVE/test_hive_metastore.py | 304 +++++------ .../stacks/2.1/common/test_stack_advisor.py | 132 +++++ ambari-web/app/app.js | 3 +- ambari-web/app/assets/licenses/NOTICE.txt | 6 +- .../controllers/global/cluster_controller.js | 42 -- .../nameNode/step4_controller.js | 29 +- .../main/dashboard/config_history_controller.js | 6 +- ambari-web/app/controllers/main/host/details.js | 7 +- ambari-web/app/controllers/main/service/item.js | 6 +- .../service/manage_config_groups_controller.js | 15 +- .../app/controllers/main/views_controller.js | 4 +- .../app/controllers/wizard/step7_controller.js | 19 +- .../app/controllers/wizard/step8_controller.js | 6 +- ambari-web/app/messages.js | 1 + .../app/mixins/common/table_server_mixin.js | 3 - ambari-web/app/models/stack_service.js | 3 +- ambari-web/app/routes/main.js | 2 +- ambari-web/app/styles/application.less | 1 + .../common/configs/services_config.hbs | 2 + .../admin/highAvailability/nameNode/step4.hbs | 5 + .../views/main/dashboard/config_history_view.js | 11 +- ambari-web/app/views/main/menu.js | 48 +- ambari-web/app/views/main/views/details.js | 28 -- ambari-web/test/app_test.js | 39 +- .../main/admin/security/add/step1_test.js | 69 +-- .../main/admin/security/add/step4_test.js | 307 ++++++----- .../test/controllers/main/host/details_test.js | 9 +- .../jquery.iframe-auto-height.plugin.1.9.5.js | 224 --------- .../resources/ui/app/assets/data/apps/apps.json | 124 +++++ .../assets/data/resource/service_status.json | 107 ++++ .../app/controllers/slider_apps_controller.js | 136 ++++- .../src/main/resources/ui/app/helpers/ajax.js | 40 +- .../src/main/resources/ui/app/helpers/helper.js | 47 +- .../src/main/resources/ui/app/initialize.js | 4 +- .../ui/app/mappers/application_status.js | 79 ++- .../ui/app/mappers/slider_apps_mapper.js | 79 ++- .../main/resources/ui/app/models/slider_app.js | 5 + .../resources/ui/app/models/slider_app_alert.js | 172 +++++++ .../resources/ui/app/styles/application.less | 60 +++ .../ui/app/templates/slider_app/summary.hbs | 27 +- .../src/main/resources/ui/app/translations.js | 21 + .../ui/app/views/slider_app/summary_view.js | 20 +- .../slider/src/main/resources/ui/config.js | 1 + .../ui/vendor/scripts/common/jquery.timeago.js | 214 ++++++++ docs/pom.xml | 42 +- docs/src/site/site.xml | 70 +-- 143 files changed, 5748 insertions(+), 2514 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/05da121a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java ----------------------------------------------------------------------
