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/52d1af76 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/52d1af76 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/52d1af76 Branch: refs/heads/branch-alerts-dev Commit: 52d1af7634e4a13ea4f9b94e34a1734c2bcd416c Parents: 76fc94e 869b00c Author: Jonathan Hurley <[email protected]> Authored: Thu Aug 28 13:49:15 2014 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Thu Aug 28 13:49:15 2014 -0400 ---------------------------------------------------------------------- .../resource_management/TestPackageResource.py | 6 +- .../core/providers/package/apt.py | 11 +- .../libraries/script/script.py | 9 +- ambari-server/pom.xml | 22 ++ .../ambari/server/api/query/QueryImpl.java | 1 - .../resources/ResourceInstanceFactoryImpl.java | 4 + ...ackLevelConfigurationResourceDefinition.java | 53 +++ .../StackVersionResourceDefinition.java | 1 + .../server/api/services/AmbariMetaInfo.java | 34 +- .../server/api/services/StacksService.java | 35 +- .../server/api/util/StackExtensionHelper.java | 105 ++++-- .../controller/AmbariManagementController.java | 8 + .../AmbariManagementControllerImpl.java | 44 +++ .../StackLevelConfigurationRequest.java | 42 +++ .../StackLevelConfigurationResponse.java | 37 +++ .../server/controller/StackVersionResponse.java | 14 +- .../AbstractControllerResourceProvider.java | 2 + ...StackLevelConfigurationResourceProvider.java | 159 +++++++++ .../internal/StackVersionResourceProvider.java | 6 + .../ambari/server/controller/spi/Resource.java | 4 +- .../apache/ambari/server/state/ServiceInfo.java | 1 + .../apache/ambari/server/state/StackInfo.java | 26 +- .../ambari/server/view/ViewContextImpl.java | 9 + .../apache/ambari/server/view/ViewRegistry.java | 30 +- .../main/resources/custom_actions/check_host.py | 2 +- .../src/main/resources/key_properties.json | 5 + .../src/main/resources/properties.json | 11 + .../src/main/resources/scripts/stack_advisor.py | 2 +- .../HDP/1.3.2/configuration/cluster-env.xml | 49 +++ .../1.3.2/hooks/before-START/scripts/params.py | 4 +- .../HDP/1.3.2/services/HBASE/metainfo.xml | 2 +- .../stacks/HDP/1.3.2/services/HDFS/metainfo.xml | 4 +- .../HIVE/package/scripts/hive_service.py | 2 +- .../HDP/1.3.2/services/MAPREDUCE/metainfo.xml | 9 +- .../OOZIE/package/scripts/oozie_service.py | 2 +- .../stacks/HDP/1.3.2/services/PIG/metainfo.xml | 2 +- .../HDP/1.3.2/services/ZOOKEEPER/metainfo.xml | 2 +- .../stacks/HDP/1.3.2/services/stack_advisor.py | 4 +- .../HDP/2.0.6/configuration/cluster-env.xml | 49 +++ .../HDP/2.0.6/services/HBASE/metainfo.xml | 2 +- .../stacks/HDP/2.0.6/services/HDFS/metainfo.xml | 4 +- .../HIVE/package/scripts/hive_service.py | 2 +- .../OOZIE/package/scripts/oozie_service.py | 2 +- .../stacks/HDP/2.0.6/services/PIG/metainfo.xml | 10 +- .../stacks/HDP/2.0.6/services/YARN/metainfo.xml | 4 +- .../HDP/2.0.6/services/ZOOKEEPER/metainfo.xml | 2 +- .../stacks/HDP/2.0.6/services/stack_advisor.py | 60 ++-- .../services/FALCON/configuration/global.xml | 63 ---- .../2.1.GlusterFS/services/FALCON/metainfo.xml | 19 +- .../GLUSTERFS/configuration/core-site.xml | 169 ---------- .../services/GLUSTERFS/configuration/global.xml | 59 ---- .../services/GLUSTERFS/metainfo.xml | 1 + .../services/STORM/configuration/global.xml | 39 --- .../2.1.GlusterFS/services/STORM/metainfo.xml | 1 + .../services/TEZ/configuration/global.xml | 29 -- .../HDP/2.1.GlusterFS/services/TEZ/metainfo.xml | 22 +- .../stacks/HDP/2.1/services/FALCON/metainfo.xml | 10 + .../stacks/HDP/2.1/services/stack_advisor.py | 14 +- .../main/resources/stacks/HDP/stack_advisor.py | 37 --- .../src/main/resources/stacks/stack_advisor.py | 37 +++ .../ambari/server/api/query/QueryImplTest.java | 2 +- .../server/api/services/AmbariMetaInfoTest.java | 4 +- .../api/util/StackExtensionHelperTest.java | 23 +- .../AmbariManagementControllerTest.java | 2 +- .../internal/AbstractResourceProviderTest.java | 45 +++ ...kLevelConfigurationResourceProviderTest.java | 181 +++++++++++ .../ambari/server/view/ViewRegistryTest.java | 50 +++ ambari-server/src/test/python/TestCheckHost.py | 2 +- .../src/test/python/TestResourceFilesKeeper.py | 2 +- .../src/test/python/TestStackAdvisor.py | 93 ++++++ .../stacks/1.3.2/HIVE/test_hive_metastore.py | 4 +- .../stacks/1.3.2/HIVE/test_hive_server.py | 4 +- .../hooks/before-START/test_before_start.py | 2 +- .../stacks/2.0.6/HDFS/test_hdfs_client.py | 4 + .../stacks/2.0.6/HIVE/test_hive_metastore.py | 4 +- .../stacks/2.0.6/HIVE/test_hive_server.py | 4 +- .../stacks/2.0.6/common/test_stack_advisor.py | 38 ++- .../python/stacks/2.0.6/configs/default.json | 2 +- .../stacks/2.1/HIVE/test_hive_metastore.py | 4 +- .../HIVE/package/scripts/hive_service.py | 2 +- .../stacks/XYZ/1.0.0/services/stack_advisor.py | 67 ++++ .../stacks/XYZ/1.0.1/services/stack_advisor.py | 30 ++ .../org/apache/ambari/view/ViewController.java | 19 ++ .../controllers/global/cluster_controller.js | 44 --- .../main/dashboard/config_history_controller.js | 28 +- .../controllers/main/service/add_controller.js | 24 +- .../controllers/main/service/info/configs.js | 24 +- .../app/controllers/wizard/step3_controller.js | 1 + .../app/controllers/wizard/step4_controller.js | 42 ++- .../app/controllers/wizard/step8_controller.js | 30 +- .../mappers/service_config_version_mapper.js | 5 +- ambari-web/app/mappers/stack_service_mapper.js | 2 +- ambari-web/app/messages.js | 12 +- ambari-web/app/mixins/common/serverValidator.js | 4 +- ambari-web/app/models/service_config.js | 4 + ambari-web/app/models/service_config_version.js | 16 +- ambari-web/app/models/stack_service.js | 63 +--- ambari-web/app/router.js | 14 +- ambari-web/app/routes/add_host_routes.js | 2 + ambari-web/app/routes/add_service_routes.js | 2 + ambari-web/app/routes/installer.js | 2 + ambari-web/app/routes/main.js | 1 + ambari-web/app/routes/views.js | 15 +- ambari-web/app/styles/application.less | 29 +- ambari-web/app/styles/apps.less | 6 + .../common/configs/compare_property.hbs | 8 + .../common/configs/config_history_flow.hbs | 142 ++++---- .../common/configs/service_config_category.hbs | 30 +- ambari-web/app/utils/ajax/ajax.js | 8 +- .../views/common/configs/config_history_flow.js | 29 +- ambari-web/app/views/main/menu.js | 4 +- ambari-web/app/views/main/views_view.js | 2 +- .../dashboard/config_history_controller_test.js | 38 +-- .../main/service/add_controller_test.js | 10 + .../test/controllers/wizard/step3_test.js | 325 +++++++++++++++++++ .../test/controllers/wizard/step4_test.js | 38 ++- .../test/controllers/wizard/step5_test.js | 19 -- .../test/controllers/wizard/step6_test.js | 34 -- .../test/controllers/wizard/step7_test.js | 92 +----- ambari-web/test/models/stack_service_test.js | 52 +-- ambari-web/test/service_components.js | 58 +++- .../src/main/resources/ui/app/scripts/app.js | 2 +- .../app/scripts/controllers/job_controller.js | 2 +- .../app/scripts/controllers/jobs_controller.js | 14 +- .../resources/ui/app/scripts/helpers/ajax.js | 17 +- .../resources/ui/app/scripts/helpers/jobs.js | 78 ++--- .../mappers/application_status_mapper.js | 47 +++ contrib/views/jobs/src/main/resources/view.xml | 10 + .../ui/app/components/configSection.js | 150 +++++++++ .../createAppWizard/step1_controller.js | 31 ++ .../createAppWizard/step3_controller.js | 55 +++- .../controllers/create_app_wizard_controller.js | 27 +- .../src/main/resources/ui/app/helpers/ajax.js | 27 +- .../src/main/resources/ui/app/helpers/helper.js | 37 ++- .../src/main/resources/ui/app/initialize.js | 2 + .../ui/app/mappers/application_status.js | 25 ++ .../ui/app/mappers/slider_apps_mapper.js | 2 +- .../app/templates/components/configSection.hbs | 76 +++++ .../ui/app/templates/createAppWizard/step3.hbs | 8 +- .../resources/ui/app/templates/slider_app.hbs | 2 +- .../ui/app/templates/slider_app/summary.hbs | 2 +- .../src/main/resources/ui/app/translations.js | 6 + 142 files changed, 2717 insertions(+), 1148 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/52d1af76/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/52d1af76/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/52d1af76/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/52d1af76/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/52d1af76/ambari-server/src/main/resources/key_properties.json ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/52d1af76/ambari-server/src/main/resources/properties.json ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/52d1af76/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/52d1af76/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ----------------------------------------------------------------------
