You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2017/07/10 19:57:23 UTC

[51/52] [abbrv] ambari git commit: Merge remote-tracking branch 'origin/trunk' into branch-feature-AMBARI-14714

Merge remote-tracking branch 'origin/trunk' into branch-feature-AMBARI-14714


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f491f7b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f491f7b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f491f7b3

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: f491f7b3b0e7fec608108d1b789c8737145e4d62
Parents: bf0bb2e 15dd999
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Mon Jul 10 10:04:32 2017 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Mon Jul 10 10:04:32 2017 -0700

----------------------------------------------------------------------
 LICENSE.txt                                     |    17 +
 .../main/resources/ui/admin-web/app/index.html  |     2 +-
 .../controllers/ambariViews/ViewsListCtrl.js    |    20 +
 .../controllers/groups/GroupsEditCtrl.js        |    19 +-
 .../stackVersions/StackVersionsCreateCtrl.js    |     1 -
 .../scripts/controllers/users/UsersShowCtrl.js  |    13 +
 .../ui/admin-web/app/scripts/i18n.config.js     |     2 +-
 .../ui/admin-web/app/scripts/services/Stack.js  |    32 +-
 .../resources/ui/admin-web/app/styles/main.css  |     7 +-
 .../admin-web/app/views/ambariViews/edit.html   |     2 +-
 .../app/views/ambariViews/listTable.html        |     3 +
 .../ui/admin-web/app/views/groups/edit.html     |     3 +
 .../views/stackVersions/stackVersionPage.html   |     4 +-
 .../ui/admin-web/app/views/users/show.html      |     5 +-
 .../StackVersionsCreateCtrl_test.js             |     6 +-
 ambari-agent/conf/unix/install-helper.sh        |     8 +
 ambari-agent/etc/init.d/ambari-agent            |    22 +-
 ambari-agent/pom.xml                            |    17 +-
 .../org/apache/ambari/tools/zk/ZkMigrator.java  |    44 +-
 .../src/main/package/rpm/posttrans_agent.sh     |     7 +
 .../ambari_agent/AlertSchedulerHandler.py       |    10 +-
 .../src/main/python/ambari_agent/Controller.py  |     6 +-
 .../python/ambari_agent/alerts/base_alert.py    |     8 +-
 .../python/ambari_agent/alerts/port_alert.py    |   107 +-
 ambari-agent/src/packages/tarball/all.xml       |     2 +-
 .../apache/ambari/tools/zk/ZkMigratorTest.java  |    60 +-
 .../ambari_agent/TestAlertSchedulerHandler.py   |    17 +-
 .../test/python/ambari_agent/TestHostInfo.py    |   107 +
 ambari-client/groovy-client/pom.xml             |     2 +
 .../main/python/ambari_commons/inet_utils.py    |    44 +
 .../src/main/python/ambari_commons/os_check.py  |     6 +
 .../ambari_commons/resources/os_family.json     |    11 +
 .../core/providers/__init__.py                  |    19 +-
 .../core/resources/zkmigrator.py                |    17 +-
 .../libraries/functions/conf_select.py          |     1 -
 .../libraries/functions/decorator.py            |    22 +-
 .../libraries/functions/hive_check.py           |     5 +-
 .../libraries/functions/mounted_dirs_helper.py  |     1 +
 .../libraries/functions/packages_analyzer.py    |    62 +-
 .../libraries/functions/repository_util.py      |   127 +
 .../libraries/functions/solr_cloud_util.py      |    10 +
 .../libraries/functions/stack_features.py       |    16 +-
 .../libraries/functions/stack_tools.py          |    39 +
 .../libraries/functions/version.py              |    31 +-
 .../libraries/providers/__init__.py             |     3 -
 .../libraries/providers/hdfs_resource.py        |     9 +-
 .../providers/modify_properties_file.py         |     9 +-
 .../libraries/script/script.py                  |    64 +-
 ambari-funtest/pom.xml                          |     7 +-
 .../upgrades/upgrade_nonrolling_new_stack.xml   |     2 +-
 .../src/main/resources/solr                     |   826 +-
 ambari-infra/ambari-infra-manager/README.md     |    92 +-
 .../ambari-infra-manager/docs/api/swagger.yaml  |   784 +
 .../docs/images/batch-1.png                     |   Bin 0 -> 20521 bytes
 .../docs/images/batch-2.png                     |   Bin 0 -> 29388 bytes
 .../docs/images/batch-3.png                     |   Bin 0 -> 14105 bytes
 .../docs/images/batch-4.png                     |   Bin 0 -> 23277 bytes
 ambari-infra/ambari-infra-manager/pom.xml       |     1 -
 .../org/apache/ambari/infra/InfraManager.java   |    30 +-
 .../infra/common/InfraManagerConstants.java     |     2 +
 .../infra/conf/InfraManagerApiDocConfig.java    |    35 +-
 .../conf/batch/InfraManagerBatchConfig.java     |    70 +-
 .../ambari/infra/job/dummy/DummyItemWriter.java |    26 +
 .../infra/job/dummy/DummyJobListener.java       |    46 +
 .../infra/job/dummy/DummyStepListener.java      |    41 +
 .../apache/ambari/infra/manager/JobManager.java |   274 +
 .../infra/model/ExecutionContextResponse.java   |    40 +
 .../ambari/infra/model/JobDetailsResponse.java  |    53 +
 .../model/JobExecutionDetailsResponse.java      |    49 +
 .../infra/model/JobExecutionInfoResponse.java   |   141 +
 .../ambari/infra/model/JobExecutionRequest.java |    46 +
 .../infra/model/JobExecutionRestartRequest.java |    52 +
 .../infra/model/JobExecutionStopRequest.java    |    50 +
 .../infra/model/JobInstanceDetailsResponse.java |    54 +
 .../infra/model/JobInstanceStartRequest.java    |    49 +
 .../ambari/infra/model/JobOperationParams.java  |    31 +
 .../apache/ambari/infra/model/JobRequest.java   |    37 +
 .../apache/ambari/infra/model/PageRequest.java  |    49 +
 .../model/StepExecutionContextResponse.java     |    58 +
 .../infra/model/StepExecutionInfoResponse.java  |   115 +
 .../model/StepExecutionProgressResponse.java    |    53 +
 .../infra/model/StepExecutionRequest.java       |    49 +
 .../infra/model/wrapper/JobExecutionData.java   |   118 +
 .../infra/model/wrapper/StepExecutionData.java  |   133 +
 .../ambari/infra/rest/JobExceptionMapper.java   |   110 +
 .../apache/ambari/infra/rest/JobResource.java   |   151 +-
 ambari-infra/ambari-infra-solr-client/pom.xml   |     2 +
 .../ambari/infra/solr/AmbariSolrCloudCLI.java   |    14 +
 .../infra/solr/AmbariSolrCloudClient.java       |     8 +
 .../commands/RemoveAdminHandlersCommand.java    |    46 +
 .../commands/SetClusterPropertyZkCommand.java   |     6 +-
 ambari-infra/ambari-infra-solr-plugin/pom.xml   |     4 +-
 .../InfraKerberosHostValidator.java             |    54 -
 .../InfraRuleBasedAuthorizationPlugin.java      |   542 -
 .../InfraUserRolesLookupStrategy.java           |    49 -
 .../security/InfraKerberosHostValidator.java    |    54 +
 .../InfraRuleBasedAuthorizationPlugin.java      |   542 +
 .../security/InfraUserRolesLookupStrategy.java  |    49 +
 .../InfraRuleBasedAuthorizationPluginTest.java  |     5 +
 ambari-infra/pom.xml                            |     8 +-
 .../ambari-logsearch-appender/pom.xml           |     3 +-
 .../ambari-logsearch-config-api/pom.xml         |    14 +-
 .../config/api/InputConfigMonitor.java          |    13 +-
 .../logsearch/config/api/LogSearchConfig.java   |    18 +-
 .../config/api/LogSearchConfigFactory.java      |    18 +-
 .../api/LogSearchPropertyDescription.java       |    59 +
 .../api/ShipperConfigElementDescription.java    |    59 +
 .../api/ShipperConfigTypeDescription.java       |    44 +
 .../api/model/inputconfig/Conditions.java       |    24 +
 .../config/api/model/inputconfig/Fields.java    |    26 +
 .../api/model/inputconfig/FilterDescriptor.java |    39 +
 .../model/inputconfig/FilterGrokDescriptor.java |    30 +
 .../model/inputconfig/FilterJsonDescriptor.java |    23 +
 .../inputconfig/FilterKeyValueDescriptor.java   |    28 +
 .../api/model/inputconfig/InputConfig.java      |    28 +
 .../api/model/inputconfig/InputDescriptor.java  |    52 +
 .../inputconfig/InputFileBaseDescriptor.java    |    28 +
 .../model/inputconfig/InputFileDescriptor.java  |    23 +
 .../inputconfig/InputS3FileDescriptor.java      |    26 +
 .../inputconfig/MapAnonymizeDescriptor.java     |    26 +
 .../model/inputconfig/MapDateDescriptor.java    |    26 +
 .../inputconfig/MapFieldCopyDescriptor.java     |    24 +
 .../model/inputconfig/MapFieldDescriptor.java   |    24 +
 .../inputconfig/MapFieldNameDescriptor.java     |    24 +
 .../inputconfig/MapFieldValueDescriptor.java    |    26 +
 .../api/model/inputconfig/PostMapValues.java    |    26 +
 .../config/api/LogSearchConfigClass1.java       |    14 +-
 .../config/api/LogSearchConfigClass2.java       |    14 +-
 .../config/api/LogSearchConfigFactoryTest.java  |    18 +-
 .../ambari-logsearch-config-zookeeper/pom.xml   |     6 +
 .../config/zookeeper/LogSearchConfigZK.java     |   146 +-
 .../model/inputconfig/impl/ConditionsImpl.java  |    50 +
 .../model/inputconfig/impl/FieldsImpl.java      |    53 +
 .../model/inputconfig/impl/FilterAdapter.java   |    42 +
 .../inputconfig/impl/FilterDescriptorImpl.java  |   164 +
 .../impl/FilterGrokDescriptorImpl.java          |    91 +
 .../impl/FilterJsonDescriptorImpl.java          |    25 +
 .../impl/FilterKeyValueDescriptorImpl.java      |    91 +
 .../model/inputconfig/impl/InputAdapter.java    |    58 +
 .../model/inputconfig/impl/InputConfigGson.java |    46 +
 .../model/inputconfig/impl/InputConfigImpl.java |    72 +
 .../inputconfig/impl/InputDescriptorImpl.java   |   293 +
 .../impl/InputFileBaseDescriptorImpl.java       |    93 +
 .../impl/InputFileDescriptorImpl.java           |    25 +
 .../impl/InputS3FileDescriptorImpl.java         |    69 +
 .../impl/MapAnonymizeDescriptorImpl.java        |    76 +
 .../inputconfig/impl/MapDateDescriptorImpl.java |    76 +
 .../impl/MapFieldCopyDescriptorImpl.java        |    57 +
 .../impl/MapFieldDescriptorImpl.java            |    33 +
 .../impl/MapFieldNameDescriptorImpl.java        |    57 +
 .../impl/MapFieldValueDescriptorImpl.java       |    76 +
 .../inputconfig/impl/PostMapValuesAdapter.java  |   102 +
 .../inputconfig/impl/PostMapValuesImpl.java     |    40 +
 ambari-logsearch/ambari-logsearch-it/pom.xml    |     4 +-
 .../logsearch/steps/LogSearchApiSteps.java      |     6 +-
 .../ambari-logsearch-logfeeder/README.md        |    28 +-
 .../ambari-logsearch-logfeeder/docs/filter.md   |    61 +
 .../ambari-logsearch-logfeeder/docs/input.md    |    61 +
 .../docs/inputConfig.md                         |    29 +
 .../docs/postMapValues.md                       |    70 +
 .../ambari-logsearch-logfeeder/pom.xml          |    15 +-
 .../org/apache/ambari/logfeeder/LogFeeder.java  |    83 +-
 .../ambari/logfeeder/LogFeederCommandLine.java  |   168 +
 .../ambari/logfeeder/common/ConfigBlock.java    |   107 +-
 .../ambari/logfeeder/common/ConfigHandler.java  |   204 +-
 .../ambari/logfeeder/common/ConfigItem.java     |    97 +
 .../logfeeder/common/LogEntryParseTester.java   |   127 +
 .../logfeeder/common/LogFeederConstants.java    |     2 +-
 .../logfeeder/common/LogFeederException.java    |    31 +
 .../logfeeder/common/LogfeederException.java    |    31 -
 .../apache/ambari/logfeeder/filter/Filter.java  |    59 +-
 .../ambari/logfeeder/filter/FilterGrok.java     |    26 +-
 .../ambari/logfeeder/filter/FilterJSON.java     |     9 +-
 .../ambari/logfeeder/filter/FilterKeyValue.java |    18 +-
 .../logfeeder/input/AbstractInputFile.java      |   167 +-
 .../apache/ambari/logfeeder/input/Input.java    |   191 +-
 .../logfeeder/input/InputConfigUploader.java    |    18 +-
 .../ambari/logfeeder/input/InputFile.java       |    29 +-
 .../ambari/logfeeder/input/InputManager.java    |   163 +-
 .../ambari/logfeeder/input/InputS3File.java     |    22 +-
 .../ambari/logfeeder/input/InputSimulate.java   |    97 +-
 .../logfeeder/loglevelfilter/FilterLogData.java |     2 +-
 .../loglevelfilter/LogLevelFilterHandler.java   |    28 +-
 .../apache/ambari/logfeeder/mapper/Mapper.java  |     4 +-
 .../logfeeder/mapper/MapperAnonymize.java       |   120 +
 .../ambari/logfeeder/mapper/MapperDate.java     |    17 +-
 .../logfeeder/mapper/MapperFieldCopy.java       |    13 +-
 .../logfeeder/mapper/MapperFieldName.java       |    14 +-
 .../logfeeder/mapper/MapperFieldValue.java      |    14 +-
 .../logfeeder/metrics/LogFeederAMSClient.java   |    43 +-
 .../logfeeder/metrics/MetricsManager.java       |    25 +-
 .../apache/ambari/logfeeder/output/Output.java  |     3 -
 .../ambari/logfeeder/output/OutputHDFSFile.java |    10 +-
 .../logfeeder/output/OutputLineFilter.java      |     2 +-
 .../ambari/logfeeder/output/OutputManager.java  |     8 +-
 .../ambari/logfeeder/output/OutputS3File.java   |    98 +-
 .../ambari/logfeeder/output/OutputSolr.java     |    28 +-
 .../apache/ambari/logfeeder/util/AliasUtil.java |     6 +-
 .../apache/ambari/logfeeder/util/FileUtil.java  |    45 +-
 .../logfeeder/util/LogFeederHDFSUtil.java       |    77 +
 .../ambari/logfeeder/util/LogFeederUtil.java    |   118 +-
 .../logfeeder/util/LogfeederHDFSUtil.java       |    77 -
 .../apache/ambari/logfeeder/util/SSLUtil.java   |     9 +
 .../src/main/resources/alias_config.json        |     3 +
 .../src/main/resources/log4j.xml                |     3 +-
 .../src/main/scripts/run.sh                     |     4 +-
 .../ambari/logfeeder/filter/FilterGrokTest.java |    37 +-
 .../ambari/logfeeder/filter/FilterJSONTest.java |    28 +-
 .../logfeeder/filter/FilterKeyValueTest.java    |    41 +-
 .../ambari/logfeeder/input/InputFileTest.java   |    21 +-
 .../logfeeder/input/InputManagerTest.java       |    27 -
 .../logconfig/LogConfigHandlerTest.java         |    20 +-
 .../logfeeder/mapper/MapperAnonymizeTest.java   |    79 +
 .../ambari/logfeeder/mapper/MapperDateTest.java |    44 +-
 .../logfeeder/mapper/MapperFieldCopyTest.java   |    19 +-
 .../logfeeder/mapper/MapperFieldNameTest.java   |    19 +-
 .../logfeeder/mapper/MapperFieldValueTest.java  |    29 +-
 .../logfeeder/metrics/MetrcisManagerTest.java   |   128 -
 .../logfeeder/metrics/MetricsManagerTest.java   |   126 +
 .../logfeeder/output/OutputLineFilterTest.java  |    22 +-
 .../logfeeder/output/OutputManagerTest.java     |    10 +-
 .../logfeeder/output/OutputS3FileTest.java      |    17 +-
 .../src/test/resources/log4j.xml                |     2 +-
 .../src/test/resources/logfeeder.properties     |     1 -
 .../resources/samples/config/config_audit.json  |   339 +-
 .../samples/config/config_service.json          |    79 +-
 .../ambari-logsearch-server/pom.xml             |    41 +-
 .../configsets/audit_logs/conf/solrconfig.xml   |     3 +-
 .../configsets/hadoop_logs/conf/solrconfig.xml  |     3 +-
 .../main/configsets/history/conf/solrconfig.xml |     3 +-
 .../org/apache/ambari/logsearch/LogSearch.java  |    11 +-
 .../ambari/logsearch/common/ApiDocStorage.java  |    90 +
 .../logsearch/common/LogSearchConstants.java    |     2 +
 .../logsearch/common/PropertiesHelper.java      |    17 -
 .../common/PropertyDescriptionStorage.java      |   101 +
 .../common/ShipperConfigDescriptionStorage.java |    67 +
 .../ambari/logsearch/conf/ApiDocConfig.java     |    39 +-
 .../logsearch/conf/ApplicationConfig.java       |     4 +-
 .../ambari/logsearch/conf/AuthPropsConfig.java  |   122 +
 .../conf/LogSearchHttpHeaderConfig.java         |    31 +
 .../ambari/logsearch/conf/SecurityConfig.java   |    19 +-
 .../logsearch/conf/SolrAuditLogPropsConfig.java |    76 +
 .../ambari/logsearch/conf/SolrConfig.java       |    12 +-
 .../conf/SolrConnectionPropsConfig.java         |    28 +
 .../conf/SolrEventHistoryPropsConfig.java       |   148 +
 .../logsearch/conf/SolrKerberosConfig.java      |    17 +
 .../conf/SolrServiceLogPropsConfig.java         |    38 +
 .../logsearch/conf/SolrUserPropsConfig.java     |   116 -
 .../conf/global/SolrEventHistoryState.java      |    60 +
 .../conf/global/SolrUserConfigState.java        |    60 -
 .../configurer/LogSearchConfigConfigurer.java   |     2 +-
 .../AbstractLogRequestFacetQueryConverter.java  |     2 +
 .../EventHistoryRequestQueryConverter.java      |    67 +
 .../UserConfigRequestQueryConverter.java        |    67 -
 .../logsearch/dao/EventHistorySolrDao.java      |   117 +
 .../logsearch/dao/SolrSchemaFieldDao.java       |    10 +-
 .../ambari/logsearch/dao/UserConfigSolrDao.java |   117 -
 .../ambari/logsearch/doc/DocConstants.java      |    18 +-
 .../handler/ListCollectionHandler.java          |     1 +
 .../logsearch/manager/AuditLogsManager.java     |    11 +-
 .../logsearch/manager/EventHistoryManager.java  |   199 +
 .../ambari/logsearch/manager/InfoManager.java   |    68 +
 .../ambari/logsearch/manager/ManagerBase.java   |     5 +-
 .../ambari/logsearch/manager/PublicManager.java |    48 -
 .../logsearch/manager/ServiceLogsManager.java   |    62 +-
 .../logsearch/manager/ShipperConfigManager.java |    41 +-
 .../logsearch/manager/UserConfigManager.java    |   199 -
 .../model/common/LSServerConditions.java        |    48 +
 .../logsearch/model/common/LSServerFields.java  |    49 +
 .../logsearch/model/common/LSServerFilter.java  |   137 +
 .../common/LSServerFilterDeserializer.java      |    60 +
 .../model/common/LSServerFilterGrok.java        |    79 +
 .../model/common/LSServerFilterJson.java        |    33 +
 .../model/common/LSServerFilterKeyValue.java    |    73 +
 .../logsearch/model/common/LSServerInput.java   |   148 +
 .../model/common/LSServerInputConfig.java       |   100 +
 .../model/common/LSServerInputDeserializer.java |    62 +
 .../model/common/LSServerInputFile.java         |    33 +
 .../model/common/LSServerInputFileBase.java     |    74 +
 .../model/common/LSServerInputS3File.java       |    65 +
 .../model/common/LSServerLogLevelFilter.java    |    24 +-
 .../model/common/LSServerLogLevelFilterMap.java |     5 +
 .../logsearch/model/common/LSServerMapDate.java |    63 +
 .../model/common/LSServerMapField.java          |    33 +
 .../model/common/LSServerMapFieldAnonymize.java |    65 +
 .../model/common/LSServerMapFieldCopy.java      |    54 +
 .../model/common/LSServerMapFieldName.java      |    54 +
 .../model/common/LSServerMapFieldValue.java     |    67 +
 .../model/common/LSServerPostMapValues.java     |    73 +
 .../model/common/LSServerPostMapValuesList.java |    59 +
 .../LSServerPostMapValuesListDeserializer.java  |    83 +
 .../LSServerPostMapValuesListSerializer.java    |    44 +
 .../request/EventHistoryParamDefinition.java    |    38 +
 .../request/UserConfigParamDefinition.java      |    38 -
 .../model/request/impl/EventHistoryRequest.java |    53 +
 .../model/request/impl/UserConfigRequest.java   |    53 -
 .../model/response/EventHistoryData.java        |    97 +
 .../response/EventHistoryDataListResponse.java  |    55 +
 .../model/response/PropertyDescriptionData.java |    62 +
 .../response/ShipperConfigDescriptionData.java  |    52 +
 .../model/response/UserConfigData.java          |    97 -
 .../response/UserConfigDataListResponse.java    |    55 -
 .../logsearch/rest/AuditLogsResource.java       |     2 +-
 .../logsearch/rest/EventHistoryResource.java    |    82 +
 .../ambari/logsearch/rest/InfoResource.java     |    83 +
 .../ambari/logsearch/rest/PublicResource.java   |    48 -
 .../logsearch/rest/ShipperConfigResource.java   |    35 +-
 .../ambari/logsearch/rest/StatusResource.java   |    16 +-
 .../ambari/logsearch/rest/SwaggerResource.java  |    56 +
 .../logsearch/rest/UserConfigResource.java      |    82 -
 .../ambari/logsearch/solr/SolrConstants.java    |     4 +-
 .../apache/ambari/logsearch/util/SSLUtil.java   |    25 +
 .../LogsearchAuthSuccessHandler.java            |     4 -
 .../LogsearchEventHistoryStateFilter.java       |    52 +
 .../LogsearchKRBAuthenticationFilter.java       |    69 +-
 .../web/filters/LogsearchKrbFilter.java         |    62 +-
 .../filters/LogsearchUserConfigStateFilter.java |    52 -
 .../web/model/JWTAuthenticationToken.java       |     2 +-
 ...rchExternalServerAuthenticationProvider.java |    23 +-
 .../src/main/resources/default.properties       |     2 -
 .../src/main/resources/log4j.xml                |   158 +-
 .../src/main/resources/logsearch.properties     |     3 -
 .../EventHistoryRequestQueryConverterTest.java  |    50 +
 .../UserConfigRequestQueryConverterTest.java    |    50 -
 ...xternalServerAuthenticationProviderTest.java |     4 +
 .../src/main/webapp/login.html                  |    19 +-
 .../collection_bases/VEventHistoryListBase.js   |     8 +-
 .../scripts/model_bases/VUserFilterBase.js      |     2 +-
 .../main/webapp/scripts/views/common/Header.js  |     2 +-
 ambari-logsearch/docker/Dockerfile              |     8 +-
 ambari-logsearch/docker/bin/start.sh            |     4 +-
 .../test-config/logfeeder/logfeeder.properties  |     1 +
 .../logfeeder/shipper-conf/global.config.json   |     5 +-
 .../shipper-conf/input.config-hst.json          |     4 +-
 .../shipper-conf/input.config-zookeeper.json    |     4 +-
 .../logsearch/logsearch-https.properties        |     4 -
 .../test-config/logsearch/logsearch.properties  |     4 -
 ambari-logsearch/pom.xml                        |    11 +-
 ambari-metrics/ambari-metrics-common/pom.xml    |     9 +
 .../timeline/AbstractTimelineMetricsSink.java   |   109 +-
 .../sink/timeline/AppCookieManager.java         |   219 +
 .../metrics2/sink/timeline/Precision.java       |     2 +-
 .../sink/timeline/AppCookieManagerTest.java     |    52 +
 .../cache/HandleConnectExceptionTest.java       |    86 +-
 .../ambari-metrics/datasource.js                |     5 +-
 .../timeline/HadoopTimelineMetricsSink.java     |     2 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java |     2 +-
 .../ambari-metrics-host-aggregator/pom.xml      |    30 +-
 .../AbstractMetricPublisherThread.java          |   134 -
 .../aggregator/AggregatedMetricsPublisher.java  |   101 -
 .../host/aggregator/AggregatorApplication.java  |    98 +-
 .../host/aggregator/AggregatorWebService.java   |     2 +-
 .../host/aggregator/RawMetricsPublisher.java    |    60 -
 .../host/aggregator/TimelineMetricsHolder.java  |    26 +-
 .../sink/timeline/AbstractMetricPublisher.java  |   169 +
 .../timeline/AggregatedMetricsPublisher.java    |   103 +
 .../sink/timeline/RawMetricsPublisher.java      |    65 +
 .../aggregator/AggregatorApplicationTest.java   |    55 +
 .../aggregator/AggregatorWebServiceTest.java    |   135 +
 .../aggregator/TimelineMetricsHolderTest.java   |   107 +
 .../timeline/AbstractMetricPublisherTest.java   |    82 +
 .../AggregatedMetricsPublisherTest.java         |   154 +
 .../sink/timeline/RawMetricsPublisherTest.java  |   151 +
 .../ambari-metrics-host-monitoring/pom.xml      |     1 +
 .../src/main/python/core/aggregator.py          |     6 +-
 .../src/main/python/core/controller.py          |     2 +-
 .../kafka/KafkaTimelineMetricsReporter.java     |     4 +-
 .../storm/StormTimelineMetricsReporter.java     |     6 +-
 .../sink/storm/StormTimelineMetricsSink.java    |     2 +-
 .../sink/storm/StormTimelineMetricsSink.java    |     2 +-
 .../ambari-metrics-timelineservice/pom.xml      |     8 +-
 .../timeline/HBaseTimelineMetricStore.java      |    15 +-
 .../timeline/TimelineMetricConfiguration.java   |    21 +
 .../timeline/TestTimelineMetricStore.java       |     1 +
 ambari-metrics/pom.xml                          |    81 +-
 ambari-project/pom.xml                          |    77 +-
 ambari-server/checkstyle.xml                    |     5 +
 ambari-server/conf/unix/ambari-env.sh           |     2 +-
 ambari-server/conf/unix/ambari.properties       |     4 +
 ambari-server/docs/api/generated/index.html     | 56183 +++++++++++++++++
 ambari-server/docs/api/generated/swagger.json   |  9285 +++
 ambari-server/docs/configuration/index.md       |    18 +-
 .../security/kerberos/kerberos_descriptor.md    |     5 +-
 ambari-server/pom.xml                           |   294 +-
 ambari-server/sbin/ambari-server                |     6 +-
 ambari-server/src/main/assemblies/server.xml    |     6 +-
 .../persist/jpa/AmbariJpaPersistModule.java     |     2 +-
 .../persist/jpa/AmbariJpaPersistService.java    |     2 +-
 .../apache/ambari/annotations/Experimental.java |     7 +-
 .../ambari/annotations/ExperimentalFeature.java |     9 +-
 .../org/apache/ambari/annotations/Markdown.java |     2 +-
 .../ambari/annotations/TransactionalLock.java   |     2 +-
 .../apache/ambari/server/AmbariException.java   |     2 +-
 .../org/apache/ambari/server/AmbariService.java |     2 +-
 .../ambari/server/ClusterNotFoundException.java |     2 +-
 .../server/ConfigGroupNotFoundException.java    |     2 +-
 .../ambari/server/DBConnectionVerification.java |     2 +-
 .../server/DuplicateResourceException.java      |     2 +-
 .../apache/ambari/server/EagerSingleton.java    |     2 +-
 .../ambari/server/HostNotFoundException.java    |     2 +-
 .../server/KdcServerConnectionVerification.java |     4 +-
 .../ambari/server/ObjectNotFoundException.java  |     2 +-
 .../server/ParentObjectNotFoundException.java   |     2 +-
 .../java/org/apache/ambari/server/Role.java     |     2 +-
 .../org/apache/ambari/server/RoleCommand.java   |     2 +-
 .../ServiceComponentHostNotFoundException.java  |     2 +-
 .../ServiceComponentNotFoundException.java      |     2 +-
 .../ambari/server/ServiceNotFoundException.java |     2 +-
 .../ambari/server/StackAccessException.java     |     2 +-
 .../ambari/server/StateRecoveryManager.java     |    34 +-
 .../apache/ambari/server/StaticallyInject.java  |     2 +-
 .../server/actionmanager/ActionDBAccessor.java  |     2 +-
 .../actionmanager/ActionDBAccessorImpl.java     |    25 +-
 .../server/actionmanager/ActionManager.java     |    10 +-
 .../server/actionmanager/ActionScheduler.java   |    20 +-
 .../ambari/server/actionmanager/ActionType.java |     2 +-
 .../actionmanager/ExecutionCommandWrapper.java  |    49 +-
 .../ExecutionCommandWrapperFactory.java         |     2 +-
 .../server/actionmanager/HostRoleCommand.java   |     2 +-
 .../server/actionmanager/HostRoleStatus.java    |     2 +-
 .../ambari/server/actionmanager/Request.java    |     8 +-
 .../server/actionmanager/RequestStatus.java     |     2 +-
 .../ServiceComponentHostEventWrapper.java       |     6 +-
 .../ambari/server/actionmanager/Stage.java      |    12 +-
 .../server/actionmanager/TargetHostType.java    |     2 +-
 .../apache/ambari/server/agent/ActionQueue.java |     4 +-
 .../ambari/server/agent/AgentCommand.java       |     2 +-
 .../apache/ambari/server/agent/AgentEnv.java    |     2 +-
 .../ambari/server/agent/AgentRequests.java      |    12 +-
 .../server/agent/AlertDefinitionCommand.java    |     9 +-
 .../server/agent/AlertExecutionCommand.java     |     2 +-
 .../ambari/server/agent/CancelCommand.java      |     2 +-
 .../ambari/server/agent/CommandReport.java      |     2 +-
 .../ambari/server/agent/CommandRepository.java  |   184 +
 .../server/agent/ComponentRecoveryReport.java   |     2 +-
 .../ambari/server/agent/ComponentStatus.java    |     2 +-
 .../ambari/server/agent/ComponentsResponse.java |     2 +-
 .../apache/ambari/server/agent/DiskInfo.java    |     2 +-
 .../ambari/server/agent/ExecutionCommand.java   |   131 +-
 .../apache/ambari/server/agent/HeartBeat.java   |     2 +-
 .../ambari/server/agent/HeartBeatHandler.java   |    86 +-
 .../ambari/server/agent/HeartBeatResponse.java  |     2 +-
 .../ambari/server/agent/HeartbeatMonitor.java   |    20 +-
 .../ambari/server/agent/HeartbeatProcessor.java |    25 +-
 .../apache/ambari/server/agent/HostInfo.java    |     4 +-
 .../apache/ambari/server/agent/HostStatus.java  |     2 +-
 .../ambari/server/agent/RecoveryConfig.java     |     2 +-
 .../server/agent/RecoveryConfigHelper.java      |     4 +-
 .../ambari/server/agent/RecoveryReport.java     |     2 +-
 .../apache/ambari/server/agent/Register.java    |     4 +-
 .../server/agent/RegistrationCommand.java       |     2 +-
 .../server/agent/RegistrationResponse.java      |     2 +-
 .../ambari/server/agent/RegistrationStatus.java |     2 +-
 .../ambari/server/agent/StatusCommand.java      |     2 +-
 .../ambari/server/agent/rest/AgentResource.java |    27 +-
 .../alerts/AgentHeartbeatAlertRunnable.java     |     2 +-
 .../ambari/server/alerts/AlertRunnable.java     |     2 +-
 .../alerts/AmbariPerformanceRunnable.java       |     2 +-
 .../alerts/ComponentVersionAlertRunnable.java   |    55 +-
 .../server/alerts/StaleAlertRunnable.java       |     2 +-
 .../ambari/server/api/GsonJsonProvider.java     |     2 +-
 .../server/api/UserNameOverrideFilter.java      |     2 +-
 .../api/handlers/BaseManagementHandler.java     |     2 +-
 .../server/api/handlers/CreateHandler.java      |     2 +-
 .../server/api/handlers/DeleteHandler.java      |     2 +-
 .../server/api/handlers/QueryCreateHandler.java |     2 +-
 .../ambari/server/api/handlers/ReadHandler.java |     2 +-
 .../server/api/handlers/RequestHandler.java     |     2 +-
 .../server/api/handlers/UpdateHandler.java      |     6 +-
 .../api/predicate/InvalidQueryException.java    |     2 +-
 .../server/api/predicate/PredicateCompiler.java |     2 +-
 .../ambari/server/api/predicate/QueryLexer.java |     6 +-
 .../server/api/predicate/QueryParser.java       |     2 +-
 .../ambari/server/api/predicate/Token.java      |     2 +-
 .../expressions/AbstractExpression.java         |     2 +-
 .../api/predicate/expressions/Expression.java   |     2 +-
 .../expressions/LogicalExpression.java          |     2 +-
 .../expressions/LogicalExpressionFactory.java   |     2 +-
 .../expressions/NotLogicalExpression.java       |     2 +-
 .../expressions/RelationalExpression.java       |     2 +-
 .../predicate/operators/AbstractOperator.java   |     2 +-
 .../api/predicate/operators/AndOperator.java    |     2 +-
 .../api/predicate/operators/EqualsOperator.java |     2 +-
 .../api/predicate/operators/FilterOperator.java |     2 +-
 .../operators/GreaterEqualsOperator.java        |     2 +-
 .../predicate/operators/GreaterOperator.java    |     2 +-
 .../api/predicate/operators/InOperator.java     |     2 +-
 .../predicate/operators/IsEmptyOperator.java    |     2 +-
 .../predicate/operators/LessEqualsOperator.java |     2 +-
 .../api/predicate/operators/LessOperator.java   |     2 +-
 .../predicate/operators/LogicalOperator.java    |     2 +-
 .../operators/LogicalOperatorFactory.java       |     2 +-
 .../predicate/operators/NotEqualsOperator.java  |     2 +-
 .../api/predicate/operators/NotOperator.java    |     2 +-
 .../api/predicate/operators/Operator.java       |     2 +-
 .../api/predicate/operators/OrOperator.java     |     2 +-
 .../predicate/operators/RelationalOperator.java |     2 +-
 .../operators/RelationalOperatorFactory.java    |     2 +-
 .../query/ExtendedResourcePredicateVisitor.java |     2 +-
 .../server/api/query/JpaPredicateVisitor.java   |    12 +-
 .../ambari/server/api/query/JpaSortBuilder.java |     2 +-
 .../api/query/ProcessingPredicateVisitor.java   |     2 +-
 .../apache/ambari/server/api/query/Query.java   |     2 +-
 .../ambari/server/api/query/QueryImpl.java      |     6 +-
 .../ambari/server/api/query/QueryInfo.java      |     2 +-
 .../api/query/SubResourcePredicateVisitor.java  |     2 +-
 .../api/query/render/AlertStateSummary.java     |     4 +-
 .../api/query/render/AlertStateValues.java      |     4 +-
 .../render/AlertSummaryGroupedRenderer.java     |     2 +-
 .../api/query/render/AlertSummaryRenderer.java  |     2 +-
 .../server/api/query/render/BaseRenderer.java   |     2 +-
 .../query/render/ClusterBlueprintRenderer.java  |     7 +-
 .../api/query/render/DefaultRenderer.java       |     2 +-
 .../query/render/MetricsPaddingRenderer.java    |     2 +-
 .../api/query/render/MinimalRenderer.java       |     2 +-
 .../server/api/query/render/Renderer.java       |     2 +-
 .../api/resources/ActionResourceDefinition.java |     2 +-
 .../ActiveWidgetLayoutResourceDefinition.java   |     2 +-
 .../resources/AlertDefResourceDefinition.java   |     2 +-
 .../resources/AlertGroupResourceDefinition.java |     2 +-
 .../AlertHistoryResourceDefinition.java         |     2 +-
 .../AlertNoticeResourceDefinition.java          |     2 +-
 .../api/resources/AlertResourceDefinition.java  |     2 +-
 .../AlertTargetResourceDefinition.java          |     2 +-
 .../api/resources/BaseResourceDefinition.java   |     2 +-
 .../resources/BlueprintResourceDefinition.java  |     2 +-
 .../ClientConfigResourceDefinition.java         |     2 +-
 .../resources/ClusterResourceDefinition.java    |     2 +-
 .../resources/ComponentResourceDefinition.java  |     2 +-
 ...ComponentStackVersionResourceDefinition.java |     2 +-
 .../ConfigGroupResourceDefinition.java          |     2 +-
 .../ConfigurationResourceDefinition.java        |     2 +-
 .../DetachedHostResourceDefinition.java         |     2 +-
 .../ExtensionLinkResourceDefinition.java        |     2 +-
 .../resources/ExtensionResourceDefinition.java  |     2 +-
 .../ExtensionVersionResourceDefinition.java     |     2 +-
 .../api/resources/FeedResourceDefinition.java   |     2 +-
 .../api/resources/GroupResourceDefinition.java  |     2 +-
 .../HostComponentProcessResourceDefinition.java |     2 +-
 .../HostComponentResourceDefinition.java        |     2 +-
 .../api/resources/HostResourceDefinition.java   |     2 +-
 .../resources/InstanceResourceDefinition.java   |     2 +-
 .../api/resources/JobResourceDefinition.java    |     2 +-
 .../LdapSyncEventResourceDefinition.java        |     2 +-
 .../resources/LoggingResourceDefinition.java    |     2 +-
 .../api/resources/MemberResourceDefinition.java |     2 +-
 .../OperatingSystemResourceDefinition.java      |     2 +-
 .../resources/PermissionResourceDefinition.java |     2 +-
 .../resources/PrivilegeResourceDefinition.java  |     2 +-
 .../RecommendationResourceDefinition.java       |     2 +-
 .../RemoteClusterResourceDefinition.java        |     2 +-
 .../resources/RepositoryResourceDefinition.java |     2 +-
 .../RepositoryVersionResourceDefinition.java    |     2 +-
 .../resources/RequestResourceDefinition.java    |     2 +-
 .../RequestScheduleResourceDefinition.java      |     2 +-
 .../api/resources/ResourceDefinition.java       |     2 +-
 .../server/api/resources/ResourceInstance.java  |     2 +-
 .../api/resources/ResourceInstanceFactory.java  |     2 +-
 .../resources/ResourceInstanceFactoryImpl.java  |     6 +-
 .../RootServiceComponentResourceDefinition.java |     2 +-
 ...tServiceHostComponentResourceDefinition.java |     2 +-
 .../RootServiceResourceDefinition.java          |     2 +-
 .../resources/ServiceResourceDefinition.java    |     2 +-
 .../api/resources/SimpleResourceDefinition.java |     4 +-
 ...nfigurationDependencyResourceDefinition.java |     2 +-
 .../StackConfigurationResourceDefinition.java   |     2 +-
 .../StackDependencyResourceDefinition.java      |     2 +-
 ...ackLevelConfigurationResourceDefinition.java |     2 +-
 .../api/resources/StackResourceDefinition.java  |     4 +-
 ...StackServiceComponentResourceDefinition.java |     2 +-
 .../StackServiceResourceDefinition.java         |     2 +-
 .../StackVersionResourceDefinition.java         |     2 +-
 .../api/resources/SubResourceDefinition.java    |     2 +-
 .../TargetClusterResourceDefinition.java        |     2 +-
 .../TaskAttemptResourceDefinition.java          |     2 +-
 .../api/resources/TaskResourceDefinition.java   |     4 +-
 .../resources/UpgradeResourceDefinition.java    |     2 +-
 .../api/resources/UserResourceDefinition.java   |     2 +-
 .../resources/ValidationResourceDefinition.java |     2 +-
 .../VersionDefinitionResourceDefinition.java    |     2 +-
 .../ViewExternalSubResourceDefinition.java      |     2 +-
 .../ViewInstanceResourceDefinition.java         |     2 +-
 .../ViewPermissionResourceDefinition.java       |     2 +-
 .../api/resources/ViewResourceDefinition.java   |     2 +-
 .../resources/ViewUrlResourceDefinition.java    |     2 +-
 .../ViewVersionResourceDefinition.java          |     2 +-
 .../WidgetLayoutResourceDefinition.java         |     2 +-
 .../api/resources/WidgetResourceDefinition.java |     3 +-
 .../resources/WorkflowResourceDefinition.java   |     2 +-
 .../server/api/rest/BootStrapResource.java      |    18 +-
 .../ambari/server/api/rest/HealthCheck.java     |    10 +-
 .../api/rest/KdcServerReachabilityCheck.java    |    12 +-
 .../server/api/services/ActionService.java      |   100 +-
 .../api/services/ActiveWidgetLayoutService.java |    76 -
 .../api/services/AlertDefinitionService.java    |    15 +-
 .../server/api/services/AlertGroupService.java  |    13 +-
 .../api/services/AlertHistoryService.java       |     7 +-
 .../server/api/services/AlertNoticeService.java |     7 +-
 .../server/api/services/AlertService.java       |     9 +-
 .../server/api/services/AlertTargetService.java |    15 +-
 .../server/api/services/AmbariMetaInfo.java     |   163 +-
 .../api/services/AmbariPrivilegeService.java    |     2 +-
 .../ambari/server/api/services/BaseRequest.java |     4 +-
 .../ambari/server/api/services/BaseService.java |    43 +-
 .../server/api/services/BlueprintService.java   |   107 +-
 .../ClusterKerberosDescriptorService.java       |     6 +-
 .../api/services/ClusterPrivilegeService.java   |     2 +-
 .../api/services/ClusterRequestSwagger.java     |    30 +
 .../server/api/services/ClusterService.java     |   307 +-
 .../services/ClusterStackVersionService.java    |    14 +-
 .../CompatibleRepositoryVersionService.java     |     7 +-
 .../server/api/services/ComponentService.java   |    17 +-
 .../server/api/services/ConfigGroupService.java |    14 +-
 .../api/services/ConfigurationService.java      |     7 +-
 .../server/api/services/CredentialService.java  |    11 +-
 .../server/api/services/DeleteRequest.java      |     2 +-
 .../api/services/DeleteResultMetadata.java      |     2 +-
 .../api/services/ExtensionLinksService.java     |    15 +-
 .../server/api/services/ExtensionsService.java  |    13 +-
 .../ambari/server/api/services/FeedService.java |    13 +-
 .../ambari/server/api/services/GetRequest.java  |     2 +-
 .../api/services/GroupPrivilegeService.java     |    77 -
 .../server/api/services/GroupService.java       |   155 -
 .../api/services/HostComponentService.java      |    22 +-
 .../services/HostKerberosIdentityService.java   |     5 +-
 .../ambari/server/api/services/HostService.java |   190 +-
 .../api/services/HostStackVersionService.java   |     9 +-
 .../server/api/services/InstanceService.java    |    13 +-
 .../ambari/server/api/services/JobService.java  |     7 +-
 .../api/services/KerberosDescriptorService.java |     9 +-
 .../ambari/server/api/services/KeyService.java  |     3 +-
 .../api/services/LdapSyncEventService.java      |    14 +-
 .../server/api/services/LocalUriInfo.java       |     2 +-
 .../server/api/services/LoggingService.java     |     8 +-
 .../server/api/services/LogoutService.java      |     3 +-
 .../server/api/services/MemberService.java      |   163 -
 .../server/api/services/NamedPropertySet.java   |     2 +-
 .../api/services/OperatingSystemService.java    |    24 +-
 .../server/api/services/PermissionService.java  |    14 +-
 .../api/services/PersistKeyValueImpl.java       |     2 +-
 .../api/services/PersistKeyValueService.java    |    27 +-
 .../ambari/server/api/services/PostRequest.java |     2 +-
 .../api/services/PreUpgradeCheckService.java    |     5 +-
 .../server/api/services/PrivilegeService.java   |    19 +-
 .../ambari/server/api/services/PutRequest.java  |     2 +-
 .../server/api/services/QueryPostRequest.java   |     2 +-
 .../api/services/RecommendationService.java     |     5 +-
 .../api/services/RemoteClustersService.java     |    20 +-
 .../server/api/services/RepositoryService.java  |    30 +-
 .../api/services/RepositoryVersionService.java  |    13 +-
 .../ambari/server/api/services/Request.java     |     2 +-
 .../ambari/server/api/services/RequestBody.java |     2 +-
 .../server/api/services/RequestFactory.java     |     2 +-
 .../api/services/RequestScheduleService.java    |    13 +-
 .../server/api/services/RequestService.java     |   107 +-
 .../ambari/server/api/services/Result.java      |     2 +-
 .../ambari/server/api/services/ResultImpl.java  |     2 +-
 .../server/api/services/ResultMetadata.java     |     2 +-
 .../api/services/ResultPostProcessor.java       |     2 +-
 .../api/services/ResultPostProcessorImpl.java   |     2 +-
 .../server/api/services/ResultStatus.java       |     2 +-
 .../api/services/RoleAuthorizationService.java  |     5 +-
 .../server/api/services/RootServiceService.java |   363 +-
 .../services/ServiceConfigVersionService.java   |     4 +-
 .../server/api/services/ServiceService.java     |   294 +-
 .../api/services/SettingRequestSwagger.java     |    30 +
 .../server/api/services/SettingService.java     |   126 +-
 .../server/api/services/StacksService.java      |   732 +-
 .../server/api/services/StageService.java       |    15 +-
 .../api/services/TargetClusterService.java      |    13 +-
 .../server/api/services/TaskAttemptService.java |     7 +-
 .../ambari/server/api/services/TaskService.java |     7 +-
 .../api/services/UpgradeGroupService.java       |     7 +-
 .../server/api/services/UpgradeItemService.java |     9 +-
 .../server/api/services/UpgradeService.java     |    13 +-
 .../api/services/UpgradeSummaryService.java     |    10 +-
 .../api/services/UserAuthorizationService.java  |   103 -
 .../api/services/UserPrivilegeService.java      |    79 -
 .../ambari/server/api/services/UserService.java |   175 -
 .../server/api/services/ValidationService.java  |     5 +-
 .../api/services/VersionDefinitionService.java  |    13 +-
 .../api/services/ViewDataMigrationService.java  |   122 -
 .../ViewExternalSubResourceService.java         |   146 -
 .../api/services/ViewInstanceService.java       |   282 -
 .../api/services/ViewPermissionService.java     |   186 -
 .../api/services/ViewPrivilegeService.java      |    55 -
 .../ambari/server/api/services/ViewService.java |   162 -
 .../api/services/ViewSubResourceService.java    |   134 -
 .../server/api/services/ViewUrlsService.java    |    20 +-
 .../server/api/services/ViewVersionService.java |   199 -
 .../api/services/WidgetLayoutService.java       |    17 +-
 .../server/api/services/WidgetService.java      |    17 +-
 .../server/api/services/WorkflowService.java    |     7 +-
 .../services/groups/GroupPrivilegeService.java  |   113 +
 .../api/services/groups/GroupService.java       |   177 +
 .../api/services/groups/MemberService.java      |   201 +
 .../services/parsers/BodyParseException.java    |     2 +-
 .../services/parsers/JsonRequestBodyParser.java |     4 +-
 .../api/services/parsers/RequestBodyParser.java |     2 +-
 .../persistence/PersistenceManager.java         |     2 +-
 .../persistence/PersistenceManagerImpl.java     |     2 +-
 .../services/serializers/JsonSerializer.java    |     2 +-
 .../services/serializers/ResultSerializer.java  |     2 +-
 .../StackAdvisorBlueprintProcessor.java         |     2 +-
 .../stackadvisor/StackAdvisorException.java     |     2 +-
 .../stackadvisor/StackAdvisorHelper.java        |    76 +-
 .../stackadvisor/StackAdvisorRequest.java       |     2 +-
 .../StackAdvisorRequestException.java           |     2 +-
 .../stackadvisor/StackAdvisorResponse.java      |     2 +-
 .../stackadvisor/StackAdvisorRunner.java        |   209 +-
 .../ComponentLayoutRecommendationCommand.java   |     7 +-
 .../ComponentLayoutValidationCommand.java       |    13 +-
 ...rationDependenciesRecommendationCommand.java |    13 +-
 .../ConfigurationRecommendationCommand.java     |    13 +-
 .../ConfigurationValidationCommand.java         |    13 +-
 .../commands/StackAdvisorCommand.java           |    33 +-
 .../commands/StackAdvisorCommandType.java       |     2 +-
 .../recommendations/RecommendationResponse.java |     2 +-
 .../validations/ValidationResponse.java         |     2 +-
 .../users/ActiveWidgetLayoutService.java        |   111 +
 .../users/UserAuthorizationService.java         |   120 +
 .../services/users/UserPrivilegeService.java    |   113 +
 .../server/api/services/users/UserService.java  |   194 +
 .../views/ViewDataMigrationService.java         |   113 +
 .../views/ViewExternalSubResourceService.java   |   147 +
 .../api/services/views/ViewInstanceService.java |   312 +
 .../services/views/ViewPermissionService.java   |   207 +
 .../services/views/ViewPrivilegeService.java    |   268 +
 .../server/api/services/views/ViewService.java  |   179 +
 .../services/views/ViewSubResourceService.java  |   136 +
 .../api/services/views/ViewVersionService.java  |   205 +
 .../apache/ambari/server/api/util/TreeNode.java |     2 +-
 .../ambari/server/api/util/TreeNodeImpl.java    |     2 +-
 .../ambari/server/audit/AsyncAuditLogger.java   |     2 +-
 .../apache/ambari/server/audit/AuditLogger.java |     2 +-
 .../server/audit/AuditLoggerDefaultImpl.java    |     2 +-
 .../ambari/server/audit/AuditLoggerModule.java  |     2 +-
 .../request/AddUpgradeRequestAuditEvent.java    |    10 +-
 .../eventcreator/DefaultEventCreator.java       |     2 +-
 .../request/eventcreator/HostEventCreator.java  |     4 +-
 .../eventcreator/UpgradeEventCreator.java       |     2 +-
 .../ambari/server/bootstrap/BSHostStatus.java   |     2 +-
 .../server/bootstrap/BSHostStatusCollector.java |    14 +-
 .../ambari/server/bootstrap/BSResponse.java     |     2 +-
 .../ambari/server/bootstrap/BSRunner.java       |    16 +-
 .../ambari/server/bootstrap/BootStrapImpl.java  |     8 +-
 .../server/bootstrap/BootStrapPostStatus.java   |     2 +-
 .../server/bootstrap/BootStrapStatus.java       |     2 +-
 .../DistributeRepositoriesStructuredOutput.java |    14 +-
 .../server/bootstrap/FifoLinkedHashMap.java     |     2 +-
 .../ambari/server/bootstrap/SshHostInfo.java    |     2 +-
 .../server/checks/AbstractCheckDescriptor.java  |    39 +-
 .../server/checks/AtlasPresenceCheck.java       |     2 +-
 .../ambari/server/checks/CheckDescription.java  |     2 +-
 .../checks/ComponentsInstallationCheck.java     |     3 -
 .../server/checks/ConfigurationMergeCheck.java  |     2 +-
 .../checks/DatabaseConsistencyCheckHelper.java  |    29 +-
 .../HardcodedStackVersionPropertiesCheck.java   |    57 +-
 .../checks/HostsMasterMaintenanceCheck.java     |     2 +-
 .../checks/HostsRepositoryVersionCheck.java     |     4 +-
 .../server/checks/InstallPackagesCheck.java     |    16 +-
 .../server/checks/PreviousUpgradeCompleted.java |     7 +-
 .../server/checks/RangerAuditDbCheck.java       |     2 +-
 .../server/checks/RangerPasswordCheck.java      |     8 +-
 .../server/checks/RangerSSLConfigCheck.java     |     3 +-
 .../checks/ServiceCheckValidityCheck.java       |    11 +-
 .../server/checks/ServicePresenceCheck.java     |     2 +-
 .../ambari/server/checks/ServicesUpCheck.java   |     3 +-
 .../ambari/server/checks/UpgradeCheck.java      |     2 +-
 .../ambari/server/checks/UpgradeCheckGroup.java |     2 +-
 .../server/checks/UpgradeCheckRegistry.java     |     6 +-
 .../server/checks/VersionMismatchCheck.java     |     2 +-
 .../YarnTimelineServerStatePreservingCheck.java |     8 +-
 .../server/cleanup/ClasspathScannerUtils.java   |     2 +-
 .../ambari/server/cleanup/CleanupDriver.java    |    15 +-
 .../ambari/server/cleanup/CleanupService.java   |    19 +-
 .../server/cleanup/CleanupServiceImpl.java      |    33 +-
 .../server/cleanup/TimeBasedCleanupPolicy.java  |     5 +-
 .../ComponentSSLConfiguration.java              |     2 +-
 .../server/configuration/Configuration.java     |   113 +-
 .../AbstractRootServiceResponseFactory.java     |     2 +-
 .../controller/ActionExecutionContext.java      |    63 +-
 .../ambari/server/controller/ActionRequest.java |    21 +-
 .../server/controller/ActionRequestSwagger.java |    31 +
 .../server/controller/ActionResponse.java       |    22 +-
 .../controller/ActiveWidgetLayoutRequest.java   |    66 +
 .../controller/ActiveWidgetLayoutResponse.java  |   142 +
 .../server/controller/AlertCurrentRequest.java  |     2 +-
 .../controller/AlertDefinitionResponse.java     |     2 +-
 .../server/controller/AlertHistoryRequest.java  |     2 +-
 .../server/controller/AlertNoticeRequest.java   |     2 +-
 .../controller/AmbariActionExecutionHelper.java |   119 +-
 .../AmbariCustomCommandExecutionHelper.java     |   445 +-
 .../server/controller/AmbariHandlerList.java    |     4 +-
 .../controller/AmbariManagementController.java  |    16 +-
 .../AmbariManagementControllerImpl.java         |   705 +-
 .../ambari/server/controller/AmbariServer.java  |     6 +-
 .../server/controller/AmbariSessionManager.java |     2 +-
 .../ambari/server/controller/ApiModel.java      |    28 +
 .../server/controller/AuthToLocalBuilder.java   |    10 +-
 .../server/controller/BlueprintSwagger.java     |    91 +
 .../controller/ClusterArtifactRequest.java      |    46 +
 .../controller/ClusterArtifactResponse.java     |    49 +
 .../server/controller/ClusterRequest.java       |   113 +-
 .../server/controller/ClusterResponse.java      |   106 +-
 .../ClusterServiceArtifactRequest.java          |    46 +
 .../ClusterServiceArtifactResponse.java         |    52 +
 .../controller/ComponentDependencyResponse.java |    64 +
 .../server/controller/ConfigGroupRequest.java   |     2 +-
 .../server/controller/ConfigGroupResponse.java  |    12 +-
 .../server/controller/ConfigurationRequest.java |     2 +-
 .../controller/ConfigurationResponse.java       |     2 +-
 .../server/controller/ControllerModule.java     |     2 +-
 .../server/controller/ControllerRequest.java    |     2 +-
 .../server/controller/ControllerResponse.java   |     2 +-
 .../controller/DeleteIdentityHandler.java       |   283 +
 .../server/controller/ExecuteActionRequest.java |     2 +-
 .../server/controller/ExecuteCommandJson.java   |     6 +-
 .../server/controller/ExtensionLinkRequest.java |     2 +-
 .../controller/ExtensionLinkResponse.java       |   139 +-
 .../server/controller/ExtensionRequest.java     |     2 +-
 .../server/controller/ExtensionResponse.java    |     2 +-
 .../controller/ExtensionVersionRequest.java     |     2 +-
 .../controller/ExtensionVersionResponse.java    |     2 +-
 .../controller/GroupPrivilegeResponse.java      |    61 +
 .../ambari/server/controller/GroupRequest.java  |     7 +-
 .../ambari/server/controller/GroupResponse.java |     9 +-
 .../HostComponentProcessResponse.java           |     2 +-
 .../ambari/server/controller/HostRequest.java   |    74 +-
 .../ambari/server/controller/HostResponse.java  |   289 +-
 .../ambari/server/controller/HostsMap.java      |     2 +-
 .../server/controller/KerberosHelper.java       |     3 +
 .../server/controller/KerberosHelperImpl.java   |   170 +-
 .../server/controller/LdapSyncRequest.java      |     2 +-
 .../controller/MaintenanceStateHelper.java      |     2 +-
 .../ambari/server/controller/MemberRequest.java |     6 +-
 .../server/controller/MemberResponse.java       |     8 +-
 .../controller/OperatingSystemRequest.java      |     2 +-
 .../controller/OperatingSystemResponse.java     |     2 +-
 .../OrderedRequestStageContainer.java           |    62 +
 .../server/controller/PrivilegeResponse.java    |   175 +
 .../server/controller/QuickLinksResponse.java   |    56 +
 .../server/controller/RepositoryRequest.java    |     2 +-
 .../server/controller/RepositoryResponse.java   |    14 +-
 .../server/controller/RequestPostRequest.java   |    96 +
 .../server/controller/RequestPostResponse.java  |    43 +
 .../server/controller/RequestPutRequest.java    |    33 +
 .../server/controller/RequestRequest.java       |     8 +-
 .../server/controller/RequestResponse.java      |   100 +
 .../controller/RequestScheduleRequest.java      |     2 +-
 .../controller/RequestScheduleResponse.java     |     2 +-
 .../controller/RequestStatusResponse.java       |     2 +-
 .../controller/ResourceProviderFactory.java     |    10 +-
 .../controller/RootServiceComponentRequest.java |     2 +-
 .../RootServiceComponentResponse.java           |    58 +-
 .../RootServiceHostComponentRequest.java        |     2 +-
 .../RootServiceHostComponentResponse.java       |    72 +-
 .../server/controller/RootServiceRequest.java   |     2 +-
 .../server/controller/RootServiceResponse.java  |    24 +-
 .../controller/RootServiceResponseFactory.java  |    31 +-
 .../controller/ServiceComponentHostRequest.java |    21 +-
 .../ServiceComponentHostResponse.java           |    41 +-
 .../controller/ServiceComponentRequest.java     |     2 +-
 .../controller/ServiceComponentResponse.java    |    43 +-
 .../server/controller/ServiceRequest.java       |    52 +-
 .../controller/ServiceRequestSwagger.java       |    31 +
 .../server/controller/ServiceResponse.java      |    80 +-
 .../server/controller/SettingRequest.java       |    69 +
 .../server/controller/SettingResponse.java      |    90 +
 .../controller/StackArtifactResponse.java       |    52 +
 .../StackConfigurationDependencyRequest.java    |     2 +-
 .../StackConfigurationDependencyResponse.java   |    19 +-
 .../controller/StackConfigurationRequest.java   |     2 +-
 .../controller/StackConfigurationResponse.java  |    28 +-
 .../StackLevelConfigurationRequest.java         |     2 +-
 .../StackLevelConfigurationResponse.java        |     2 +-
 .../ambari/server/controller/StackRequest.java  |     2 +-
 .../ambari/server/controller/StackResponse.java |    14 +-
 .../StackServiceArtifactResponse.java           |    53 +
 .../StackServiceComponentRequest.java           |     2 +-
 .../StackServiceComponentResponse.java          |    29 +-
 .../server/controller/StackServiceRequest.java  |     2 +-
 .../server/controller/StackServiceResponse.java |    33 +-
 .../server/controller/StackVersionRequest.java  |     2 +-
 .../server/controller/StackVersionResponse.java |    61 +-
 .../ambari/server/controller/ThemeResponse.java |    56 +
 .../controller/UserAuthorizationResponse.java   |   153 +
 .../controller/UserPrivilegeResponse.java       |    61 +
 .../ambari/server/controller/UserRequest.java   |    19 +-
 .../ambari/server/controller/UserResponse.java  |    50 +-
 .../server/controller/ViewInstanceRequest.java  |   209 +
 .../server/controller/ViewInstanceResponse.java |   198 +
 .../controller/ViewPermissionResponse.java      |   122 +
 .../server/controller/ViewPrivilegeRequest.java |    79 +
 .../controller/ViewPrivilegeResponse.java       |    55 +
 .../ambari/server/controller/ViewResponse.java  |    82 +
 .../server/controller/ViewVersionResponse.java  |   234 +
 .../server/controller/WidgetResponse.java       |     2 +-
 .../AbstractAuthorizedResourceProvider.java     |    21 +
 .../AbstractControllerResourceProvider.java     |    31 +-
 .../internal/AbstractDRResourceProvider.java    |     2 +-
 .../internal/AbstractPropertyProvider.java      |     6 +-
 .../internal/AbstractProviderModule.java        |    64 +-
 .../internal/AbstractResourceProvider.java      |     2 +-
 .../internal/ActionResourceProvider.java        |     5 +-
 .../ActiveWidgetLayoutResourceProvider.java     |    61 +-
 .../internal/AlertHistoryResourceProvider.java  |     2 +-
 .../internal/AlertNoticeResourceProvider.java   |     2 +-
 .../internal/AlertResourceProvider.java         |     2 +-
 .../internal/AlertSummaryPropertyProvider.java  |     2 +-
 .../controller/internal/AppCookieManager.java   |    10 +-
 .../internal/ArtifactResourceProvider.java      |    33 +-
 .../AtlasServerHttpPropertyRequest.java         |     4 +-
 .../controller/internal/BaseClusterRequest.java |     2 +-
 .../controller/internal/BaseProvider.java       |    12 +-
 .../BlueprintConfigurationProcessor.java        |    93 +-
 .../internal/BlueprintResourceProvider.java     |     2 +-
 .../controller/internal/CalculatedStatus.java   |     2 +-
 .../internal/ClientConfigResourceProvider.java  |    25 +-
 .../internal/ClusterControllerImpl.java         |     6 +-
 .../internal/ClusterResourceProvider.java       |    96 +-
 .../ClusterStackVersionResourceProvider.java    |   586 +-
 .../internal/CompatibleRepositoryVersion.java   |     2 +-
 ...atibleRepositoryVersionResourceProvider.java |    21 +-
 .../internal/ComponentResourceProvider.java     |    82 +-
 .../internal/ConfigGroupResourceProvider.java   |    91 +-
 .../ConfigurationTopologyException.java         |     2 +-
 .../internal/DefaultProviderModule.java         |     2 +-
 .../DefaultResourcePredicateEvaluator.java      |     2 +-
 .../internal/DefaultTrimmingStrategy.java       |     2 +-
 .../DeleteSpacesAtTheEndTrimmingStrategy.java   |     2 +-
 .../internal/DeleteStatusMetaData.java          |     2 +-
 .../internal/DirectoriesTrimmingStrategy.java   |     2 +-
 .../internal/ExportBlueprintRequest.java        |     2 +-
 .../server/controller/internal/Extension.java   |     2 +-
 .../internal/ExtensionLinkResourceProvider.java |     2 +-
 .../internal/ExtensionResourceProvider.java     |     2 +-
 .../ExtensionVersionResourceProvider.java       |     2 +-
 .../internal/FeedResourceProvider.java          |     2 +-
 .../GroupPrivilegeResourceProvider.java         |    80 +-
 .../internal/GroupResourceProvider.java         |     6 +-
 .../HostComponentProcessResourceProvider.java   |     2 +-
 .../internal/HostComponentResourceProvider.java |    31 +-
 .../internal/HostResourceProvider.java          |   223 +-
 .../HostStackVersionResourceProvider.java       |    73 +-
 .../controller/internal/HostStatusHelper.java   |     9 +-
 .../internal/HttpPropertyProvider.java          |     2 +-
 .../internal/InstanceResourceProvider.java      |     2 +-
 .../internal/JobResourceProvider.java           |    14 +-
 .../internal/JsonHttpPropertyRequest.java       |     4 +-
 .../internal/LdapSyncEventResourceProvider.java |     2 +-
 .../internal/LoggingResourceProvider.java       |     2 +-
 .../internal/MemberResourceProvider.java        |     6 +-
 .../internal/ObservableResourceProvider.java    |     2 +-
 .../OperatingSystemResourceProvider.java        |     2 +-
 .../controller/internal/PageRequestImpl.java    |     2 +-
 .../controller/internal/PageResponseImpl.java   |     2 +-
 .../internal/PasswordTrimmingStrategy.java      |     2 +-
 .../internal/PermissionResourceProvider.java    |     2 +-
 .../PreUpgradeCheckResourceProvider.java        |    10 +-
 .../controller/internal/PropertyInfo.java       |     4 +-
 .../internal/PropertyPredicateVisitor.java      |     2 +-
 .../PropertyValueTrimmingStrategyDefiner.java   |     2 +-
 .../controller/internal/ProvisionAction.java    |     2 +-
 .../internal/ProvisionClusterRequest.java       |    11 +-
 .../internal/ReadOnlyResourceProvider.java      |    22 +-
 .../RecommendationResourceProvider.java         |     2 +-
 .../internal/RemoteClusterResourceProvider.java |     2 +-
 .../internal/RepositoryResourceProvider.java    |    15 +-
 .../RepositoryVersionResourceProvider.java      |    91 +-
 .../server/controller/internal/RequestImpl.java |     2 +-
 .../internal/RequestResourceFilter.java         |     5 +-
 .../internal/RequestResourceProvider.java       |    92 +-
 .../RequestScheduleResourceProvider.java        |     2 +-
 .../internal/RequestStageContainer.java         |     4 +-
 .../controller/internal/RequestStatusImpl.java  |     2 +-
 .../controller/internal/ResourceImpl.java       |     2 +-
 .../ResourceManagerHttpPropertyRequest.java     |     2 +-
 .../internal/ResourceProviderEvent.java         |     2 +-
 .../internal/ResourceProviderObserver.java      |     2 +-
 .../RootServiceComponentResourceProvider.java   |    65 +-
 ...ootServiceHostComponentResourceProvider.java |    74 +-
 .../internal/RootServiceResourceProvider.java   |    22 +-
 .../internal/ScaleClusterRequest.java           |    12 +-
 .../server/controller/internal/SchemaImpl.java  |     2 +-
 .../internal/ServiceResourceProvider.java       |   234 +-
 .../internal/SettingResourceProvider.java       |    64 +-
 .../internal/SimplifyingPredicateVisitor.java   |     2 +-
 .../controller/internal/SortRequestImpl.java    |     2 +-
 .../server/controller/internal/Stack.java       |     2 +-
 .../internal/StackAdvisorResourceProvider.java  |     2 +-
 .../internal/StackArtifactResourceProvider.java |     6 +-
 ...ConfigurationDependencyResourceProvider.java |     2 +-
 .../StackConfigurationResourceProvider.java     |     2 +-
 .../internal/StackDefinedPropertyProvider.java  |    20 +-
 .../StackDependencyResourceProvider.java        |     8 +-
 ...StackLevelConfigurationResourceProvider.java |     2 +-
 .../internal/StackResourceProvider.java         |     2 +-
 .../StackServiceComponentResourceProvider.java  |     2 +-
 .../internal/StackServiceResourceProvider.java  |     2 +-
 .../internal/StackVersionResourceProvider.java  |     2 +-
 .../internal/StageResourceProvider.java         |     2 +-
 .../internal/TargetClusterResourceProvider.java |     2 +-
 .../internal/TaskAttemptResourceProvider.java   |     8 +-
 .../internal/TaskResourceProvider.java          |     2 +-
 .../controller/internal/TemporalInfoImpl.java   |     2 +-
 .../controller/internal/TrimmingStrategy.java   |     2 +-
 .../controller/internal/URLStreamProvider.java  |    12 +-
 .../internal/UpgradeGroupResourceProvider.java  |     2 +-
 .../internal/UpgradeItemResourceProvider.java   |     2 +-
 .../internal/UpgradeResourceProvider.java       |  1095 +-
 .../controller/internal/UpgradeSummary.java     |     4 +-
 .../UpgradeSummaryResourceProvider.java         |     4 +-
 .../UserAuthorizationResourceProvider.java      |    64 +-
 .../internal/UserPrivilegeResourceProvider.java |    82 +-
 .../internal/UserResourceProvider.java          |     6 +-
 .../internal/ValidationResourceProvider.java    |     4 +-
 .../VersionDefinitionResourceProvider.java      |     4 +-
 .../internal/ViewInstanceResourceProvider.java  |     2 +-
 .../ViewPermissionResourceProvider.java         |    46 +-
 .../internal/ViewResourceProvider.java          |     2 +-
 .../internal/ViewURLResourceProvider.java       |     2 +-
 .../internal/ViewVersionResourceProvider.java   |    63 +-
 .../internal/WidgetLayoutResourceProvider.java  |     6 +-
 .../internal/WidgetResourceProvider.java        |     2 +-
 .../internal/WorkflowResourceProvider.java      |     8 +-
 .../ambari/server/controller/ivory/Cluster.java |     2 +-
 .../ambari/server/controller/ivory/Feed.java    |     2 +-
 .../server/controller/ivory/Instance.java       |     2 +-
 .../server/controller/ivory/IvoryService.java   |     2 +-
 .../controller/jdbc/ConnectionFactory.java      |     2 +-
 .../controller/jdbc/JDBCResourceProvider.java   |     2 +-
 .../JobHistoryPostgresConnectionFactory.java    |     2 +-
 .../controller/jdbc/SQLPredicateVisitor.java    |     2 +-
 .../server/controller/jmx/JMXHostProvider.java  |    13 +-
 .../server/controller/jmx/JMXMetricHolder.java  |     4 +-
 .../controller/jmx/JMXPropertyProvider.java     |    26 +-
 .../logging/HostComponentLoggingInfo.java       |     2 +-
 .../logging/LogFileDefinitionInfo.java          |     2 +-
 .../server/controller/logging/LogFileType.java  |     2 +-
 .../logging/LogLevelQueryResponse.java          |     2 +-
 .../controller/logging/LogLineResult.java       |     2 +-
 .../controller/logging/LogQueryResponse.java    |     2 +-
 .../logging/LogSearchDataRetrievalService.java  |     6 +-
 .../LoggingRequestHelperFactoryImpl.java        |     2 +-
 .../logging/LoggingRequestHelperImpl.java       |    17 +-
 .../logging/LoggingSearchPropertyProvider.java  |    18 +-
 .../controller/logging/NameValuePair.java       |     2 +-
 .../ambari/server/controller/logging/Utils.java |     2 +-
 .../controller/metrics/MetricHostProvider.java  |     2 +-
 .../metrics/MetricPropertyProviderFactory.java  |     2 +-
 .../metrics/MetricReportingAdapter.java         |     2 +-
 .../metrics/MetricsCollectorHAManager.java      |     2 +-
 .../metrics/MetricsDataTransferMethod.java      |     2 +-
 .../MetricsDataTransferMethodFactory.java       |     2 +-
 .../metrics/MetricsDownsamplingMethod.java      |     7 +-
 .../MetricsDownsamplingMethodFactory.java       |     2 +-
 .../metrics/MetricsPaddingMethod.java           |     2 +-
 .../metrics/MetricsPropertyProvider.java        |     2 +-
 .../metrics/MetricsPropertyProviderProxy.java   |     2 +-
 .../metrics/MetricsReportPropertyProvider.java  |     2 +-
 .../MetricsReportPropertyProviderProxy.java     |     2 +-
 .../metrics/MetricsServiceProvider.java         |     2 +-
 .../metrics/RestMetricsPropertyProvider.java    |     2 +-
 .../ThreadPoolEnabledPropertyProvider.java      |     2 +-
 .../GangliaComponentPropertyProvider.java       |     2 +-
 .../GangliaHostComponentPropertyProvider.java   |     2 +-
 .../ganglia/GangliaHostPropertyProvider.java    |     2 +-
 .../metrics/ganglia/GangliaMetric.java          |     5 +-
 .../ganglia/GangliaPropertyProvider.java        |     2 +-
 .../ganglia/GangliaReportPropertyProvider.java  |     2 +-
 .../timeline/AMSComponentPropertyProvider.java  |     2 +-
 .../AMSHostComponentPropertyProvider.java       |     2 +-
 .../timeline/AMSHostPropertyProvider.java       |     2 +-
 .../metrics/timeline/AMSPropertyProvider.java   |    13 +-
 .../timeline/AMSReportPropertyProvider.java     |     2 +-
 .../metrics/timeline/MetricsRequestHelper.java  |    22 +-
 .../cache/TimelineAppMetricCacheKey.java        |     2 +-
 .../timeline/cache/TimelineMetricCache.java     |    30 +-
 .../cache/TimelineMetricCacheEntryFactory.java  |    48 +-
 .../cache/TimelineMetricCacheProvider.java      |     2 +-
 .../cache/TimelineMetricsCacheSizeOfEngine.java |     8 +-
 .../cache/TimelineMetricsCacheValue.java        |     2 +-
 .../controller/predicate/AlwaysPredicate.java   |     5 +-
 .../controller/predicate/AndPredicate.java      |     2 +-
 .../controller/predicate/ArrayPredicate.java    |     2 +-
 .../controller/predicate/BasePredicate.java     |     2 +-
 .../predicate/CategoryIsEmptyPredicate.java     |     2 +-
 .../controller/predicate/CategoryPredicate.java |     2 +-
 .../predicate/ComparisonPredicate.java          |     2 +-
 .../controller/predicate/EqualsPredicate.java   |     2 +-
 .../controller/predicate/FilterPredicate.java   |     2 +-
 .../predicate/GreaterEqualsPredicate.java       |     2 +-
 .../controller/predicate/GreaterPredicate.java  |     2 +-
 .../predicate/LessEqualsPredicate.java          |     2 +-
 .../controller/predicate/LessPredicate.java     |     2 +-
 .../controller/predicate/NotPredicate.java      |     2 +-
 .../controller/predicate/OrPredicate.java       |     2 +-
 .../controller/predicate/PredicateVisitor.java  |     2 +-
 .../predicate/PredicateVisitorAcceptor.java     |     2 +-
 .../controller/predicate/PropertyPredicate.java |     2 +-
 .../controller/predicate/UnaryPredicate.java    |     2 +-
 .../controller/spi/ClusterController.java       |     2 +-
 .../spi/NoSuchParentResourceException.java      |     2 +-
 .../controller/spi/NoSuchResourceException.java |     2 +-
 .../server/controller/spi/PageRequest.java      |     2 +-
 .../server/controller/spi/PageResponse.java     |     2 +-
 .../ambari/server/controller/spi/Predicate.java |     2 +-
 .../server/controller/spi/PropertyProvider.java |     2 +-
 .../server/controller/spi/ProviderModule.java   |     2 +-
 .../ambari/server/controller/spi/Request.java   |     2 +-
 .../server/controller/spi/RequestStatus.java    |     2 +-
 .../controller/spi/RequestStatusMetaData.java   |     2 +-
 .../ambari/server/controller/spi/Resource.java  |     2 +-
 .../spi/ResourceAlreadyExistsException.java     |     2 +-
 .../spi/ResourcePredicateEvaluator.java         |     2 +-
 .../server/controller/spi/ResourceProvider.java |     2 +-
 .../ambari/server/controller/spi/Schema.java    |     2 +-
 .../server/controller/spi/SchemaFactory.java    |     2 +-
 .../server/controller/spi/SortRequest.java      |     2 +-
 .../controller/spi/SortRequestProperty.java     |     2 +-
 .../server/controller/spi/SystemException.java  |     2 +-
 .../server/controller/spi/TemporalInfo.java     |     2 +-
 .../spi/UnsupportedPropertyException.java       |     2 +-
 ...eredThreadPoolExecutorCompletionService.java |     2 +-
 .../utilities/ClusterControllerHelper.java      |     2 +-
 .../controller/utilities/DatabaseChecker.java   |     2 +-
 .../controller/utilities/KerberosChecker.java   |     2 +-
 .../utilities/KerberosIdentityCleaner.java      |   135 +
 .../controller/utilities/PredicateBuilder.java  |     2 +-
 .../controller/utilities/PredicateHelper.java   |     2 +-
 .../controller/utilities/PropertyHelper.java    |    12 +-
 .../utilities/ScalingThreadPoolExecutor.java    |     2 +-
 .../ServiceCalculatedStateFactory.java          |     4 +-
 .../controller/utilities/StreamProvider.java    |     2 +-
 .../state/DefaultServiceCalculatedState.java    |     7 +-
 .../state/FlumeServiceCalculatedState.java      |     4 +-
 .../state/HBaseServiceCalculatedState.java      |     6 +-
 .../state/HDFSServiceCalculatedState.java       |     6 +-
 .../state/HiveServiceCalculatedState.java       |     9 +-
 .../state/OozieServiceCalculatedState.java      |     7 +-
 .../utilities/state/ServiceCalculatedState.java |     2 +-
 .../state/YARNServiceCalculatedState.java       |     7 +-
 .../server/credentialapi/CredentialUtil.java    |     2 +-
 .../server/customactions/ActionDefinition.java  |     2 +-
 .../customactions/ActionDefinitionManager.java  |     8 +-
 .../customactions/ActionDefinitionSpec.java     |     2 +-
 .../customactions/ActionDefinitionXml.java      |     2 +-
 .../events/ActionFinalReportReceivedEvent.java  |     2 +-
 .../events/AggregateAlertRecalculateEvent.java  |     2 +-
 .../events/AlertDefinitionChangedEvent.java     |     2 +-
 .../events/AlertDefinitionDeleteEvent.java      |     2 +-
 .../events/AlertDefinitionDisabledEvent.java    |     2 +-
 .../AlertDefinitionRegistrationEvent.java       |     2 +-
 .../apache/ambari/server/events/AlertEvent.java |     2 +-
 .../events/AlertHashInvalidationEvent.java      |     2 +-
 .../server/events/AlertReceivedEvent.java       |     2 +-
 .../server/events/AlertStateChangeEvent.java    |     2 +-
 .../ambari/server/events/AmbariEvent.java       |     2 +-
 .../events/ClusterConfigChangedEvent.java       |     2 +-
 .../events/ClusterConfigFinishedEvent.java      |     2 +-
 .../ambari/server/events/ClusterEvent.java      |     2 +-
 .../HostComponentVersionAdvertisedEvent.java    |     2 +-
 .../apache/ambari/server/events/HostEvent.java  |     2 +-
 .../server/events/HostRegisteredEvent.java      |     2 +-
 .../ambari/server/events/HostsAddedEvent.java   |     2 +-
 .../ambari/server/events/HostsRemovedEvent.java |     2 +-
 .../ambari/server/events/InitialAlertEvent.java |     2 +-
 .../server/events/MaintenanceModeEvent.java     |     2 +-
 .../events/ServiceComponentInstalledEvent.java  |     2 +-
 .../ServiceComponentRecoveryChangedEvent.java   |     2 +-
 .../ServiceComponentUninstalledEvent.java       |     2 +-
 .../ambari/server/events/ServiceEvent.java      |     2 +-
 .../server/events/ServiceInstalledEvent.java    |     2 +-
 .../server/events/ServiceRemovedEvent.java      |     2 +-
 .../server/events/StackUpgradeFinishEvent.java  |     4 +-
 .../ambari/server/events/TaskCreateEvent.java   |     4 +-
 .../apache/ambari/server/events/TaskEvent.java  |     4 +-
 .../ambari/server/events/TaskUpdateEvent.java   |     4 +-
 .../EntityManagerCacheInvalidationEvent.java    |     2 +-
 .../ambari/server/events/jpa/JPAEvent.java      |     2 +-
 .../alerts/AlertAggregateListener.java          |     2 +-
 .../alerts/AlertDefinitionDisabledListener.java |     2 +-
 .../alerts/AlertHashInvalidationListener.java   |     4 +-
 .../listeners/alerts/AlertHostListener.java     |     2 +-
 .../alerts/AlertLifecycleListener.java          |     4 +-
 .../alerts/AlertMaintenanceModeListener.java    |     4 +-
 .../listeners/alerts/AlertReceivedListener.java |     2 +-
 .../AlertServiceComponentHostListener.java      |     4 +-
 .../alerts/AlertServiceStateListener.java       |     4 +-
 .../alerts/AlertStateChangedListener.java       |     4 +-
 .../listeners/tasks/TaskStatusListener.java     |     5 +-
 .../DistributeRepositoriesActionListener.java   |    21 +-
 .../upgrade/HostVersionOutOfSyncListener.java   |    99 +-
 .../upgrade/StackUpgradeFinishListener.java     |     2 +-
 .../listeners/upgrade/StackVersionListener.java |   162 +-
 .../events/publishers/AlertEventPublisher.java  |     2 +-
 .../events/publishers/AmbariEventPublisher.java |     2 +-
 .../events/publishers/JPAEventPublisher.java    |     2 +-
 .../events/publishers/TaskEventPublisher.java   |     2 +-
 .../publishers/VersionEventPublisher.java       |     2 +-
 .../ambari/server/hooks/AmbariEventFactory.java |     2 +-
 .../apache/ambari/server/hooks/HookContext.java |     2 +-
 .../ambari/server/hooks/HookContextFactory.java |     2 +-
 .../apache/ambari/server/hooks/HookService.java |     2 +-
 .../users/PostUserCreationHookContext.java      |     2 +-
 .../server/hooks/users/UserCreatedEvent.java    |     2 +-
 .../server/hooks/users/UserHookParams.java      |     2 +-
 .../server/hooks/users/UserHookService.java     |     2 +-
 .../server/logging/EclipseLinkLogger.java       |     2 +-
 .../metadata/AmbariServiceAlertDefinitions.java |     2 +-
 .../CachedRoleCommandOrderProvider.java         |     4 +-
 .../server/metadata/RoleCommandOrder.java       |    43 +-
 .../metadata/RoleCommandOrderProvider.java      |     2 +-
 .../ambari/server/metadata/RoleCommandPair.java |     2 +-
 .../server/metrics/system/MetricsService.java   |     2 +-
 .../server/metrics/system/MetricsSink.java      |     2 +-
 .../server/metrics/system/MetricsSource.java    |     4 +-
 .../server/metrics/system/SingleMetric.java     |     2 +-
 .../system/impl/AbstractMetricsSource.java      |     4 +-
 .../system/impl/AmbariMetricSinkImpl.java       |     6 +-
 .../system/impl/AmbariPerformanceMonitor.java   |     6 +-
 .../system/impl/DatabaseMetricsSource.java      |    10 +-
 .../metrics/system/impl/JvmMetricsSource.java   |    16 +-
 .../system/impl/MetricsConfiguration.java       |     4 +-
 .../metrics/system/impl/MetricsServiceImpl.java |     9 +-
 .../server/notifications/DispatchCallback.java  |     2 +-
 .../notifications/DispatchCredentials.java      |     2 +-
 .../server/notifications/DispatchFactory.java   |     2 +-
 .../server/notifications/DispatchRunnable.java  |     4 +-
 .../server/notifications/Notification.java      |     2 +-
 .../notifications/NotificationDispatcher.java   |     2 +-
 .../ambari/server/notifications/Recipient.java  |     2 +-
 .../TargetConfigurationResult.java              |     4 +-
 .../dispatchers/AlertScriptDispatcher.java      |    47 +-
 .../dispatchers/AmbariSNMPDispatcher.java       |     2 +-
 .../dispatchers/EmailDispatcher.java            |     2 +-
 .../dispatchers/SNMPDispatcher.java             |     2 +-
 .../orm/AmbariLocalSessionInterceptor.java      |     2 +-
 .../apache/ambari/server/orm/DBAccessor.java    |    41 +-
 .../ambari/server/orm/DBAccessorImpl.java       |   127 +-
 .../orm/EclipseLinkSessionCustomizer.java       |     2 +-
 .../ambari/server/orm/GuiceJpaInitializer.java  |     2 +-
 .../ambari/server/orm/PersistenceType.java      |     2 +-
 .../ambari/server/orm/TransactionalLocks.java   |     4 +-
 .../orm/cache/ConfigGroupHostMapping.java       |     2 +-
 .../orm/cache/ConfigGroupHostMappingImpl.java   |     2 +-
 .../server/orm/cache/HostConfigMapping.java     |     2 +-
 .../server/orm/cache/HostConfigMappingImpl.java |     2 +-
 .../server/orm/dao/AlertDefinitionDAO.java      |     4 +-
 .../ambari/server/orm/dao/AlertDispatchDAO.java |     2 +-
 .../server/orm/dao/AlertHostSummaryDTO.java     |     2 +-
 .../ambari/server/orm/dao/AlertSummaryDTO.java  |     2 +-
 .../apache/ambari/server/orm/dao/AlertsDAO.java |     2 +-
 .../ambari/server/orm/dao/ArtifactDAO.java      |     2 +-
 .../ambari/server/orm/dao/BlueprintDAO.java     |     2 +-
 .../ambari/server/orm/dao/ClusterDAO.java       |     4 +-
 .../server/orm/dao/ClusterServiceDAO.java       |     2 +-
 .../ambari/server/orm/dao/ClusterStateDAO.java  |     2 +-
 .../server/orm/dao/ClusterVersionDAO.java       |   233 -
 .../orm/dao/ConfigGroupConfigMappingDAO.java    |     2 +-
 .../ambari/server/orm/dao/ConfigGroupDAO.java   |     2 +-
 .../orm/dao/ConfigGroupHostMappingDAO.java      |     2 +-
 .../apache/ambari/server/orm/dao/CrudDAO.java   |     2 +-
 .../ambari/server/orm/dao/ExtensionDAO.java     |     2 +-
 .../ambari/server/orm/dao/ExtensionLinkDAO.java |     2 +-
 .../apache/ambari/server/orm/dao/GroupDAO.java  |     2 +-
 .../server/orm/dao/HostAlertSummaryDTO.java     |     2 +-
 .../orm/dao/HostComponentDesiredStateDAO.java   |     2 +-
 .../server/orm/dao/HostComponentStateDAO.java   |    33 +-
 .../server/orm/dao/HostConfigMappingDAO.java    |     2 +-
 .../apache/ambari/server/orm/dao/HostDAO.java   |     2 +-
 .../server/orm/dao/HostRoleCommandDAO.java      |     7 +-
 .../dao/HostRoleCommandStatusSummaryDTO.java    |     2 +-
 .../ambari/server/orm/dao/HostStateDAO.java     |     2 +-
 .../ambari/server/orm/dao/HostVersionDAO.java   |   189 +-
 .../server/orm/dao/KerberosDescriptorDAO.java   |    34 +-
 .../apache/ambari/server/orm/dao/MemberDAO.java |     2 +-
 .../ambari/server/orm/dao/PrivilegeDAO.java     |     2 +-
 .../server/orm/dao/RemoteAmbariClusterDAO.java  |     2 +-
 .../server/orm/dao/RepositoryVersionDAO.java    |    25 +-
 .../ambari/server/orm/dao/RequestDAO.java       |    21 +-
 .../orm/dao/RequestOperationLevelDAO.java       |     2 +-
 .../orm/dao/RequestScheduleBatchRequestDAO.java |     2 +-
 .../server/orm/dao/RequestScheduleDAO.java      |     2 +-
 .../ambari/server/orm/dao/ResourceDAO.java      |     2 +-
 .../ambari/server/orm/dao/ResourceTypeDAO.java  |     2 +-
 .../dao/ServiceComponentDesiredStateDAO.java    |    54 +-
 .../ambari/server/orm/dao/ServiceConfigDAO.java |    17 +-
 .../server/orm/dao/ServiceDesiredStateDAO.java  |     2 +-
 .../ambari/server/orm/dao/SettingDAO.java       |     2 +-
 .../apache/ambari/server/orm/dao/StackDAO.java  |    16 +-
 .../server/orm/dao/TopologyHostGroupDAO.java    |     2 +-
 .../server/orm/dao/TopologyHostRequestDAO.java  |     2 +-
 .../server/orm/dao/TopologyHostTaskDAO.java     |     6 +-
 .../orm/dao/TopologyLogicalRequestDAO.java      |     6 +-
 .../server/orm/dao/TopologyLogicalTaskDAO.java  |     6 +-
 .../server/orm/dao/TopologyRequestDAO.java      |     2 +-
 .../ambari/server/orm/dao/UpgradeDAO.java       |     2 +-
 .../apache/ambari/server/orm/dao/UserDAO.java   |     2 +-
 .../apache/ambari/server/orm/dao/ViewDAO.java   |     2 +-
 .../ambari/server/orm/dao/ViewInstanceDAO.java  |     2 +-
 .../ambari/server/orm/dao/ViewURLDAO.java       |     2 +-
 .../apache/ambari/server/orm/dao/WidgetDAO.java |     2 +-
 .../ambari/server/orm/dao/WidgetLayoutDAO.java  |     2 +-
 .../server/orm/entities/AlertCurrentEntity.java |     2 +-
 .../orm/entities/AlertDefinitionEntity.java     |     2 +-
 .../server/orm/entities/AlertGroupEntity.java   |     4 +-
 .../server/orm/entities/AlertHistoryEntity.java |     4 +-
 .../server/orm/entities/AlertNoticeEntity.java  |     2 +-
 .../server/orm/entities/AlertTargetEntity.java  |     4 +-
 .../server/orm/entities/ArtifactEntity.java     |     2 +-
 .../server/orm/entities/ArtifactEntityPK.java   |     2 +-
 .../orm/entities/BlueprintConfigEntity.java     |     2 +-
 .../orm/entities/BlueprintConfigEntityPK.java   |     2 +-
 .../server/orm/entities/BlueprintEntity.java    |     2 +-
 .../orm/entities/BlueprintSettingEntity.java    |     2 +-
 .../orm/entities/ClusterConfigEntity.java       |     2 +-
 .../server/orm/entities/ClusterEntity.java      |    25 +-
 .../orm/entities/ClusterServiceEntity.java      |     2 +-
 .../orm/entities/ClusterServiceEntityPK.java    |     2 +-
 .../server/orm/entities/ClusterStateEntity.java |     2 +-
 .../orm/entities/ClusterVersionEntity.java      |   217 -
 .../ConfigGroupConfigMappingEntity.java         |     2 +-
 .../ConfigGroupConfigMappingEntityPK.java       |     2 +-
 .../server/orm/entities/ConfigGroupEntity.java  |     2 +-
 .../entities/ConfigGroupHostMappingEntity.java  |     2 +-
 .../ConfigGroupHostMappingEntityPK.java         |     2 +-
 .../server/orm/entities/ExtensionEntity.java    |     2 +-
 .../orm/entities/ExtensionLinkEntity.java       |     2 +-
 .../ambari/server/orm/entities/GroupEntity.java |     2 +-
 .../HostComponentDesiredStateEntity.java        |    23 +-
 .../orm/entities/HostComponentStateEntity.java  |    24 +-
 .../ambari/server/orm/entities/HostEntity.java  |     2 +-
 .../ambari/server/orm/entities/HostEntity_.java |     4 +-
 .../orm/entities/HostGroupComponentEntity.java  |     2 +-
 .../entities/HostGroupComponentEntityPK.java    |     2 +-
 .../orm/entities/HostGroupConfigEntity.java     |     2 +-
 .../orm/entities/HostGroupConfigEntityPK.java   |     2 +-
 .../server/orm/entities/HostGroupEntity.java    |     2 +-
 .../server/orm/entities/HostGroupEntityPK.java  |     2 +-
 .../server/orm/entities/HostStateEntity.java    |     2 +-
 .../server/orm/entities/HostVersionEntity.java  |    78 +-
 .../orm/entities/LdapSyncEventEntity.java       |     2 +-
 .../server/orm/entities/LdapSyncSpecEntity.java |     2 +-
 .../server/orm/entities/MemberEntity.java       |     2 +-
 .../orm/entities/OperatingSystemEntity.java     |     2 +-
 .../server/orm/entities/PrincipalEntity.java    |     2 +-
 .../orm/entities/PrincipalTypeEntity.java       |    12 +-
 .../orm/entities/RemoteAmbariClusterEntity.java |     2 +-
 .../RemoteAmbariClusterServiceEntity.java       |     2 +-
 .../server/orm/entities/RepositoryEntity.java   |     2 +-
 .../orm/entities/RepositoryVersionEntity.java   |    89 +-
 .../RequestScheduleBatchRequestEntity.java      |     2 +-
 .../RequestScheduleBatchRequestEntityPK.java    |     2 +-
 .../orm/entities/RequestScheduleEntity.java     |     2 +-
 .../server/orm/entities/ResourceEntity.java     |     2 +-
 .../server/orm/entities/ResourceTypeEntity.java |     2 +-
 .../ServiceComponentDesiredStateEntity.java     |   135 +-
 .../entities/ServiceComponentHistoryEntity.java |   181 -
 .../entities/ServiceComponentVersionEntity.java |     2 +-
 .../orm/entities/ServiceConfigEntity.java       |    24 +-
 .../orm/entities/ServiceDesiredStateEntity.java |    87 +-
 .../entities/ServiceDesiredStateEntityPK.java   |     2 +-
 .../server/orm/entities/SettingEntity.java      |     2 +-
 .../orm/entities/TopologyHostGroupEntity.java   |     2 +-
 .../orm/entities/TopologyHostInfoEntity.java    |     2 +-
 .../orm/entities/TopologyHostRequestEntity.java |     2 +-
 .../orm/entities/TopologyHostTaskEntity.java    |     4 +-
 .../entities/TopologyLogicalRequestEntity.java  |     4 +-
 .../orm/entities/TopologyLogicalTaskEntity.java |     4 +-
 .../orm/entities/TopologyRequestEntity.java     |     2 +-
 .../server/orm/entities/UpgradeEntity.java      |   168 +-
 .../server/orm/entities/UpgradeGroupEntity.java |     2 +-
 .../orm/entities/UpgradeHistoryEntity.java      |   233 +
 .../server/orm/entities/UpgradeItemEntity.java  |     2 +-
 .../ambari/server/orm/entities/UserEntity.java  |     2 +-
 .../ambari/server/orm/entities/ViewEntity.java  |     2 +-
 .../server/orm/entities/ViewEntityEntity.java   |     2 +-
 .../orm/entities/ViewInstanceDataEntity.java    |     2 +-
 .../orm/entities/ViewInstanceDataEntityPK.java  |     2 +-
 .../server/orm/entities/ViewInstanceEntity.java |     2 +-
 .../entities/ViewInstancePropertyEntity.java    |     2 +-
 .../entities/ViewInstancePropertyEntityPK.java  |     2 +-
 .../orm/entities/ViewParameterEntity.java       |     2 +-
 .../orm/entities/ViewParameterEntityPK.java     |     2 +-
 .../server/orm/entities/ViewResourceEntity.java |     2 +-
 .../orm/entities/ViewResourceEntityPK.java      |     2 +-
 .../server/orm/entities/ViewURLEntity.java      |     2 +-
 .../server/orm/entities/WidgetEntity.java       |     2 +-
 .../server/orm/entities/WidgetLayoutEntity.java |     4 +-
 .../entities/WidgetLayoutUserWidgetEntity.java  |     4 +-
 .../WidgetLayoutUserWidgetEntityPK.java         |     4 +-
 .../ambari/server/orm/helpers/ScriptRunner.java |    10 +-
 .../server/orm/helpers/dbms/DbmsHelper.java     |    10 +
 .../orm/helpers/dbms/GenericDbmsHelper.java     |    16 +-
 .../server/orm/helpers/dbms/H2Helper.java       |    12 +-
 .../server/orm/models/HostComponentSummary.java |     2 +-
 .../ambari/server/proxy/ProxyService.java       |    11 +-
 .../server/resources/ResourceManager.java       |    13 +-
 .../server/resources/api/rest/GetResource.java  |    16 +-
 .../scheduler/AbstractLinearExecutionJob.java   |     8 +-
 .../ambari/server/scheduler/ExecutionJob.java   |     2 +-
 .../scheduler/ExecutionScheduleManager.java     |    18 +-
 .../server/scheduler/ExecutionScheduler.java    |     2 +-
 .../scheduler/ExecutionSchedulerImpl.java       |     8 +-
 .../server/security/CertificateManager.java     |     8 +-
 .../server/security/ClientSecurityType.java     |     2 +-
 .../security/InternalSSLSocketFactory.java      |   112 +
 .../InternalSSLSocketFactoryNonTrusting.java    |    49 +
 .../InternalSSLSocketFactoryTrusting.java       |    48 +
 .../ambari/server/security/SecurityFilter.java  |    14 +-
 .../ambari/server/security/SecurityHelper.java  |     2 +-
 .../server/security/SecurityHelperImpl.java     |     2 +-
 .../server/security/SignCertResponse.java       |     2 +-
 .../ambari/server/security/SignMessage.java     |     2 +-
 .../authorization/AmbariAuthentication.java     |     2 +-
 .../authorization/AmbariGrantedAuthority.java   |     2 +-
 .../AmbariLdapAuthoritiesPopulator.java         |     2 +-
 .../AmbariLdapBindAuthenticator.java            |     2 +-
 .../authorization/AmbariLocalUserProvider.java  |     2 +-
 .../AmbariPamAuthenticationProvider.java        |     4 +-
 .../authorization/AmbariUserAuthentication.java |     2 +-
 .../AmbariUserAuthorizationFilter.java          |     2 +-
 ...ateLdapUserFoundAuthenticationException.java |     2 +-
 .../security/authorization/GroupType.java       |     2 +-
 .../authorization/LdapServerProperties.java     |     2 +-
 .../PamAuthenticationException.java             |     2 +-
 .../server/security/authorization/User.java     |    12 +
 .../authorization/UserIdAuthentication.java     |     2 +-
 .../server/security/authorization/UserType.java |     2 +-
 .../InternalAuthenticationInterceptor.java      |     2 +-
 .../internal/InternalTokenStorage.java          |     2 +-
 .../RunWithInternalSecurityContext.java         |     2 +-
 .../jwt/JwtAuthenticationFilter.java            |     2 +-
 .../security/encryption/AESEncryptor.java       |    26 +-
 .../encryption/AbstractCredentialStore.java     |     4 +-
 .../security/encryption/CredentialProvider.java |     2 +-
 .../security/encryption/EncryptionResult.java   |     2 +-
 .../security/encryption/MasterKeyService.java   |     2 +-
 .../encryption/MasterKeyServiceImpl.java        |    18 +-
 .../server/security/ldap/LdapBatchDto.java      |     2 +-
 .../server/security/ldap/LdapGroupDto.java      |     2 +-
 .../server/security/ldap/LdapSyncDto.java       |     2 +-
 .../server/security/ldap/LdapUserDto.java       |     2 +-
 .../security/ldap/LdapUserGroupMemberDto.java   |     2 +-
 .../unsecured/rest/CertificateDownload.java     |    13 +-
 .../unsecured/rest/CertificateSign.java         |    12 +-
 .../security/unsecured/rest/ConnectionInfo.java |    13 +-
 .../server/serveraction/ServerAction.java       |     2 +-
 .../serveraction/ServerActionExecutor.java      |     3 +-
 .../kerberos/ADKerberosOperationHandler.java    |    45 +-
 .../AbstractPrepareKerberosServerAction.java    |    19 +-
 .../server/serveraction/kerberos/Component.java |    74 +
 .../kerberos/CreateKeytabFilesServerAction.java |     6 +-
 .../kerberos/DestroyPrincipalsServerAction.java |     2 +-
 .../kerberos/FinalizeKerberosServerAction.java  |    27 +-
 .../kerberos/IPAKerberosOperationHandler.java   |    26 +-
 .../KerberosKDCSSLConnectionException.java      |    45 +
 .../kerberos/KerberosOperationHandler.java      |     6 -
 .../kerberos/KerberosServerAction.java          |    27 +
 .../kerberos/MITKerberosOperationHandler.java   |     2 +-
 .../PrepareDisableKerberosServerAction.java     |     4 +-
 .../kerberos/TrustingSSLSocketFactory.java      |   101 -
 .../UpdateKerberosConfigsServerAction.java      |     5 +-
 .../upgrades/AbstractUpgradeServerAction.java   |    51 +-
 .../upgrades/AutoSkipFailedSummaryAction.java   |    12 +-
 .../upgrades/ComponentVersionCheckAction.java   |    26 +-
 .../serveraction/upgrades/ConfigureAction.java  |    36 +-
 .../upgrades/FinalizeUpgradeAction.java         |   589 +-
 .../FixCapacitySchedulerOrderingPolicy.java     |     2 +-
 .../upgrades/FixYarnWebServiceUrl.java          |     2 +-
 .../upgrades/HiveZKQuorumConfigAction.java      |     2 +-
 .../upgrades/KerberosKeytabsAction.java         |     2 +-
 .../upgrades/ManualStageAction.java             |     2 +-
 .../upgrades/RangerConfigCalculation.java       |     2 +-
 .../RangerKerberosConfigCalculation.java        |     4 +-
 .../upgrades/RangerKmsProxyConfig.java          |     2 +-
 .../upgrades/RangerWebAlertConfigAction.java    |     2 +-
 .../upgrades/UpdateDesiredStackAction.java      |   181 +-
 .../upgrades/ZooKeeperQuorumCalculator.java     |     2 +-
 .../users/CollectionPersisterService.java       |     2 +-
 .../CollectionPersisterServiceFactory.java      |     2 +-
 .../users/CsvFilePersisterService.java          |     2 +-
 .../users/PostUserCreationHookServerAction.java |     2 +-
 .../users/ShellCommandCallableFactory.java      |     2 +-
 .../users/ShellCommandUtilityCallable.java      |     2 +-
 .../users/ShellCommandUtilityWrapper.java       |     2 +-
 .../apache/ambari/server/stack/BaseModule.java  |     2 +-
 .../server/stack/CommonServiceDirectory.java    |    10 +-
 .../ambari/server/stack/ComponentModule.java    |     6 +-
 .../server/stack/ConfigurationDirectory.java    |     2 +-
 .../ambari/server/stack/ConfigurationInfo.java  |     2 +-
 .../server/stack/ConfigurationModule.java       |     2 +-
 .../ambari/server/stack/ExtensionDirectory.java |     4 +-
 .../ambari/server/stack/ExtensionHelper.java    |     2 +-
 .../ambari/server/stack/ExtensionModule.java    |     6 +-
 .../apache/ambari/server/stack/HostsType.java   |     2 +-
 .../ambari/server/stack/MasterHostResolver.java |    77 +-
 .../server/stack/ModuleFileUnmarshaller.java    |     6 +-
 .../apache/ambari/server/stack/ModuleState.java |     2 +-
 .../server/stack/NoSuchStackException.java      |     2 +-
 .../stack/QuickLinksConfigurationModule.java    |     2 +-
 .../apache/ambari/server/stack/RepoUtil.java    |     8 +-
 .../ambari/server/stack/ServiceDirectory.java   |     4 +-
 .../ambari/server/stack/ServiceModule.java      |    12 +-
 .../ambari/server/stack/StackContext.java       |    30 +-
 .../server/stack/StackDefinitionDirectory.java  |     2 +-
 .../server/stack/StackDefinitionModule.java     |     2 +-
 .../ambari/server/stack/StackDirectory.java     |     9 +-
 .../ambari/server/stack/StackManager.java       |    11 +-
 .../server/stack/StackManagerFactory.java       |     2 +-
 .../apache/ambari/server/stack/StackModule.java |    52 +-
 .../server/stack/StackServiceDirectory.java     |    11 +-
 .../apache/ambari/server/stack/ThemeModule.java |     2 +-
 .../stack/UpdateActiveRepoVersionOnStartup.java |    51 +-
 .../apache/ambari/server/stack/Validable.java   |     2 +-
 .../ambari/server/stageplanner/RoleGraph.java   |    53 +-
 .../server/stageplanner/RoleGraphFactory.java   |     2 +-
 .../server/stageplanner/RoleGraphNode.java      |     2 +-
 .../ambari/server/state/AgentVersion.java       |     2 +-
 .../org/apache/ambari/server/state/Alert.java   |     2 +-
 .../ambari/server/state/AlertFirmness.java      |     2 +-
 .../apache/ambari/server/state/AlertState.java  |     2 +-
 .../ambari/server/state/AutoDeployInfo.java     |     2 +-
 .../server/state/BulkCommandDefinition.java     |     2 +-
 .../ambari/server/state/ChangedConfigInfo.java  |     2 +-
 .../apache/ambari/server/state/CheckHelper.java |    39 +-
 .../state/ClientConfigFileDefinition.java       |    17 +-
 .../org/apache/ambari/server/state/Cluster.java |   189 +-
 .../server/state/ClusterHealthReport.java       |    45 +-
 .../apache/ambari/server/state/Clusters.java    |    11 +-
 .../server/state/CommandScriptDefinition.java   |     2 +-
 .../org/apache/ambari/server/state/Config.java  |     2 +-
 .../ambari/server/state/ConfigFactory.java      |    15 +-
 .../ambari/server/state/ConfigHelper.java       |   328 +-
 .../apache/ambari/server/state/ConfigImpl.java  |    27 +-
 .../ambari/server/state/ConfigMergeHelper.java  |     2 +-
 .../server/state/CredentialStoreInfo.java       |     2 +-
 .../server/state/CustomCommandDefinition.java   |     2 +-
 .../server/state/DependencyConditionInfo.java   |     2 +-
 .../ambari/server/state/DependencyInfo.java     |     2 +-
 .../apache/ambari/server/state/ExtensionId.java |     2 +-
 .../ambari/server/state/ExtensionInfo.java      |     2 +-
 .../org/apache/ambari/server/state/Host.java    |     2 +-
 .../server/state/HostComponentAdminState.java   |     2 +-
 .../apache/ambari/server/state/HostEvent.java   |     2 +-
 .../ambari/server/state/HostEventType.java      |     2 +-
 .../ambari/server/state/HostHealthStatus.java   |     2 +-
 .../apache/ambari/server/state/HostState.java   |     2 +-
 .../ambari/server/state/LogDefinition.java      |     2 +-
 .../ambari/server/state/MaintenanceState.java   |     2 +-
 .../ambari/server/state/NotificationState.java  |     2 +-
 .../server/state/OperatingSystemInfo.java       |     2 +-
 .../server/state/PropertyDependencyInfo.java    |     2 +-
 .../ambari/server/state/PropertyInfo.java       |     2 +-
 .../state/PropertyStackUpgradeBehavior.java     |     2 +-
 .../server/state/PropertyUpgradeBehavior.java   |     2 +-
 .../state/QuickLinksConfigurationInfo.java      |    10 +-
 .../ambari/server/state/RepositoryInfo.java     |    22 +-
 .../ambari/server/state/RepositoryType.java     |     2 +-
 .../server/state/RepositoryVersionState.java    |    85 +-
 .../org/apache/ambari/server/state/Service.java |    23 +-
 .../ambari/server/state/ServiceComponent.java   |    14 +-
 .../server/state/ServiceComponentFactory.java   |     5 +-
 .../server/state/ServiceComponentHost.java      |    40 +-
 .../server/state/ServiceComponentHostEvent.java |     2 +-
 .../state/ServiceComponentHostEventType.java    |     2 +-
 .../state/ServiceComponentHostFactory.java      |     2 +-
 .../server/state/ServiceComponentImpl.java      |    97 +-
 .../ambari/server/state/ServiceFactory.java     |    27 +-
 .../apache/ambari/server/state/ServiceImpl.java |   150 +-
 .../apache/ambari/server/state/ServiceInfo.java |    28 +-
 .../ambari/server/state/ServiceOsSpecific.java  |     2 +-
 .../server/state/ServicePropertyInfo.java       |     2 +-
 .../org/apache/ambari/server/state/StackId.java |     2 +-
 .../apache/ambari/server/state/StackInfo.java   |     6 +-
 .../org/apache/ambari/server/state/State.java   |     2 +-
 .../apache/ambari/server/state/ThemeInfo.java   |     2 +-
 .../ambari/server/state/UpgradeContext.java     |  1011 +-
 .../server/state/UpgradeContextFactory.java     |    17 +-
 .../ambari/server/state/UpgradeHelper.java      |   347 +-
 .../ambari/server/state/UpgradeState.java       |     2 +-
 .../server/state/ValueAttributesInfo.java       |    75 +-
 .../ambari/server/state/ValueEntryInfo.java     |     8 +-
 .../ambari/server/state/action/Action.java      |     2 +-
 .../state/action/ActionCompletedEvent.java      |     2 +-
 .../ambari/server/state/action/ActionEvent.java |     2 +-
 .../server/state/action/ActionEventType.java    |     2 +-
 .../server/state/action/ActionFailedEvent.java  |     2 +-
 .../ambari/server/state/action/ActionId.java    |     2 +-
 .../ambari/server/state/action/ActionImpl.java  |    25 +-
 .../server/state/action/ActionInitEvent.java    |     2 +-
 .../state/action/ActionProgressUpdateEvent.java |     2 +-
 .../ambari/server/state/action/ActionState.java |     2 +-
 .../ambari/server/state/action/ActionType.java  |     2 +-
 .../state/alert/AggregateDefinitionMapping.java |     2 +-
 .../server/state/alert/AggregateSource.java     |     2 +-
 .../server/state/alert/AlertDefinition.java     |     2 +-
 .../state/alert/AlertDefinitionFactory.java     |     2 +-
 .../server/state/alert/AlertDefinitionHash.java |    16 +-
 .../ambari/server/state/alert/AlertGroup.java   |     2 +-
 .../server/state/alert/AlertNotification.java   |     2 +-
 .../ambari/server/state/alert/AlertTarget.java  |     2 +-
 .../ambari/server/state/alert/AlertUri.java     |     4 +-
 .../ambari/server/state/alert/AmsSource.java    |     2 +-
 .../ambari/server/state/alert/MetricSource.java |     2 +-
 .../server/state/alert/ParameterizedSource.java |     2 +-
 .../server/state/alert/PercentSource.java       |     2 +-
 .../ambari/server/state/alert/PortSource.java   |     2 +-
 .../server/state/alert/RecoverySource.java      |     2 +-
 .../ambari/server/state/alert/Reporting.java    |     2 +-
 .../apache/ambari/server/state/alert/Scope.java |     2 +-
 .../ambari/server/state/alert/ScriptSource.java |     2 +-
 .../ambari/server/state/alert/ServerSource.java |     2 +-
 .../ambari/server/state/alert/Source.java       |     2 +-
 .../ambari/server/state/alert/SourceType.java   |     2 +-
 .../ambari/server/state/alert/TargetType.java   |     2 +-
 .../ambari/server/state/alert/WebSource.java    |     2 +-
 .../server/state/cluster/ClusterFactory.java    |     2 +-
 .../server/state/cluster/ClusterImpl.java       |  1047 +-
 .../server/state/cluster/ClustersImpl.java      |    91 +-
 .../server/state/configgroup/ConfigGroup.java   |     4 +-
 .../state/configgroup/ConfigGroupFactory.java   |     7 +-
 .../state/configgroup/ConfigGroupImpl.java      |    37 +-
 .../fsm/InvalidStateTransitionException.java    |     2 +-
 .../server/state/fsm/MultipleArcTransition.java |     2 +-
 .../server/state/fsm/SingleArcTransition.java   |     2 +-
 .../ambari/server/state/fsm/StateMachine.java   |     2 +-
 .../server/state/fsm/StateMachineFactory.java   |     2 +-
 .../server/state/fsm/event/AbstractEvent.java   |     2 +-
 .../ambari/server/state/fsm/event/Event.java    |     2 +-
 .../server/state/fsm/event/EventHandler.java    |     2 +-
 .../ambari/server/state/host/HostFactory.java   |     2 +-
 .../state/host/HostHealthyHeartbeatEvent.java   |     2 +-
 .../state/host/HostHeartbeatLostEvent.java      |     2 +-
 .../ambari/server/state/host/HostImpl.java      |    39 +-
 .../host/HostRegistrationRequestEvent.java      |     2 +-
 .../host/HostStatusUpdatesReceivedEvent.java    |     2 +-
 .../state/host/HostUnhealthyHeartbeatEvent.java |     2 +-
 .../kerberos/AbstractKerberosDescriptor.java    |    17 +-
 .../kerberos/KerberosComponentDescriptor.java   |    17 +-
 .../state/kerberos/KerberosDescriptor.java      |    43 +
 .../kerberos/KerberosIdentityDescriptor.java    |    32 +-
 .../kerberos/KerberosPrincipalDescriptor.java   |     2 +-
 .../kerberos/KerberosServiceDescriptor.java     |     8 +-
 .../kerberos/VariableReplacementHelper.java     |    23 +-
 .../server/state/quicklinksprofile/Filter.java  |     4 +-
 .../state/repository/AvailableService.java      |     2 +-
 .../repository/AvailableServiceReference.java   |     2 +-
 .../state/repository/AvailableVersion.java      |     2 +-
 .../state/repository/ManifestService.java       |     2 +-
 .../state/repository/ManifestServiceInfo.java   |     2 +-
 .../ambari/server/state/repository/Release.java |     2 +-
 .../state/repository/VersionDefinitionXml.java  |     2 +-
 .../server/state/repository/package-info.java   |     2 +-
 .../ambari/server/state/scheduler/Batch.java    |     2 +-
 .../server/state/scheduler/BatchRequest.java    |     2 +-
 .../server/state/scheduler/BatchRequestJob.java |     2 +-
 .../state/scheduler/BatchRequestResponse.java   |     2 +-
 .../server/state/scheduler/BatchSettings.java   |     2 +-
 .../state/scheduler/RequestExecution.java       |     2 +-
 .../scheduler/RequestExecutionFactory.java      |     2 +-
 .../state/scheduler/RequestExecutionImpl.java   |     2 +-
 .../ambari/server/state/scheduler/Schedule.java |     2 +-
 .../services/AlertNoticeDispatchService.java    |    88 +-
 .../services/AmbariServerAlertService.java      |     2 +-
 .../state/services/CachedAlertFlushService.java |     4 +-
 .../state/services/MetricsRetrievalService.java |     2 +-
 .../services/RetryUpgradeActionService.java     |    24 +-
 .../server/state/stack/ConfigUpgradePack.java   |     4 +-
 .../server/state/stack/ConfigurationXml.java    |     2 +-
 .../state/stack/ExtensionMetainfoXml.java       |     2 +-
 .../server/state/stack/JsonOsFamilyEntry.java   |     2 +-
 .../server/state/stack/JsonOsFamilyRoot.java    |     2 +-
 .../server/state/stack/LatestRepoCallable.java  |    49 +-
 .../ambari/server/state/stack/Metric.java       |     4 +-
 .../server/state/stack/MetricDefinition.java    |     2 +-
 .../ambari/server/state/stack/OsFamily.java     |    16 +-
 .../server/state/stack/RepositoryXml.java       |     8 +-
 .../server/state/stack/ServiceMetainfoXml.java  |     2 +-
 .../server/state/stack/StackMetainfoXml.java    |     2 +-
 .../state/stack/StackRoleCommandOrder.java      |     4 +-
 .../server/state/stack/TrimmingAdapter.java     |     4 +-
 .../ambari/server/state/stack/UpgradePack.java  |     4 +-
 .../ambari/server/state/stack/WidgetLayout.java |     2 +-
 .../server/state/stack/WidgetLayoutInfo.java    |     2 +-
 .../ambari/server/state/stack/package-info.java |     4 +-
 .../server/state/stack/upgrade/Batch.java       |     2 +-
 .../state/stack/upgrade/ClusterGrouping.java    |    13 +-
 .../state/stack/upgrade/ColocatedGrouping.java  |     4 +-
 .../server/state/stack/upgrade/Condition.java   |     2 +-
 .../upgrade/ConfigUpgradeChangeDefinition.java  |     6 +-
 .../stack/upgrade/ConfigurationCondition.java   |     2 +-
 .../state/stack/upgrade/ConfigureFunction.java  |     2 +-
 .../state/stack/upgrade/ConfigureTask.java      |     6 +-
 .../server/state/stack/upgrade/Direction.java   |    11 +-
 .../state/stack/upgrade/ExecuteHostType.java    |     2 +-
 .../server/state/stack/upgrade/ExecuteTask.java |     6 +-
 .../server/state/stack/upgrade/Grouping.java    |     4 +-
 .../state/stack/upgrade/HostOrderGrouping.java  |    19 +-
 .../state/stack/upgrade/HostOrderItem.java      |     4 +-
 .../server/state/stack/upgrade/ManualTask.java  |     2 +-
 .../state/stack/upgrade/ParallelScheduler.java  |     2 +-
 .../state/stack/upgrade/PropertyKeyState.java   |     2 +-
 .../stack/upgrade/RepositoryVersionHelper.java  |   130 +-
 .../state/stack/upgrade/RestartGrouping.java    |     4 +-
 .../server/state/stack/upgrade/RestartTask.java |     4 +-
 .../state/stack/upgrade/SecurityCondition.java  |     2 +-
 .../state/stack/upgrade/ServerActionTask.java   |     2 +-
 .../stack/upgrade/ServerSideActionTask.java     |     2 +-
 .../stack/upgrade/ServiceCheckGrouping.java     |     7 +-
 .../state/stack/upgrade/ServiceCheckTask.java   |     4 +-
 .../state/stack/upgrade/StageWrapper.java       |     4 +-
 .../stack/upgrade/StageWrapperBuilder.java      |     2 +-
 .../state/stack/upgrade/StartGrouping.java      |     4 +-
 .../server/state/stack/upgrade/StartTask.java   |     4 +-
 .../state/stack/upgrade/StopGrouping.java       |     4 +-
 .../server/state/stack/upgrade/StopTask.java    |     4 +-
 .../ambari/server/state/stack/upgrade/Task.java |     2 +-
 .../server/state/stack/upgrade/TaskWrapper.java |     2 +-
 .../state/stack/upgrade/TaskWrapperBuilder.java |     4 +-
 .../stack/upgrade/TransferCoercionType.java     |     2 +-
 .../state/stack/upgrade/TransferOperation.java  |     2 +-
 .../stack/upgrade/UpdateStackGrouping.java      |     2 +-
 .../state/stack/upgrade/UpgradeFunction.java    |     2 +-
 .../state/stack/upgrade/UpgradeScope.java       |    11 +-
 .../server/state/stack/upgrade/UpgradeType.java |     2 +-
 .../svccomphost/ServiceComponentHostImpl.java   |   223 +-
 .../ServiceComponentHostInstallEvent.java       |     2 +-
 .../ServiceComponentHostOpFailedEvent.java      |     2 +-
 .../ServiceComponentHostOpInProgressEvent.java  |     2 +-
 .../ServiceComponentHostOpRestartedEvent.java   |     2 +-
 .../ServiceComponentHostOpSucceededEvent.java   |     2 +-
 .../ServiceComponentHostStartEvent.java         |     2 +-
 .../ServiceComponentHostStartedEvent.java       |     2 +-
 .../ServiceComponentHostStopEvent.java          |     2 +-
 .../ServiceComponentHostStoppedEvent.java       |     2 +-
 .../ServiceComponentHostSummary.java            |   106 +-
 .../ServiceComponentHostUninstallEvent.java     |     2 +-
 .../ServiceComponentHostUpgradeEvent.java       |     2 +-
 .../ServiceComponentHostWipeoutEvent.java       |     2 +-
 .../server/state/theme/ConfigCondition.java     |    15 +-
 .../server/state/theme/ConfigPlacement.java     |    25 +-
 .../ambari/server/state/theme/Layout.java       |     5 +
 .../ambari/server/state/theme/Section.java      |    22 +-
 .../ambari/server/state/theme/Subsection.java   |    13 +-
 .../apache/ambari/server/state/theme/Tab.java   |    12 +-
 .../ambari/server/state/theme/TabLayout.java    |     8 +-
 .../apache/ambari/server/state/theme/Theme.java |     9 +-
 .../server/state/theme/ThemeConfiguration.java  |    10 +-
 .../apache/ambari/server/state/theme/Unit.java  |     7 +-
 .../ambari/server/state/theme/Widget.java       |    12 +-
 .../ambari/server/state/theme/WidgetEntry.java  |     9 +-
 .../ambari/server/topology/AmbariContext.java   |    61 +-
 .../ambari/server/topology/Blueprint.java       |     5 +-
 .../server/topology/BlueprintFactory.java       |     2 +-
 .../ambari/server/topology/BlueprintImpl.java   |    39 +-
 .../server/topology/BlueprintValidator.java     |     2 +-
 .../server/topology/BlueprintValidatorImpl.java |     4 +-
 .../ambari/server/topology/Cardinality.java     |     2 +-
 .../topology/ClusterConfigurationRequest.java   |     6 +-
 .../ambari/server/topology/ClusterTopology.java |     2 +-
 .../server/topology/ClusterTopologyImpl.java    |     2 +-
 .../ambari/server/topology/Component.java       |     2 +-
 .../ambari/server/topology/Configuration.java   |     2 +-
 .../server/topology/ConfigurationFactory.java   |     2 +-
 .../ambari/server/topology/Credential.java      |     2 +-
 .../ambari/server/topology/HostGroup.java       |     2 +-
 .../ambari/server/topology/HostGroupImpl.java   |     2 +-
 .../ambari/server/topology/HostGroupInfo.java   |     2 +-
 .../ambari/server/topology/HostRequest.java     |    14 +-
 .../topology/InvalidTopologyException.java      |     2 +-
 .../InvalidTopologyTemplateException.java       |     2 +-
 .../topology/KerberosDescriptorFactory.java     |     5 +-
 .../ambari/server/topology/LogicalRequest.java  |    35 +-
 .../server/topology/LogicalRequestFactory.java  |     2 +-
 .../topology/NoSuchBlueprintException.java      |     2 +-
 .../topology/NoSuchHostGroupException.java      |     2 +-
 .../ambari/server/topology/PersistedState.java  |     9 +-
 .../server/topology/PersistedStateImpl.java     |    20 +-
 .../topology/PersistedTopologyRequest.java      |     2 +-
 .../server/topology/RepositorySetting.java      |   116 +
 .../server/topology/SecurityConfiguration.java  |     2 +-
 .../topology/SecurityConfigurationFactory.java  |     2 +-
 .../apache/ambari/server/topology/Setting.java  |     4 +-
 .../ambari/server/topology/SettingFactory.java  |     2 +-
 .../ambari/server/topology/TopologyManager.java |    44 +-
 .../ambari/server/topology/TopologyRequest.java |     2 +-
 .../server/topology/TopologyRequestFactory.java |     2 +-
 .../topology/TopologyRequestFactoryImpl.java    |     2 +-
 .../server/topology/TopologyValidator.java      |     2 +-
 .../topology/tasks/ConfigureClusterTask.java    |     2 +-
 .../tasks/ConfigureClusterTaskFactory.java      |     2 +-
 .../server/topology/tasks/TopologyHostTask.java |     4 +-
 .../server/topology/tasks/TopologyTask.java     |     2 +-
 .../validators/ClusterConfigTypeValidator.java  |     2 +-
 .../RequiredConfigPropertiesValidator.java      |    13 +-
 .../server/upgrade/AbstractUpgradeCatalog.java  |    32 +-
 .../server/upgrade/FinalUpgradeCatalog.java     |    30 +-
 .../server/upgrade/SchemaUpgradeHelper.java     |    15 +-
 .../server/upgrade/StackUpgradeHelper.java      |   171 -
 .../ambari/server/upgrade/StackUpgradeUtil.java |   198 -
 .../server/upgrade/UpgradeCatalog200.java       |   611 -
 .../server/upgrade/UpgradeCatalog210.java       |  1761 -
 .../server/upgrade/UpgradeCatalog211.java       |   295 -
 .../server/upgrade/UpgradeCatalog212.java       |   419 -
 .../server/upgrade/UpgradeCatalog2121.java      |   194 -
 .../server/upgrade/UpgradeCatalog220.java       |  1409 -
 .../server/upgrade/UpgradeCatalog221.java       |   449 -
 .../server/upgrade/UpgradeCatalog222.java       |   751 -
 .../server/upgrade/UpgradeCatalog230.java       |   402 -
 .../server/upgrade/UpgradeCatalog240.java       |  3052 -
 .../server/upgrade/UpgradeCatalog2402.java      |   121 -
 .../server/upgrade/UpgradeCatalog242.java       |   272 -
 .../server/upgrade/UpgradeCatalog250.java       |  1337 -
 .../server/upgrade/UpgradeCatalog251.java       |    54 +-
 .../server/upgrade/UpgradeCatalog252.java       |    63 +-
 .../server/upgrade/UpgradeCatalog300.java       |    53 +-
 .../apache/ambari/server/utils/AmbariPath.java  |     2 +-
 .../ambari/server/utils/CommandUtils.java       |     2 +-
 .../apache/ambari/server/utils/DateUtils.java   |     2 +-
 .../server/utils/EventBusSynchronizer.java      |     2 +-
 .../apache/ambari/server/utils/HTTPUtils.java   |     5 +-
 .../apache/ambari/server/utils/HostAndPort.java |     4 +-
 .../ambari/server/utils/JaxbMapKeyList.java     |     2 +-
 .../server/utils/JaxbMapKeyListAdapter.java     |     2 +-
 .../ambari/server/utils/JaxbMapKeyMap.java      |     2 +-
 .../server/utils/JaxbMapKeyMapAdapter.java      |     2 +-
 .../ambari/server/utils/JaxbMapKeyVal.java      |     2 +-
 .../server/utils/JaxbMapKeyValAdapter.java      |     2 +-
 .../apache/ambari/server/utils/LoopBody.java    |     4 +-
 .../apache/ambari/server/utils/Parallel.java    |     2 +-
 .../ambari/server/utils/ParallelLoopResult.java |     2 +-
 .../ambari/server/utils/RequestUtils.java       |     2 +-
 .../ambari/server/utils/SecretReference.java    |     4 +-
 .../apache/ambari/server/utils/SetUtils.java    |     2 +-
 .../ambari/server/utils/ShellCommandUtil.java   |    31 +-
 .../apache/ambari/server/utils/StageUtils.java  |    70 +-
 .../ambari/server/utils/VersionUtils.java       |     2 +-
 .../apache/ambari/server/view/ClusterImpl.java  |     2 +-
 .../ambari/server/view/DefaultMasker.java       |     2 +-
 .../ambari/server/view/DirectoryWatcher.java    |     2 +-
 .../server/view/HttpImpersonatorImpl.java       |     4 +-
 .../server/view/IllegalClusterException.java    |     2 +-
 .../server/view/ImpersonatorSettingImpl.java    |     2 +-
 .../ambari/server/view/RemoteAmbariCluster.java |     2 +-
 .../view/RemoteAmbariClusterRegistry.java       |     2 +-
 .../RemoteAmbariConfigurationReadException.java |     2 +-
 .../server/view/RemoteAmbariStreamProvider.java |     2 +-
 .../server/view/ViewAmbariStreamProvider.java   |     4 +-
 .../ambari/server/view/ViewArchiveUtility.java  |     2 +-
 .../ambari/server/view/ViewClassLoader.java     |     2 +-
 .../ambari/server/view/ViewContextImpl.java     |     8 +-
 .../view/ViewDataMigrationContextImpl.java      |     8 +-
 .../server/view/ViewDataMigrationUtility.java   |     6 +-
 .../server/view/ViewDirectoryWatcher.java       |     8 +-
 .../view/ViewExternalSubResourceProvider.java   |     2 +-
 .../ambari/server/view/ViewExtractor.java       |    10 +-
 .../server/view/ViewInstanceHandlerList.java    |     2 +-
 .../ambari/server/view/ViewProviderModule.java  |     2 +-
 .../apache/ambari/server/view/ViewRegistry.java |    58 +-
 .../server/view/ViewSubResourceDefinition.java  |     2 +-
 .../server/view/ViewSubResourceProvider.java    |     2 +-
 .../ambari/server/view/ViewThrottleFilter.java  |     2 +-
 .../server/view/ViewURLStreamProvider.java      |    16 +-
 .../server/view/configuration/EntityConfig.java |     2 +-
 .../view/configuration/InstanceConfig.java      |     2 +-
 .../view/configuration/ParameterConfig.java     |     2 +-
 .../view/configuration/PermissionConfig.java    |     2 +-
 .../view/configuration/PersistenceConfig.java   |     2 +-
 .../view/configuration/PropertyConfig.java      |     2 +-
 .../view/configuration/ResourceConfig.java      |     2 +-
 .../server/view/configuration/ViewConfig.java   |     2 +-
 .../ambari/server/view/events/EventImpl.java    |     2 +-
 .../server/view/persistence/DataStoreImpl.java  |     2 +-
 .../view/persistence/DataStoreModule.java       |     4 +-
 .../view/persistence/SchemaManagerFactory.java  |     2 +-
 .../InstanceValidationResultImpl.java           |     2 +-
 .../view/validation/ValidationException.java    |     2 +-
 .../view/validation/ValidationResultImpl.java   |     2 +-
 ambari-server/src/main/python/ambari-server.py  |    28 +-
 .../src/main/python/ambari_server/dbCleanup.py  |    34 +-
 .../ambari_server/dbConfiguration_linux.py      |    61 +-
 .../python/ambari_server/serverConfiguration.py |     6 +
 .../main/python/ambari_server/serverSetup.py    |   105 +-
 .../main/python/ambari_server/serverUpgrade.py  |   162 +-
 .../main/python/ambari_server/setupActions.py   |     3 +-
 .../main/python/ambari_server/setupMpacks.py    |     4 +-
 .../main/python/ambari_server/setupSecurity.py  |     4 -
 .../src/main/python/ambari_server_main.py       |     2 +-
 ambari-server/src/main/python/upgradeHelper.py  |  2338 -
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |    57 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |    54 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |    72 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |    58 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |    61 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |    57 +-
 .../src/main/resources/META-INF/persistence.xml |     4 +-
 .../1.6.1.2.2.0/configuration/accumulo-env.xml  |     5 +
 .../package/scripts/accumulo_configuration.py   |     3 +
 .../1.6.1.2.2.0/package/scripts/params.py       |     5 +-
 .../package/templates/accumulo_jaas.conf.j2     |    29 +
 .../hadoop-metrics2-accumulo.properties.j2      |     2 -
 .../0.1.0/package/scripts/params.py             |     7 +-
 .../0.1.0/package/scripts/setup_infra_solr.py   |    17 +-
 .../AMBARI_INFRA/0.1.0/service_advisor.py       |   133 +
 .../0.1.0/configuration/ams-hbase-env.xml       |     4 +-
 .../0.1.0/package/scripts/params.py             |    10 +-
 .../hadoop-metrics2-hbase.properties.j2         |     2 -
 .../package/templates/hbase_master_jaas.conf.j2 |    10 +
 .../templates/hbase_regionserver_jaas.conf.j2   |    10 +
 .../ATLAS/0.1.0.2.3/package/scripts/metadata.py |     8 +-
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   |     5 +-
 .../configuration/application-properties.xml    |    10 +-
 .../ATLAS/0.7.0.3.0/configuration/atlas-env.xml |     6 +
 .../ATLAS/0.7.0.3.0/package/scripts/params.py   |     4 +-
 .../DRUID/0.9.2/configuration/druid-env.xml     |     2 +-
 .../DRUID/0.9.2/package/scripts/druid.py        |     7 +
 .../DRUID/0.9.2/package/scripts/params.py       |     1 +
 .../1.4.0.2.0/configuration/flume-log4j.xml     |    96 +
 .../FLUME/1.4.0.2.0/package/scripts/flume.py    |     4 +-
 .../templates/flume-metrics2.properties.j2      |     3 -
 .../HBASE/0.96.0.2.0/package/scripts/hbase.py   |    12 +-
 .../0.96.0.2.0/package/scripts/params_linux.py  |     3 +
 ...-metrics2-hbase.properties-GANGLIA-MASTER.j2 |     2 -
 ...doop-metrics2-hbase.properties-GANGLIA-RS.j2 |     2 -
 .../package/templates/hbase_master_jaas.conf.j2 |    10 +
 .../templates/hbase_regionserver_jaas.conf.j2   |    10 +
 .../HBASE/0.96.0.2.0/role_command_order.json    |     3 +-
 .../HBASE/2.0.0.3.0/configuration/hbase-env.xml |     4 +-
 .../package/templates/hbase_master_jaas.conf.j2 |    10 +
 .../templates/hbase_regionserver_jaas.conf.j2   |    10 +
 .../HBASE/2.0.0.3.0/role_command_order.json     |     2 +-
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |     4 -
 .../HDFS/2.1.0.2.0/package/scripts/hdfs.py      |    17 +
 .../2.1.0.2.0/package/scripts/hdfs_namenode.py  |    14 +-
 .../HDFS/2.1.0.2.0/package/scripts/namenode.py  |     2 +-
 .../package/scripts/namenode_upgrade.py         |     2 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |     8 +-
 .../package/templates/hdfs_dn_jaas.conf.j2      |    27 +
 .../package/templates/hdfs_jn_jaas.conf.j2      |    27 +
 .../package/templates/hdfs_nn_jaas.conf.j2      |    27 +
 .../hadoop-metrics2.properties.xml              |     2 -
 .../common-services/HDFS/3.0.0.3.0/metainfo.xml |     4 -
 .../HDFS/3.0.0.3.0/package/scripts/hdfs.py      |    17 +
 .../3.0.0.3.0/package/scripts/hdfs_namenode.py  |    10 +-
 .../HDFS/3.0.0.3.0/package/scripts/namenode.py  |     2 +-
 .../3.0.0.3.0/package/scripts/params_linux.py   |     2 +
 .../HDFS/3.0.0.3.0/package/scripts/utils.py     |     2 +-
 .../package/templates/hdfs_dn_jaas.conf.j2      |    27 +
 .../package/templates/hdfs_jn_jaas.conf.j2      |    27 +
 .../package/templates/hdfs_nn_jaas.conf.j2      |    27 +
 .../HDFS/3.0.0.3.0/service_advisor.py           |    53 +
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml |     2 +-
 .../HIVE/0.12.0.2.0/metainfo.xml                |    20 +-
 .../package/alerts/alert_hive_metastore.py      |    11 +-
 .../package/alerts/alert_llap_app_status.py     |    12 +-
 .../HIVE/0.12.0.2.0/package/scripts/hive.py     |     8 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |     7 +-
 .../hadoop-metrics2-hivemetastore.properties.j2 |     2 -
 .../hadoop-metrics2-hiveserver2.properties.j2   |     2 -
 .../templates/hadoop-metrics2-llapdaemon.j2     |     2 -
 .../hadoop-metrics2-llaptaskscheduler.j2        |     2 -
 .../2.1.0.3.0/configuration/parquet-logging.xml |   106 +
 .../configuration/ranger-hive-security.xml      |     9 +
 .../common-services/HIVE/2.1.0.3.0/metainfo.xml |     7 +
 .../HIVE/2.1.0.3.0/package/scripts/hive.py      |    40 +-
 .../2.1.0.3.0/package/scripts/params_linux.py   |     7 +-
 .../hadoop-metrics2-hivemetastore.properties.j2 |     2 -
 .../hadoop-metrics2-hiveserver2.properties.j2   |     2 -
 .../templates/hadoop-metrics2-llapdaemon.j2     |     2 -
 .../hadoop-metrics2-llaptaskscheduler.j2        |     2 -
 .../HIVE/2.1.0.3.0/service_advisor.py           |    19 +
 .../0.10.0.3.0/configuration/kafka-broker.xml   |    10 -
 .../KAFKA/0.10.0.3.0/kerberos.json              |     3 +
 .../common-services/KAFKA/0.10.0/kerberos.json  |     3 +
 .../KAFKA/0.8.1/configuration/kafka-broker.xml  |    10 -
 .../KAFKA/0.8.1/configuration/kafka-env.xml     |     4 +
 .../0.8.1/configuration/kafka_jaas_conf.xml     |    11 +
 .../0.8.1/package/templates/kafka_jaas.conf.j2  |    11 +
 .../common-services/KAFKA/0.9.0/kerberos.json   |     3 +
 .../package/templates/krb5JAASLogin.conf.j2     |     9 +-
 .../package/templates/krb5JAASLogin.conf.j2     |     9 +-
 .../LOGSEARCH/0.5.0/metainfo.xml                |    24 -
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |     5 +-
 .../package/templates/global.config.json.j2     |     3 +-
 .../package/templates/input.config-nifi.json.j2 |    79 -
 .../properties/audit_logs-solrconfig.xml.j2     |     3 +-
 .../0.5.0/properties/logfeeder-log4j.xml.j2     |     2 +-
 .../0.5.0/properties/logsearch-log4j.xml.j2     |     2 +-
 .../properties/service_logs-solrconfig.xml.j2   |     3 +-
 .../LOGSEARCH/0.5.0/service_advisor.py          |   195 +
 .../package/alerts/alert_check_oozie_server.py  |     8 +-
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py    |     9 +-
 .../common-services/OOZIE/4.2.0.3.0/alerts.json |    45 +
 .../OOZIE/4.2.0.3.0/configuration/oozie-env.xml |   255 +
 .../4.2.0.3.0/configuration/oozie-log4j.xml     |   149 +
 .../4.2.0.3.0/configuration/oozie-site.xml      |   254 +
 .../OOZIE/4.2.0.3.0/kerberos.json               |    70 +
 .../OOZIE/4.2.0.3.0/metainfo.xml                |   203 +
 .../package/alerts/alert_check_oozie_server.py  |   244 +
 .../4.2.0.3.0/package/files/oozieSmoke2.sh      |    84 +
 .../files/prepareOozieHdfsDirectories.sh        |    42 +
 .../4.2.0.3.0/package/files/wrap_ooziedb.sh     |    31 +
 .../scripts/check_oozie_server_status.py        |    38 +
 .../OOZIE/4.2.0.3.0/package/scripts/oozie.py    |   511 +
 .../4.2.0.3.0/package/scripts/oozie_client.py   |    78 +
 .../4.2.0.3.0/package/scripts/oozie_server.py   |   163 +
 .../package/scripts/oozie_server_upgrade.py     |   237 +
 .../4.2.0.3.0/package/scripts/oozie_service.py  |   188 +
 .../OOZIE/4.2.0.3.0/package/scripts/params.py   |    39 +
 .../4.2.0.3.0/package/scripts/params_linux.py   |   374 +
 .../4.2.0.3.0/package/scripts/params_windows.py |    34 +
 .../4.2.0.3.0/package/scripts/service_check.py  |   140 +
 .../4.2.0.3.0/package/scripts/status_params.py  |    65 +
 .../package/templates/adminusers.txt.j2         |    28 +
 .../templates/input.config-oozie.json.j2        |    48 +
 .../package/templates/oozie-log4j.properties.j2 |    93 +
 .../4.2.0.3.0/package/templates/oozie.conf.j2   |    35 +
 .../package/templates/zkmigrator_jaas.conf.j2   |    26 +
 .../OOZIE/4.2.0.3.0/quicklinks/quicklinks.json  |    45 +
 .../OOZIE/4.2.0.3.0/role_command_order.json     |     9 +
 .../OOZIE/4.2.0.3.0/service_advisor.py          |   314 +
 .../OOZIE/4.2.0.3.0/themes/theme.json           |   116 +
 .../PXF/3.0.0/configuration/pxf-profiles.xml    |    25 +
 .../RANGER/0.4.0/package/scripts/params.py      |     5 +-
 .../0.4.0/package/scripts/ranger_admin.py       |    11 +-
 .../0.4.0/package/scripts/setup_ranger_xml.py   |    35 +-
 .../0.5.0/configuration/ranger-ugsync-site.xml  |     3 +
 .../RANGER/0.7.0.3.0/alerts.json                |    76 -
 .../0.7.0.3.0/configuration/admin-log4j.xml     |   132 -
 .../configuration/admin-properties.xml          |   163 -
 .../configuration/atlas-tagsync-ssl.xml         |    72 -
 .../configuration/ranger-admin-site.xml         |   785 -
 .../0.7.0.3.0/configuration/ranger-env.xml      |   513 -
 .../0.7.0.3.0/configuration/ranger-site.xml     |    30 -
 .../configuration/ranger-solr-configuration.xml |    59 -
 .../ranger-tagsync-policymgr-ssl.xml            |    72 -
 .../configuration/ranger-tagsync-site.xml       |   206 -
 .../configuration/ranger-ugsync-site.xml        |   574 -
 .../tagsync-application-properties.xml          |    62 -
 .../0.7.0.3.0/configuration/tagsync-log4j.xml   |    90 -
 .../0.7.0.3.0/configuration/usersync-log4j.xml  |    89 -
 .../configuration/usersync-properties.xml       |    32 -
 .../RANGER/0.7.0.3.0/kerberos.json              |   153 -
 .../RANGER/0.7.0.3.0/metainfo.xml               |   189 -
 .../alerts/alert_ranger_admin_passwd_check.py   |   195 -
 .../RANGER/0.7.0.3.0/package/scripts/params.py  |   448 -
 .../0.7.0.3.0/package/scripts/ranger_admin.py   |   217 -
 .../0.7.0.3.0/package/scripts/ranger_service.py |    69 -
 .../0.7.0.3.0/package/scripts/ranger_tagsync.py |   139 -
 .../package/scripts/ranger_usersync.py          |   124 -
 .../0.7.0.3.0/package/scripts/service_check.py  |    49 -
 .../0.7.0.3.0/package/scripts/setup_ranger.py   |   153 -
 .../package/scripts/setup_ranger_xml.py         |   853 -
 .../0.7.0.3.0/package/scripts/status_params.py  |    39 -
 .../RANGER/0.7.0.3.0/package/scripts/upgrade.py |    31 -
 .../templates/input.config-ranger.json.j2       |    79 -
 .../package/templates/ranger_admin_pam.j2       |    22 -
 .../package/templates/ranger_remote_pam.j2      |    22 -
 .../package/templates/ranger_solr_jaas_conf.j2  |    26 -
 .../properties/ranger-solrconfig.xml.j2         |  1874 -
 .../RANGER/0.7.0.3.0/quicklinks/quicklinks.json |    41 -
 .../RANGER/0.7.0.3.0/role_command_order.json    |     9 -
 .../RANGER/0.7.0.3.0/service_advisor.py         |   793 -
 .../0.7.0.3.0/themes/theme_version_1.json       |   722 -
 .../0.7.0.3.0/themes/theme_version_2.json       |  1470 -
 .../0.7.0.3.0/themes/theme_version_3.json       |   692 -
 .../0.7.0.3.0/themes/theme_version_5.json       |    48 -
 .../RANGER/1.0.0.3.0/alerts.json                |    76 +
 .../1.0.0.3.0/configuration/admin-log4j.xml     |   132 +
 .../configuration/admin-properties.xml          |   161 +
 .../configuration/atlas-tagsync-ssl.xml         |    72 +
 .../configuration/ranger-admin-site.xml         |   751 +
 .../1.0.0.3.0/configuration/ranger-env.xml      |   503 +
 .../configuration/ranger-solr-configuration.xml |    59 +
 .../ranger-tagsync-policymgr-ssl.xml            |    72 +
 .../configuration/ranger-tagsync-site.xml       |   201 +
 .../configuration/ranger-ugsync-site.xml        |   571 +
 .../tagsync-application-properties.xml          |    62 +
 .../1.0.0.3.0/configuration/tagsync-log4j.xml   |    90 +
 .../1.0.0.3.0/configuration/usersync-log4j.xml  |    89 +
 .../RANGER/1.0.0.3.0/kerberos.json              |   153 +
 .../RANGER/1.0.0.3.0/metainfo.xml               |   177 +
 .../alerts/alert_ranger_admin_passwd_check.py   |   195 +
 .../RANGER/1.0.0.3.0/package/scripts/params.py  |   449 +
 .../1.0.0.3.0/package/scripts/ranger_admin.py   |   210 +
 .../1.0.0.3.0/package/scripts/ranger_service.py |    69 +
 .../1.0.0.3.0/package/scripts/ranger_tagsync.py |   139 +
 .../package/scripts/ranger_usersync.py          |   120 +
 .../1.0.0.3.0/package/scripts/service_check.py  |    49 +
 .../package/scripts/setup_ranger_xml.py         |   853 +
 .../1.0.0.3.0/package/scripts/status_params.py  |    39 +
 .../RANGER/1.0.0.3.0/package/scripts/upgrade.py |    31 +
 .../templates/input.config-ranger.json.j2       |    79 +
 .../package/templates/ranger_admin_pam.j2       |    22 +
 .../package/templates/ranger_remote_pam.j2      |    22 +
 .../package/templates/ranger_solr_jaas_conf.j2  |    26 +
 .../properties/ranger-solrconfig.xml.j2         |  1874 +
 .../RANGER/1.0.0.3.0/quicklinks/quicklinks.json |    41 +
 .../RANGER/1.0.0.3.0/role_command_order.json    |     9 +
 .../RANGER/1.0.0.3.0/service_advisor.py         |   774 +
 .../1.0.0.3.0/themes/theme_version_1.json       |  1821 +
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py |     8 +
 .../0.5.0.2.3/package/scripts/kms_server.py     |    10 +-
 .../RANGER_KMS/0.5.0.3.0/alerts.json            |    32 -
 .../0.5.0.3.0/configuration/dbks-site.xml       |   206 -
 .../0.5.0.3.0/configuration/kms-env.xml         |   116 -
 .../0.5.0.3.0/configuration/kms-log4j.xml       |   120 -
 .../0.5.0.3.0/configuration/kms-properties.xml  |   166 -
 .../0.5.0.3.0/configuration/kms-site.xml        |   133 -
 .../configuration/ranger-kms-audit.xml          |   124 -
 .../configuration/ranger-kms-policymgr-ssl.xml  |    68 -
 .../configuration/ranger-kms-security.xml       |    64 -
 .../0.5.0.3.0/configuration/ranger-kms-site.xml |   104 -
 .../RANGER_KMS/0.5.0.3.0/kerberos.json          |    84 -
 .../RANGER_KMS/0.5.0.3.0/metainfo.xml           |   115 -
 .../RANGER_KMS/0.5.0.3.0/package/scripts/kms.py |   677 -
 .../0.5.0.3.0/package/scripts/kms_server.py     |   117 -
 .../0.5.0.3.0/package/scripts/kms_service.py    |    58 -
 .../0.5.0.3.0/package/scripts/params.py         |   331 -
 .../0.5.0.3.0/package/scripts/service_check.py  |    41 -
 .../0.5.0.3.0/package/scripts/status_params.py  |    36 -
 .../0.5.0.3.0/package/scripts/upgrade.py        |    30 -
 .../templates/input.config-ranger-kms.json.j2   |    48 -
 .../0.5.0.3.0/role_command_order.json           |     7 -
 .../RANGER_KMS/0.5.0.3.0/service_advisor.py     |   281 -
 .../0.5.0.3.0/themes/theme_version_1.json       |   303 -
 .../0.5.0.3.0/themes/theme_version_2.json       |   124 -
 .../RANGER_KMS/1.0.0.3.0/alerts.json            |    32 +
 .../1.0.0.3.0/configuration/dbks-site.xml       |   206 +
 .../1.0.0.3.0/configuration/kms-env.xml         |   115 +
 .../1.0.0.3.0/configuration/kms-log4j.xml       |   120 +
 .../1.0.0.3.0/configuration/kms-properties.xml  |   166 +
 .../1.0.0.3.0/configuration/kms-site.xml        |   133 +
 .../configuration/ranger-kms-audit.xml          |   118 +
 .../configuration/ranger-kms-policymgr-ssl.xml  |    68 +
 .../configuration/ranger-kms-security.xml       |    64 +
 .../1.0.0.3.0/configuration/ranger-kms-site.xml |   110 +
 .../RANGER_KMS/1.0.0.3.0/kerberos.json          |    84 +
 .../RANGER_KMS/1.0.0.3.0/metainfo.xml           |   111 +
 .../RANGER_KMS/1.0.0.3.0/package/scripts/kms.py |   675 +
 .../1.0.0.3.0/package/scripts/kms_server.py     |   117 +
 .../1.0.0.3.0/package/scripts/kms_service.py    |    58 +
 .../1.0.0.3.0/package/scripts/params.py         |   331 +
 .../1.0.0.3.0/package/scripts/service_check.py  |    41 +
 .../1.0.0.3.0/package/scripts/status_params.py  |    36 +
 .../1.0.0.3.0/package/scripts/upgrade.py        |    30 +
 .../templates/input.config-ranger-kms.json.j2   |    48 +
 .../1.0.0.3.0/role_command_order.json           |     7 +
 .../RANGER_KMS/1.0.0.3.0/service_advisor.py     |   358 +
 .../1.0.0.3.0/themes/theme_version_1.json       |   409 +
 .../scripts/alerts/alert_spark_thrift_port.py   |     5 +-
 .../scripts/alerts/alert_spark2_thrift_port.py  |     5 +-
 .../STORM/0.9.1/package/scripts/nimbus.py       |     8 +-
 .../STORM/0.9.1/package/scripts/params_linux.py |     2 -
 .../0.9.1/package/scripts/storm_yaml_utils.py   |     5 +-
 .../0.9.1/package/templates/config.yaml.j2      |     3 -
 .../templates/storm-metrics2.properties.j2      |     2 -
 .../0.9.1/package/templates/storm_jaas.conf.j2  |    10 +
 .../1.0.1.3.0/package/scripts/params_linux.py   |     2 -
 .../1.0.1.3.0/package/templates/config.yaml.j2  |     3 -
 .../templates/storm-metrics2.properties.j2      |     2 -
 .../STORM/1.1.0/configuration/storm-site.xml    |    36 +-
 .../common-services/STORM/1.1.0/kerberos.json   |     6 +-
 .../common-services/YARN/2.1.0.2.0/metainfo.xml |     1 +
 .../2.1.0.2.0/package/scripts/params_linux.py   |    32 +-
 .../package/scripts/resourcemanager.py          |     2 +-
 .../YARN/2.1.0.2.0/package/scripts/yarn.py      |    18 +-
 .../package/templates/mapred_jaas.conf.j2       |    28 +
 .../package/templates/yarn_ats_jaas.conf.j2     |    27 +
 .../package/templates/yarn_jaas.conf.j2         |    12 +-
 .../package/templates/yarn_nm_jaas.conf.j2      |    27 +
 .../configuration-mapred/mapred-env.xml         |     4 +-
 .../YARN/3.0.0.3.0/configuration/yarn-env.xml   |    15 +-
 .../YARN/3.0.0.3.0/kerberos.json                |     4 +-
 .../common-services/YARN/3.0.0.3.0/metainfo.xml |     1 +
 .../3.0.0.3.0/package/scripts/params_linux.py   |    32 +-
 .../package/scripts/resourcemanager.py          |     2 +-
 .../YARN/3.0.0.3.0/package/scripts/yarn.py      |    20 +-
 .../package/templates/mapred_jaas.conf.j2       |    28 +
 .../package/templates/yarn_ats_jaas.conf.j2     |    27 +
 .../package/templates/yarn_jaas.conf.j2         |    12 +-
 .../package/templates/yarn_nm_jaas.conf.j2      |    27 +
 .../YARN/3.0.0.3.0/service_advisor.py           |     4 +-
 .../0.6.0.2.5/configuration/zeppelin-config.xml |     7 +
 .../0.6.0.2.5/configuration/zeppelin-env.xml    |     5 +
 .../scripts/interpreter_json_template.py        |   361 +
 .../0.6.0.2.5/package/scripts/master.py         |    40 +-
 .../0.6.0.2.5/package/scripts/params.py         |    23 +
 .../ZEPPELIN/0.6.0.3.0/alerts.json              |    18 +
 .../0.6.0.3.0/configuration/zeppelin-config.xml |   189 +
 .../0.6.0.3.0/configuration/zeppelin-env.xml    |   185 +
 .../configuration/zeppelin-log4j-properties.xml |    37 +
 .../configuration/zeppelin-shiro-ini.xml        |    90 +
 .../ZEPPELIN/0.6.0.3.0/kerberos.json            |    53 +
 .../ZEPPELIN/0.6.0.3.0/metainfo.xml             |   111 +
 .../package/scripts/alert_check_zeppelin.py     |    47 +
 .../package/scripts/livy2_config_template.py    |   107 +
 .../0.6.0.3.0/package/scripts/master.py         |   448 +
 .../0.6.0.3.0/package/scripts/params.py         |   228 +
 .../0.6.0.3.0/package/scripts/service_check.py  |    39 +
 .../package/scripts/spark2_config_template.py   |    84 +
 .../0.6.0.3.0/package/scripts/status_params.py  |    29 +
 .../templates/input.config-zeppelin.json.j2     |    48 +
 .../0.6.0.3.0/quicklinks/quicklinks.json        |    35 +
 .../ZEPPELIN/0.6.0.3.0/role_command_order.json  |     7 +
 .../ZEPPELIN/0.6.0.3.0/service_advisor.py       |   167 +
 .../custom_actions/scripts/install_packages.py  |    94 +-
 .../custom_actions/scripts/ru_set_all.py        |    49 +-
 .../resources/host_scripts/alert_disk_space.py  |    24 +-
 .../host_scripts/alert_version_select.py        |    16 +-
 .../src/main/resources/key_properties.json      |    10 -
 .../src/main/resources/properties.json          |    40 +-
 .../HDP/2.0.6/configuration/cluster-env.xml     |    28 +-
 .../2.0.6/hooks/before-ANY/scripts/params.py    |     2 +
 .../before-ANY/scripts/shared_initialization.py |    30 +-
 .../hooks/before-INSTALL/scripts/params.py      |     2 +
 .../scripts/repo_initialization.py              |    22 +-
 .../2.0.6/hooks/before-START/scripts/params.py  |     4 +
 .../scripts/shared_initialization.py            |    22 +-
 .../templates/hadoop-metrics2.properties.j2     |     2 -
 .../HDP/2.0.6/properties/stack_features.json    |   848 +-
 .../HDP/2.0.6/properties/stack_tools.json       |    16 +-
 .../services/HIVE/configuration/hive-site.xml   |     2 +-
 .../YARN/configuration-mapred/mapred-env.xml    |     4 +-
 .../services/YARN/configuration/yarn-site.xml   |     8 +-
 .../stacks/HDP/2.2/services/stack_advisor.py    |    66 -
 .../services/HBASE/configuration/hbase-env.xml  |     4 +-
 .../services/HDFS/configuration/hadoop-env.xml  |     7 +
 .../services/YARN/configuration/yarn-env.xml    |    16 +-
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |     8 -
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |     6 -
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |     1 -
 .../services/HDFS/configuration/hadoop-env.xml  |     7 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |     6 +-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |     6 -
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |     1 -
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |    20 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |    13 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |     9 +-
 .../resources/stacks/HDP/2.6/repos/repoinfo.xml |    14 +
 .../services/ATLAS/configuration/atlas-env.xml  |     6 +
 .../hadoop-metrics2.properties.xml              |     2 -
 .../HIVE/configuration/parquet-logging.xml      |   106 +
 .../HIVE/configuration/ranger-hive-security.xml |    33 +
 .../HIVE/configuration/tez-interactive-site.xml |    12 +
 .../configuration/spark-thrift-sparkconf.xml    |    40 +
 .../services/SPARK2/configuration/livy2-env.xml |     4 +-
 .../configuration/spark2-thrift-sparkconf.xml   |    40 +
 .../services/STORM/configuration/storm-site.xml |    61 +
 .../stacks/HDP/2.6/services/STORM/metainfo.xml  |     6 +-
 .../YARN/configuration-mapred/mapred-site.xml   |     2 +-
 .../services/YARN/configuration/yarn-env.xml    |    15 +-
 .../services/YARN/configuration/yarn-site.xml   |    15 +-
 .../stacks/HDP/2.6/services/YARN/kerberos.json  |     4 +-
 .../HDP/2.6/services/ZEPPELIN/metainfo.xml      |     2 +-
 .../stacks/HDP/2.6/services/stack_advisor.py    |    57 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |    47 +-
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |    43 +-
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |    35 +-
 .../HDP/3.0/configuration/cluster-env.xml       |    12 +
 .../3.0/hooks/after-INSTALL/scripts/params.py   |    14 +
 .../scripts/shared_initialization.py            |    17 +
 .../HDP/3.0/hooks/before-ANY/scripts/params.py  |     3 +
 .../before-ANY/scripts/shared_initialization.py |    31 +-
 .../3.0/hooks/before-INSTALL/scripts/params.py  |     2 +
 .../scripts/repo_initialization.py              |     8 +
 .../3.0/hooks/before-START/scripts/params.py    |     4 +
 .../scripts/shared_initialization.py            |    22 +-
 .../templates/hadoop-metrics2.properties.j2     |     2 -
 .../main/resources/stacks/HDP/3.0/metainfo.xml  |     2 +-
 .../services/HDFS/configuration/hadoop-env.xml  |     7 +
 .../stacks/HDP/3.0/services/OOZIE/metainfo.xml  |    27 +
 .../stacks/HDP/3.0/services/RANGER/metainfo.xml |     4 +-
 .../HDP/3.0/services/RANGER_KMS/metainfo.xml    |     4 +-
 .../YARN/configuration-mapred/mapred-env.xml    |     4 +-
 .../HDP/3.0/services/ZEPPELIN/metainfo.xml      |    27 +
 .../PERF/1.0/configuration/cluster-env.xml      |    16 +-
 .../PERF/1.0/hooks/before-ANY/scripts/params.py |     3 +
 .../before-ANY/scripts/shared_initialization.py |    23 +-
 .../PERF/1.0/properties/stack_features.json     |    38 +-
 .../stacks/PERF/1.0/properties/stack_tools.json |    16 +-
 .../src/main/resources/stacks/stack_advisor.py  |   118 +-
 .../catalog/UpgradeCatalog_1.3_to_2.2.json      |   948 -
 .../catalog/UpgradeCatalog_2.0_to_2.2.2.json    |   408 -
 .../catalog/UpgradeCatalog_2.0_to_2.2.4.json    |   453 -
 .../catalog/UpgradeCatalog_2.0_to_2.2.json      |   275 -
 .../catalog/UpgradeCatalog_2.1_to_2.2.2.json    |   465 -
 .../catalog/UpgradeCatalog_2.1_to_2.2.4.json    |   499 -
 .../catalog/UpgradeCatalog_2.1_to_2.2.json      |   292 -
 .../catalog/UpgradeCatalog_2.1_to_2.3.json      |   440 -
 .../catalog/UpgradeCatalog_2.2_to_2.3.json      |  2234 -
 .../UpgradeCatalog_2.2_to_2.3_step2.json        |    81 -
 .../apache/ambari/server/H2DatabaseCleaner.java |     2 +-
 .../ambari/server/RandomPortJerseyTest.java     |     2 +-
 .../ambari/server/StateRecoveryManagerTest.java |    68 +-
 .../actionmanager/ActionManagerTestHelper.java  |     2 +-
 .../ExecutionCommandWrapperTest.java            |    11 +-
 .../actionmanager/HostRoleStatusTest.java       |     2 +-
 .../ambari/server/actionmanager/StageTest.java  |     2 +-
 .../actionmanager/TestActionDBAccessorImpl.java |     2 +-
 .../server/actionmanager/TestActionManager.java |     2 +-
 .../actionmanager/TestActionScheduler.java      |     2 +-
 .../TestActionSchedulerThreading.java           |    37 +-
 .../ambari/server/actionmanager/TestStage.java  |     2 +-
 .../ambari/server/agent/AgentHostInfoTest.java  |     2 +-
 .../ambari/server/agent/AgentResourceTest.java  |    10 +-
 .../server/agent/DummyHeartbeatConstants.java   |     1 +
 .../server/agent/HeartbeatProcessorTest.java    |   174 +-
 .../server/agent/HeartbeatTestHelper.java       |    18 +-
 .../server/agent/LocalAgentSimulator.java       |    13 +-
 .../ambari/server/agent/TestActionQueue.java    |     4 +-
 .../server/agent/TestHeartbeatHandler.java      |   122 +-
 .../server/agent/TestHeartbeatMonitor.java      |    45 +-
 .../alerts/AgentHeartbeatAlertRunnableTest.java |     2 +-
 .../alerts/AmbariPerformanceRunnableTest.java   |     2 +-
 .../ComponentVersionAlertRunnableTest.java      |    33 +-
 .../server/alerts/StaleAlertRunnableTest.java   |     2 +-
 .../org/apache/ambari/server/api/TestSuite.java |    12 +-
 .../server/api/UserNameOverrideFilterTest.java  |     2 +-
 .../server/api/handlers/CreateHandlerTest.java  |     2 +-
 .../server/api/handlers/DeleteHandlerTest.java  |     5 +-
 .../api/handlers/QueryCreateHandlerTest.java    |     2 +-
 .../server/api/handlers/ReadHandlerTest.java    |     2 +-
 .../server/api/handlers/UpdateHandlerTest.java  |     4 +-
 .../server/api/predicate/QueryLexerTest.java    |     2 +-
 .../server/api/predicate/QueryParserTest.java   |     2 +-
 .../predicate/operators/AndOperatorTest.java    |     4 +-
 .../predicate/operators/EqualsOperatorTest.java |     4 +-
 .../predicate/operators/FilterOperatorTest.java |     2 +-
 .../operators/GreaterEqualsOperatorTest.java    |     4 +-
 .../operators/GreaterOperatorTest.java          |     4 +-
 .../api/predicate/operators/InOperatorTest.java |     2 +-
 .../operators/IsEmptyOperatorTest.java          |     2 +-
 .../operators/LessEqualsOperatorTest.java       |     4 +-
 .../predicate/operators/LessOperatorTest.java   |     4 +-
 .../operators/NotEqualsOperatorTest.java        |     4 +-
 .../predicate/operators/NotOperatorTest.java    |     4 +-
 .../api/predicate/operators/OrOperatorTest.java |     4 +-
 .../ExtendedResourcePredicateVisitorTest.java   |     2 +-
 .../server/api/query/JpaSortBuilderTest.java    |     2 +-
 .../query/ProcessingPredicateVisitorTest.java   |     2 +-
 .../ambari/server/api/query/QueryImplTest.java  |     2 +-
 .../ambari/server/api/query/QueryInfoTest.java  |     2 +-
 .../query/SubResourcePredicateVisitorTest.java  |     2 +-
 .../render/ClusterBlueprintRendererTest.java    |     2 +-
 .../api/query/render/DefaultRendererTest.java   |     2 +-
 .../render/MetricsPaddingRendererTest.java      |     2 +-
 .../api/query/render/MinimalRendererTest.java   |     2 +-
 .../resources/BaseResourceDefinitionTest.java   |    29 +-
 .../BlueprintResourceDefinitionTest.java        |     2 +-
 .../ClusterResourceDefinitionTest.java          |     2 +-
 ...onentStackVersionResourceDefinitionTest.java |     2 +-
 .../resources/FeedResourceDefinitionTest.java   |     2 +-
 .../resources/HostResourceDefinitionTest.java   |     2 +-
 .../InstanceResourceDefinitionTest.java         |     2 +-
 .../LdapSyncEventResourceDefinitionTest.java    |     2 +-
 .../PermissionResourceDefinitionTest.java       |     2 +-
 .../PrivilegeResourceDefinitionTest.java        |     2 +-
 .../RepositoryResourceDefinitionTest.java       |     2 +-
 ...RepositoryVersionResourceDefinitionTest.java |     2 +-
 .../ResourceInstanceFactoryImplTest.java        |     2 +-
 .../ServiceResourceDefinitionTest.java          |     2 +-
 .../resources/SimpleResourceDefinitionTest.java |     4 +-
 .../StackConfigurationDefinitionTest.java       |     2 +-
 ...ckConfigurationDependencyDefinitionTest.java |     2 +-
 .../StackServiceResourceDefinitionTest.java     |     2 +-
 .../StackVersionResourceDefinitionTest.java     |     2 +-
 .../TargetClusterResourceDefinitionTest.java    |     2 +-
 .../UpgradeResourceDefinitionTest.java          |     4 +-
 .../resources/UserResourceDefinitionTest.java   |     2 +-
 .../ViewExternalSubResourceDefinitionTest.java  |     2 +-
 .../ViewInstanceResourceDefinitionTest.java     |     2 +-
 .../ViewPermissionResourceDefinitionTest.java   |     2 +-
 .../resources/ViewResourceDefinitionTest.java   |     2 +-
 .../ViewVersionResourceDefinitionTest.java      |     2 +-
 .../server/api/services/ActionServiceTest.java  |     2 +-
 .../services/ActiveWidgetLayoutServiceTest.java |    75 -
 .../server/api/services/AmbariMetaInfoTest.java |   269 +-
 .../server/api/services/BaseRequestTest.java    |     2 +-
 .../server/api/services/BaseServiceTest.java    |     2 +-
 .../api/services/BlueprintServiceTest.java      |     4 +-
 .../services/ClusterPrivilegeServiceTest.java   |     4 +-
 .../server/api/services/ClusterServiceTest.java |    30 +-
 .../ClusterStackVersionServiceTest.java         |     4 +-
 .../api/services/ComponentServiceTest.java      |     2 +-
 .../api/services/ConfigGroupServiceTest.java    |     2 +-
 .../api/services/ConfigurationServiceTest.java  |     2 +-
 .../server/api/services/DeleteRequestTest.java  |     2 +-
 .../api/services/DeleteResultMetaDataTest.java  |     2 +-
 .../api/services/ExtensionsServiceTest.java     |     2 +-
 .../server/api/services/FeedServiceTest.java    |     2 +-
 .../server/api/services/GetRequestTest.java     |     2 +-
 .../api/services/GroupPrivilegeServiceTest.java |   111 -
 .../server/api/services/GroupServiceTest.java   |     5 +-
 .../api/services/HostComponentServiceTest.java  |     2 +-
 .../server/api/services/HostServiceTest.java    |     4 +-
 .../services/HostStackVersionServiceTest.java   |     4 +-
 .../api/services/InstanceServiceTest.java       |     2 +-
 .../api/services/LdapSyncEventServiceTest.java  |     2 +-
 .../server/api/services/LoggingServiceTest.java |     2 +-
 .../server/api/services/MemberServiceTest.java  |   110 -
 .../api/services/NamedPropertySetTest.java      |     2 +-
 .../api/services/PermissionServiceTest.java     |     2 +-
 .../server/api/services/PersistServiceTest.java |     8 +-
 .../services/PersistenceManagerImplTest.java    |     4 +-
 .../server/api/services/PostRequestTest.java    |     2 +-
 .../services/PreUpgradeCheckServiceTest.java    |     4 +-
 .../api/services/PrivilegeServiceTest.java      |     2 +-
 .../server/api/services/PutRequestTest.java     |     2 +-
 .../api/services/QueryPostRequestTest.java      |     2 +-
 .../api/services/RecommendationServiceTest.java |     2 +-
 .../api/services/RepositoryServiceTest.java     |     4 +-
 .../server/api/services/RequestBodyTest.java    |     2 +-
 .../server/api/services/RequestFactoryTest.java |     2 +-
 .../api/services/RootServiceServiceTest.java    |    13 +-
 .../server/api/services/ServiceServiceTest.java |     2 +-
 .../server/api/services/SettingServiceTest.java |     4 +-
 .../server/api/services/StacksServiceTest.java  |     2 +-
 .../api/services/TargetClusterServiceTest.java  |     2 +-
 .../services/UpdatePersistenceManagerTest.java  |     2 +-
 .../api/services/UpgradeItemServiceTest.java    |     4 +-
 .../services/UserAuthorizationServiceTest.java  |   100 -
 .../api/services/UserPrivilegeServiceTest.java  |   124 -
 .../api/services/ValidationServiceTest.java     |     2 +-
 .../services/ViewDataMigrationServiceTest.java  |    81 -
 .../ViewExternalSubResourceServiceTest.java     |    50 -
 .../api/services/ViewPermissionServiceTest.java |   101 -
 .../services/ViewSubResourceServiceTest.java    |     3 +-
 .../parsers/BodyParseExceptionTest.java         |     2 +-
 .../parsers/JsonRequestBodyParserTest.java      |     2 +-
 .../serializers/JsonSerializerTest.java         |     2 +-
 .../stackadvisor/StackAdvisorExceptionTest.java |     2 +-
 .../stackadvisor/StackAdvisorHelperTest.java    |    65 +-
 .../StackAdvisorRequestTypeTest.java            |     2 +-
 .../stackadvisor/StackAdvisorRunnerTest.java    |    12 +-
 .../ConfigurationRecommendationCommandTest.java |     7 +-
 .../commands/StackAdvisorCommandTest.java       |    49 +-
 .../views/ViewDataMigrationServiceTest.java     |    81 +
 .../ViewExternalSubResourceServiceTest.java     |    50 +
 .../audit/AccessUnauthorizedAuditEventTest.java |     2 +-
 .../server/audit/LoginAuditEventTest.java       |     2 +-
 .../server/audit/LogoutAuditEventTest.java      |     2 +-
 .../audit/OperationStatusAuditEventTest.java    |     2 +-
 .../StartOperationRequestAuditEventTest.java    |     2 +-
 .../audit/request/AbstractBaseCreator.java      |     2 +-
 .../server/audit/request/AllGetCreator.java     |     2 +-
 .../audit/request/AllPostAndPutCreator.java     |     2 +-
 .../audit/request/DefaultEventCreatorTest.java  |     2 +-
 .../audit/request/PutHostComponentCreator.java  |     2 +-
 .../audit/request/RequestAuditLogModule.java    |     2 +-
 .../audit/request/RequestAuditLoggerTest.java   |     2 +-
 .../request/creator/HostEventCreatorTest.java   |     4 +-
 .../creator/UpgradeEventCreatorTest.java        |     4 +-
 .../server/bootstrap/BootStrapResourceTest.java |     8 +-
 .../ambari/server/bootstrap/BootStrapTest.java  |     8 +-
 .../checks/AutoStartDisabledCheckTest.java      |     2 +-
 ...ardcodedStackVersionPropertiesCheckTest.java |     4 +-
 .../checks/HiveMultipleMetastoreCheckTest.java  |     2 +-
 .../checks/HostsMasterMaintenanceCheckTest.java |     8 +-
 .../server/checks/InstallPackagesCheckTest.java |    26 +-
 ...duce2JobHistoryStatePreservingCheckTest.java |     7 -
 .../checks/PreviousUpgradeCompletedTest.java    |     8 +-
 .../server/checks/RangerPasswordCheckTest.java  |    15 +-
 .../checks/ServiceCheckValidityCheckTest.java   |    45 +-
 .../server/checks/ServicesUpCheckTest.java      |     5 +
 .../server/checks/UpgradeCheckOrderTest.java    |     2 +-
 .../server/checks/VersionMismatchCheckTest.java |     4 +-
 ...nTimelineServerStatePreservingCheckTest.java |    11 -
 .../server/cleanup/CleanupServiceImplTest.java  |    39 +-
 .../ComponentSSLConfigurationTest.java          |     2 +-
 .../configuration/RecoveryConfigHelperTest.java |    53 +-
 .../server/controller/ActionRequestTest.java    |     2 +-
 .../server/controller/ActionResponseTest.java   |     5 +-
 .../AmbariCustomCommandExecutionHelperTest.java |   136 +-
 .../controller/AmbariHandlerListTest.java       |     2 +-
 .../AmbariManagementControllerImplTest.java     |   231 +-
 .../AmbariManagementControllerTest.java         |  1732 +-
 .../server/controller/AmbariServerTest.java     |     2 +-
 .../controller/AmbariSessionManagerTest.java    |     4 +-
 .../BackgroundCustomCommandExecutionTest.java   |    26 +-
 .../server/controller/ClusterRequestTest.java   |    18 +-
 .../server/controller/ClusterResponseTest.java  |    16 +-
 .../server/controller/KerberosHelperTest.java   |   354 +-
 .../server/controller/LdapSyncRequestTest.java  |     2 +-
 .../controller/MaintenanceStateHelperTest.java  |     2 +-
 ...hYarnCapacitySchedulerReleaseConfigTest.java |    76 +-
 .../RootServiceResponseFactoryTest.java         |    11 +-
 .../ServiceConfigVersionResponseTest.java       |     2 +-
 .../controller/StackServiceResponseTest.java    |     2 +-
 .../AbstractControllerResourceProviderTest.java |    34 +-
 .../AbstractDRResourceProviderTest.java         |     2 +-
 .../AbstractJDBCResourceProviderTest.java       |     2 +-
 .../internal/AbstractPropertyProviderTest.java  |     2 +-
 .../internal/AbstractResourceProviderTest.java  |    41 +-
 .../internal/ActionResourceProviderTest.java    |     2 +-
 .../AlertDefinitionResourceProviderTest.java    |     2 +-
 .../AlertGroupResourceProviderTest.java         |     2 +-
 .../AlertHistoryResourceProviderTest.java       |     2 +-
 .../AlertNoticeResourceProviderTest.java        |     2 +-
 .../internal/AlertResourceProviderTest.java     |     2 +-
 .../AlertTargetResourceProviderTest.java        |     2 +-
 .../internal/AppCookieManagerTest.java          |     2 +-
 .../internal/ArtifactResourceProviderTest.java  |     2 +-
 .../AtlasServerHttpPropertyRequestTest.java     |     4 +-
 .../controller/internal/BaseProviderTest.java   |     2 +-
 .../BlueprintConfigurationProcessorTest.java    |    44 +-
 .../internal/BlueprintResourceProviderTest.java |     2 +-
 .../internal/CalculatedStatusTest.java          |     2 +-
 .../ClientConfigResourceProviderTest.java       |    30 +-
 .../internal/ClusterControllerImplTest.java     |     2 +-
 .../internal/ClusterResourceProviderTest.java   |    22 +-
 ...ClusterStackVersionResourceProviderTest.java |   480 +-
 ...leRepositoryVersionResourceProviderTest.java |     5 +-
 .../internal/ComponentResourceProviderTest.java |   110 +-
 .../ConfigGroupResourceProviderTest.java        |     7 +-
 .../ConfigurationResourceProviderTest.java      |     2 +-
 .../CredentialResourceProviderTest.java         |    10 +-
 .../internal/DeleteStatusMetaDataTest.java      |     4 +-
 .../internal/ExportBlueprintRequestTest.java    |     2 +-
 .../internal/ExtensionResourceProviderTest.java |     2 +-
 .../internal/FeedResourceProviderTest.java      |     2 +-
 .../GroupPrivilegeResourceProviderTest.java     |    13 +-
 ...ostComponentProcessResourceProviderTest.java |     2 +-
 .../HostComponentResourceProviderTest.java      |    47 +-
 .../internal/HostResourceProviderTest.java      |   112 +-
 .../HostStackVersionResourceProviderTest.java   |     5 +-
 .../internal/HttpPropertyProviderTest.java      |     2 +-
 .../internal/InstanceResourceProviderTest.java  |     2 +-
 .../internal/JMXHostProviderTest.java           |    34 +-
 .../LdapSyncEventResourceProviderTest.java      |     2 +-
 .../internal/MetricsServiceProviderTest.java    |     2 +-
 .../internal/PageRequestImplTest.java           |     2 +-
 .../internal/PageResponseImplTest.java          |     2 +-
 .../PermissionResourceProviderTest.java         |     2 +-
 .../PreUpgradeCheckResourceProviderTest.java    |    17 +-
 .../internal/PropertyPredicateVisitorTest.java  |     2 +-
 .../internal/ProvisionClusterRequestTest.java   |    21 +-
 .../QuickLinkArtifactResourceProviderTest.java  |     2 +-
 .../RecommendationResourceProviderTest.java     |     4 +-
 .../RemoteClusterResourceProviderTest.java      |     2 +-
 .../RepositoryResourceProviderTest.java         |     7 +-
 .../RepositoryVersionResourceProviderTest.java  |    76 +-
 .../controller/internal/RequestImplTest.java    |    33 +-
 .../internal/RequestOperationLevelTest.java     |     2 +-
 .../internal/RequestResourceProviderTest.java   |    11 +-
 .../RequestScheduleResourceProviderTest.java    |     2 +-
 .../internal/RequestStageContainerTest.java     |     2 +-
 .../internal/RequestStatusImplTest.java         |     2 +-
 .../controller/internal/ResourceImplTest.java   |     2 +-
 ...ootServiceComponentResourceProviderTest.java |    21 +-
 ...erviceHostComponentResourceProviderTest.java |    13 +-
 .../RootServiceResourceProviderTest.java        |     2 +-
 .../internal/ScaleClusterRequestTest.java       |    16 +-
 .../controller/internal/SchemaImplTest.java     |     2 +-
 .../internal/ServiceResourceProviderTest.java   |   121 +-
 .../internal/SettingResourceProviderTest.java   |     2 +-
 .../SimplifyingPredicateVisitorTest.java        |     2 +-
 .../StackAdvisorResourceProviderTest.java       |     2 +-
 .../StackArtifactResourceProviderTest.java      |     2 +-
 ...igurationDependencyResourceProviderTest.java |     2 +-
 .../StackConfigurationResourceProviderTest.java |     2 +-
 .../StackDefinedPropertyProviderTest.java       |    26 +-
 .../StackDependencyResourceProviderTest.java    |     2 +-
 ...kLevelConfigurationResourceProviderTest.java |     2 +-
 .../internal/StackResourceProviderTest.java     |     2 +-
 .../StackServiceResourceProviderTest.java       |     2 +-
 .../server/controller/internal/StackTest.java   |     2 +-
 .../StackUpgradeConfigurationMergeTest.java     |   256 +-
 .../internal/StageResourceProviderTest.java     |     4 +-
 .../TargetClusterResourceProviderTest.java      |     2 +-
 .../internal/TaskResourceProviderTest.java      |     2 +-
 .../internal/TestIvoryProviderModule.java       |     2 +-
 .../controller/internal/TestIvoryService.java   |     2 +-
 .../internal/URLStreamProviderTest.java         |     4 +-
 .../UpgradeResourceProviderHDP22Test.java       |   321 -
 .../internal/UpgradeResourceProviderTest.java   |   460 +-
 .../UpgradeSummaryResourceProviderTest.java     |    21 +-
 .../UserPrivilegeResourceProviderTest.java      |    13 +-
 .../internal/UserResourceProviderDBTest.java    |     2 +-
 .../ValidationResourceProviderTest.java         |     4 +-
 .../VersionDefinitionResourceProviderTest.java  |     2 +-
 .../ViewInstanceResourceProviderTest.java       |     2 +-
 .../ViewPermissionResourceProviderTest.java     |     2 +-
 .../internal/ViewURLResourceProviderTest.java   |     4 +-
 .../WidgetLayoutResourceProviderTest.java       |     2 +-
 .../internal/WidgetResourceProviderTest.java    |     2 +-
 .../server/controller/ivory/ClusterTest.java    |     2 +-
 .../server/controller/ivory/FeedTest.java       |     2 +-
 .../server/controller/ivory/InstanceTest.java   |     2 +-
 .../jdbc/TestJDBCResourceProvider.java          |     2 +-
 .../controller/jmx/TestStreamProvider.java      |     2 +-
 .../logging/LogLevelQueryResponseTest.java      |     2 +-
 .../controller/logging/LogLineResultTest.java   |     2 +-
 .../logging/LogQueryResponseTest.java           |     2 +-
 .../LogSearchDataRetrievalServiceTest.java      |     3 +-
 .../LoggingRequestHelperFactoryImplTest.java    |     2 +-
 .../logging/LoggingRequestHelperImplTest.java   |     2 +-
 .../LoggingSearchPropertyProviderTest.java      |    27 +-
 .../server/controller/logging/UtilsTest.java    |     2 +-
 .../metrics/JMXPropertyProviderTest.java        |    11 +-
 .../RestMetricsPropertyProviderTest.java        |    16 +-
 .../ThreadPoolEnabledPropertyProviderTest.java  |     2 +-
 .../metrics/ganglia/GangliaMetricTest.java      |     6 +-
 .../ganglia/GangliaPropertyProviderTest.java    |     2 +-
 .../GangliaReportPropertyProviderTest.java      |     2 +-
 .../metrics/ganglia/TestHttpUrlConnection.java  |     5 +-
 .../metrics/ganglia/TestStreamProvider.java     |     5 +-
 .../timeline/AMSPropertyProviderTest.java       |    38 +-
 .../timeline/AMSReportPropertyProviderTest.java |     2 +-
 .../timeline/MetricsPaddingMethodTest.java      |     2 +-
 .../timeline/MetricsRequestHelperTest.java      |     2 +-
 .../cache/TimelineMetricCacheSizingTest.java    |     2 +-
 .../timeline/cache/TimelineMetricCacheTest.java |     2 +-
 .../controller/predicate/AndPredicateTest.java  |     2 +-
 .../predicate/CategoryIsEmptyPredicateTest.java |     2 +-
 .../predicate/CategoryPredicateTest.java        |     2 +-
 .../predicate/EqualsPredicateTest.java          |     2 +-
 .../predicate/FilterPredicateTest.java          |     2 +-
 .../predicate/GreaterEqualsPredicateTest.java   |     2 +-
 .../predicate/GreaterPredicateTest.java         |     2 +-
 .../predicate/LessEqualsPredicateTest.java      |     2 +-
 .../controller/predicate/LessPredicateTest.java |     2 +-
 .../controller/predicate/NotPredicateTest.java  |     2 +-
 .../controller/predicate/OrPredicateTest.java   |     2 +-
 .../predicate/PredicateVisitorTest.java         |     2 +-
 .../server/controller/spi/ResourceTest.java     |     2 +-
 ...ThreadPoolExecutorCompletionServiceTest.java |     2 +-
 .../utilities/DatabaseCheckerTest.java          |     2 +-
 .../utilities/KerberosIdentityCleanerTest.java  |   204 +
 .../utilities/PredicateBuilderTest.java         |     2 +-
 .../utilities/PropertyHelperTest.java           |     8 +-
 .../DefaultServiceCalculatedStateTest.java      |     2 +-
 .../state/FlumeServiceCalculatedStateTest.java  |     2 +-
 .../GeneralServiceCalculatedStateTest.java      |    13 +-
 .../state/HBaseServiceCalculatedStateTest.java  |     2 +-
 .../state/HDFSServiceCalculatedStateTest.java   |     2 +-
 .../state/HiveServiceCalculatedStateTest.java   |     2 +-
 .../state/OozieServiceCalculatedStateTest.java  |     2 +-
 .../state/YarnServiceCalculatedStateTest.java   |     2 +-
 .../utilities/webserver/StartServer.java        |     2 +-
 .../credentialapi/CredentialUtilTest.java       |     5 +-
 .../ActionDefinitionManagerTest.java            |     2 +-
 .../apache/ambari/server/events/EventsTest.java |    21 +-
 .../ambari/server/events/MockEventListener.java |     2 +-
 .../listeners/tasks/TaskStatusListenerTest.java |     2 +-
 .../AlertMaintenanceModeListenerTest.java       |     6 +-
 .../HostVersionOutOfSyncListenerTest.java       |   134 +-
 .../upgrade/StackUpgradeFinishListenerTest.java |     4 +-
 .../upgrade/StackVersionListenerTest.java       |    51 +-
 .../publishers/VersionEventPublisherTest.java   |     4 +-
 .../server/hooks/users/UserHookServiceTest.java |     4 +-
 .../metadata/AgentAlertDefinitionsTest.java     |     2 +-
 .../server/metadata/RoleCommandOrderTest.java   |    66 +-
 .../ambari/server/metadata/RoleGraphTest.java   |    25 +-
 .../metric/system/impl/MetricsServiceTest.java  |     4 +-
 .../metric/system/impl/MetricsSourceTest.java   |     4 +-
 .../system/impl/TestAmbariMetricsSinkImpl.java  |     2 +-
 .../metric/system/impl/TestMetricsSource.java   |     4 +-
 .../notifications/DispatchFactoryTest.java      |     2 +-
 .../server/notifications/MockDispatcher.java    |     2 +-
 .../dispatchers/AlertScriptDispatcherTest.java  |    69 +-
 .../dispatchers/AmbariSNMPDispatcherTest.java   |     2 +-
 .../dispatchers/EmailDispatcherTest.java        |     2 +-
 .../dispatchers/SNMPDispatcherTest.java         |     2 +-
 .../ambari/server/orm/AlertDaoHelper.java       |     2 +-
 .../ambari/server/orm/DBAccessorImplTest.java   |    90 +
 .../server/orm/InMemoryDefaultTestModule.java   |     5 +-
 .../ambari/server/orm/JdbcPropertyTest.java     |     2 +-
 .../apache/ambari/server/orm/OrmTestHelper.java |    86 +-
 .../apache/ambari/server/orm/TestOrmImpl.java   |     2 +-
 .../server/orm/dao/AlertDefinitionDAOTest.java  |     2 +-
 .../server/orm/dao/AlertDispatchDAOTest.java    |     2 +-
 .../server/orm/dao/AlertsDAOCachedTest.java     |     2 +-
 .../ambari/server/orm/dao/AlertsDAOTest.java    |     2 +-
 .../ambari/server/orm/dao/BlueprintDAOTest.java |     2 +-
 .../server/orm/dao/ClusterVersionDAOTest.java   |   264 -
 .../server/orm/dao/ConfigGroupDAOTest.java      |     2 +-
 .../ambari/server/orm/dao/CrudDAOTest.java      |     2 +-
 .../ambari/server/orm/dao/GroupDAOTest.java     |     2 +-
 .../dao/HostComponentDesiredStateDAOTest.java   |     4 +-
 .../orm/dao/HostComponentStateDAOTest.java      |     4 +-
 .../orm/dao/HostConfigMappingDAOTest.java       |     2 +-
 .../server/orm/dao/HostRoleCommandDAOTest.java  |     2 +-
 .../server/orm/dao/HostVersionDAOTest.java      |    36 +-
 .../ambari/server/orm/dao/PrincipalDAOTest.java |     2 +-
 .../server/orm/dao/PrincipalTypeDAOTest.java    |     2 +-
 .../orm/dao/RepositoryVersionDAOTest.java       |    39 +-
 .../ambari/server/orm/dao/RequestDAOTest.java   |     2 +-
 .../server/orm/dao/RequestScheduleDAOTest.java  |     2 +-
 .../ambari/server/orm/dao/ResourceDAOTest.java  |     2 +-
 .../server/orm/dao/ResourceTypeDAOTest.java     |     2 +-
 .../server/orm/dao/ServiceConfigDAOTest.java    |    13 +-
 .../ambari/server/orm/dao/SettingDAOTest.java   |     2 +-
 .../ambari/server/orm/dao/StageDAOTest.java     |     2 +-
 .../orm/dao/TopologyLogicalRequestDAOTest.java  |     2 +-
 .../server/orm/dao/TopologyRequestDAOTest.java  |     2 +-
 .../ambari/server/orm/dao/UpgradeDAOTest.java   |    28 +-
 .../ambari/server/orm/dao/UserDAOTest.java      |     2 +-
 .../server/orm/dao/ViewInstanceDAOTest.java     |     2 +-
 .../ambari/server/orm/dao/WidgetDAOTest.java    |     2 +-
 .../server/orm/dao/WidgetLayoutDAOTest.java     |     2 +-
 .../apache/ambari/server/orm/db/DDLTests.java   |     2 +-
 .../orm/entities/AlertCurrentEntityTest.java    |     2 +-
 .../orm/entities/AlertDefinitionEntityTest.java |     2 +-
 .../orm/entities/AlertHistoryEntityTest.java    |     2 +-
 .../entities/BlueprintConfigEntityPKTest.java   |     2 +-
 .../orm/entities/BlueprintConfigEntityTest.java |     2 +-
 .../orm/entities/BlueprintEntityTest.java       |     2 +-
 .../entities/BlueprintSettingEntityTest.java    |     2 +-
 .../server/orm/entities/HostEntityTest.java     |     4 +-
 .../entities/HostGroupComponentEntityTest.java  |     2 +-
 .../entities/HostGroupConfigEntityPKTest.java   |     2 +-
 .../orm/entities/HostGroupConfigEntityTest.java |     2 +-
 .../orm/entities/HostGroupEntityTest.java       |     2 +-
 .../orm/entities/HostRoleCommandEntityTest.java |     2 +-
 .../orm/entities/LdapSyncEventEntityTest.java   |     2 +-
 .../orm/entities/LdapSyncSpecEntityTest.java    |     2 +-
 .../orm/entities/PrincipalEntityTest.java       |     2 +-
 .../orm/entities/PrincipalTypeEntityTest.java   |     2 +-
 .../server/orm/entities/ResourceEntityTest.java |     2 +-
 .../orm/entities/ResourceTypeEntityTest.java    |     2 +-
 .../orm/entities/ServiceConfigEntityTest.java   |     2 +-
 .../server/orm/entities/SettingEntityTest.java  |     2 +-
 .../server/orm/entities/StageEntityTest.java    |     2 +-
 .../orm/entities/ViewEntityEntityTest.java      |     2 +-
 .../server/orm/entities/ViewEntityTest.java     |     2 +-
 .../orm/entities/ViewInstanceEntityTest.java    |     2 +-
 .../ambari/server/proxy/ProxyServiceTest.java   |     2 +-
 .../ambari/server/resources/TestResources.java  |     2 +-
 .../sample/checks/SampleServiceCheck.java       |     4 -
 .../scheduler/ExecutionScheduleManagerTest.java |     2 +-
 .../scheduler/ExecutionSchedulerTest.java       |     2 +-
 .../server/security/CertGenerationTest.java     |     8 +-
 .../server/security/SecurityFilterTest.java     |     2 +-
 .../server/security/SecurityHelperImplTest.java |     2 +-
 .../server/security/SslExecutionTest.java       |     8 +-
 .../authorization/AmbariAuthenticationTest.java |     2 +-
 ...mbariLdapAuthenticationProviderBaseTest.java |     2 +-
 ...uthenticationProviderForDNWithSpaceTest.java |     2 +-
 ...henticationProviderForDuplicateUserTest.java |     2 +-
 .../AmbariLdapAuthenticationProviderTest.java   |     2 +-
 .../AmbariLocalUserProviderTest.java            |     2 +-
 .../AmbariPamAuthenticationProviderTest.java    |     3 +-
 .../AmbariUserAuthenticationFilterTest.java     |     4 +-
 .../AuthorizationHelperInitializer.java         |     2 +-
 .../authorization/AuthorizationHelperTest.java  |     2 +-
 .../authorization/AuthorizationTestModule.java  |     2 +-
 ...thorizationTestModuleForLdapDNWithSpace.java |     2 +-
 .../authorization/LdapServerPropertiesTest.java |     2 +-
 .../TestAmbariLdapAuthoritiesPopulator.java     |     2 +-
 .../security/encryption/AESEncryptorTest.java   |     2 +-
 .../encryption/CredentialProviderTest.java      |     2 +-
 .../encryption/CredentialStoreTest.java         |     2 +-
 .../encryption/MasterKeyServiceTest.java        |     8 +-
 .../ldap/AmbariLdapDataPopulatorTest.java       |     2 +-
 .../ADKerberosOperationHandlerTest.java         |    96 +-
 .../serveraction/kerberos/KDCTypeTest.java      |     4 +-
 .../UpdateKerberosConfigsServerActionTest.java  |     5 +-
 .../AutoSkipFailedSummaryActionTest.java        |    26 +-
 .../ComponentVersionCheckActionTest.java        |   256 +-
 .../upgrades/ConfigureActionTest.java           |   701 +-
 .../FixCapacitySchedulerOrderingPolicyTest.java |     2 +-
 .../upgrades/FixLzoCodecPathTest.java           |     2 +-
 .../upgrades/FixOozieAdminUsersTest.java        |     2 +-
 .../upgrades/FixYarnWebServiceUrlTest.java      |     2 +-
 .../HBaseEnvMaxDirectMemorySizeActionTest.java  |     2 +-
 .../upgrades/HiveEnvClasspathActionTest.java    |     2 +-
 .../upgrades/HiveZKQuorumConfigActionTest.java  |     2 +-
 .../upgrades/KerberosKeytabsActionTest.java     |     2 +-
 .../upgrades/OozieConfigCalculationTest.java    |     2 +-
 .../upgrades/RangerConfigCalculationTest.java   |     2 +-
 .../RangerKerberosConfigCalculationTest.java    |     2 +-
 .../upgrades/RangerKmsProxyConfigTest.java      |     4 +-
 .../RangerWebAlertConfigActionTest.java         |     4 +-
 .../upgrades/UpgradeActionTest.java             |   755 +-
 .../UpgradeUserKerberosDescriptorTest.java      |     2 +-
 .../CsvFilePersisterServiceFunctionalTest.java  |     4 +-
 .../PostUserCreationHookServerActionTest.java   |     4 +-
 .../server/stack/ComponentModuleTest.java       |    27 +-
 .../QuickLinksConfigurationModuleTest.java      |     2 +-
 .../ambari/server/stack/RepoUtilTest.java       |     2 +-
 .../ambari/server/stack/ServiceModuleTest.java  |    33 +-
 .../stack/StackManagerCommonServicesTest.java   |     2 +-
 .../server/stack/StackManagerExtensionTest.java |     2 +-
 .../server/stack/StackManagerMiscTest.java      |     2 +-
 .../ambari/server/stack/StackManagerMock.java   |     2 +-
 .../ambari/server/stack/StackManagerTest.java   |     2 +-
 .../ambari/server/stack/StackModuleTest.java    |     2 +-
 .../ambari/server/stack/ThemeModuleTest.java    |     4 +-
 .../UpdateActiveRepoVersionOnStartupTest.java   |    83 +-
 .../server/stageplanner/TestStagePlanner.java   |   257 +-
 .../apache/ambari/server/state/AlertTest.java   |     2 +-
 .../ambari/server/state/CheckHelperTest.java    |    43 +-
 .../ambari/server/state/ConfigGroupTest.java    |    11 +-
 .../ambari/server/state/ConfigHelperTest.java   |    41 +-
 .../server/state/ConfigMergeHelperTest.java     |     2 +-
 .../ambari/server/state/DesiredConfigTest.java  |     2 +-
 .../ambari/server/state/PropertyInfoTest.java   |     4 +-
 .../server/state/RequestExecutionTest.java      |     2 +-
 .../server/state/ServiceComponentTest.java      |   286 +-
 .../ambari/server/state/ServiceInfoTest.java    |     2 +-
 .../server/state/ServicePropertiesTest.java     |     4 +-
 .../server/state/ServicePropertyInfoTest.java   |     2 +-
 .../apache/ambari/server/state/ServiceTest.java |    78 +-
 .../ambari/server/state/UpgradeHelperTest.java  |   727 +-
 .../ambari/server/state/action/JobTest.java     |     2 +-
 .../alerts/AggregateAlertListenerTest.java      |     2 +-
 .../alerts/AlertDefinitionEqualityTest.java     |     2 +-
 .../state/alerts/AlertDefinitionHashTest.java   |     6 +-
 .../state/alerts/AlertEventPublisherTest.java   |    16 +-
 .../state/alerts/AlertReceivedListenerTest.java |     2 +-
 .../alerts/AlertStateChangedEventTest.java      |     2 +-
 .../state/alerts/InitialAlertEventTest.java     |    18 +-
 .../state/cluster/AlertDataManagerTest.java     |     2 +-
 .../state/cluster/ClusterDeadlockTest.java      |    17 +-
 .../cluster/ClusterEffectiveVersionTest.java    |   305 -
 .../server/state/cluster/ClusterImplTest.java   |    31 +-
 .../server/state/cluster/ClusterTest.java       |   855 +-
 .../state/cluster/ClustersDeadlockTest.java     |    18 +-
 .../server/state/cluster/ClustersImplTest.java  |     4 +-
 .../server/state/cluster/ClustersTest.java      |   117 +-
 .../ConcurrentServiceConfigVersionTest.java     |    17 +-
 ...omponentHostConcurrentWriteDeadlockTest.java |    22 +-
 .../ambari/server/state/host/HostImplTest.java  |     4 +-
 .../ambari/server/state/host/HostTest.java      |    14 +-
 .../state/kerberos/KerberosDescriptorTest.java  |     9 +
 .../kerberos/VariableReplacementHelperTest.java |   130 +-
 .../state/repository/VersionDefinitionTest.java |     2 +-
 .../AlertNoticeDispatchServiceTest.java         |    25 +-
 .../services/CachedAlertFlushServiceTest.java   |     2 +-
 .../services/MetricsRetrievalServiceTest.java   |     2 +-
 .../services/RetryUpgradeActionServiceTest.java |    19 +-
 .../state/stack/ConfigUpgradePackTest.java      |     2 +-
 .../state/stack/ConfigUpgradeValidityTest.java  |     2 +-
 .../ambari/server/state/stack/OSFamilyTest.java |     2 +-
 .../state/stack/UpgradePackParsingTest.java     |     2 +-
 .../server/state/stack/UpgradePackTest.java     |     2 +-
 .../upgrade/RepositoryVersionHelperTest.java    |    29 +-
 .../stack/upgrade/StageWrapperBuilderTest.java  |    32 +-
 .../svccomphost/ServiceComponentHostTest.java   |    71 +-
 .../server/testing/DBInconsistencyTests.java    |     4 +-
 .../server/testing/DeadlockWarningThread.java   |     2 +-
 .../server/testing/DeadlockedThreadsTest.java   |     4 +-
 .../server/topology/AmbariContextTest.java      |     2 +-
 .../server/topology/BlueprintFactoryTest.java   |     2 +-
 .../server/topology/BlueprintImplTest.java      |     2 +-
 .../topology/BlueprintValidatorImplTest.java    |     2 +-
 .../ClusterConfigurationRequestTest.java        |    62 +-
 .../ClusterDeployWithStartOnlyTest.java         |     7 +-
 ...InstallWithoutStartOnComponentLevelTest.java |     7 +-
 .../ClusterInstallWithoutStartTest.java         |     9 +-
 .../topology/ClusterTopologyImplTest.java       |     4 +-
 .../topology/ConfigurationFactoryTest.java      |     2 +-
 .../server/topology/ConfigurationTest.java      |     2 +-
 .../topology/ConfigureClusterTaskTest.java      |     4 +-
 .../server/topology/HostGroupInfoTest.java      |     2 +-
 .../server/topology/LogicalRequestTest.java     |    84 +-
 .../topology/RequiredPasswordValidatorTest.java |     2 +-
 .../SecurityConfigurationFactoryTest.java       |     2 +-
 .../server/topology/SettingFactoryTest.java     |     2 +-
 .../ambari/server/topology/SettingTest.java     |    20 +-
 .../server/topology/TopologyManagerTest.java    |    11 +-
 .../RequiredConfigPropertiesValidatorTest.java  |    35 +-
 .../upgrade/AbstractUpgradeCatalogTest.java     |     8 +-
 .../server/upgrade/StackUpgradeUtilTest.java    |   145 -
 .../server/upgrade/UpgradeCatalog200Test.java   |   923 -
 .../server/upgrade/UpgradeCatalog210Test.java   |  1349 -
 .../server/upgrade/UpgradeCatalog211Test.java   |   445 -
 .../server/upgrade/UpgradeCatalog2121Test.java  |   161 -
 .../server/upgrade/UpgradeCatalog212Test.java   |   687 -
 .../server/upgrade/UpgradeCatalog220Test.java   |  1633 -
 .../server/upgrade/UpgradeCatalog221Test.java   |   614 -
 .../server/upgrade/UpgradeCatalog222Test.java   |  1126 -
 .../server/upgrade/UpgradeCatalog230Test.java   |   317 -
 .../server/upgrade/UpgradeCatalog240Test.java   |  2654 -
 .../server/upgrade/UpgradeCatalog242Test.java   |   450 -
 .../server/upgrade/UpgradeCatalog250Test.java   |  2129 -
 .../server/upgrade/UpgradeCatalog251Test.java   |    14 +-
 .../server/upgrade/UpgradeCatalog300Test.java   |    85 +-
 .../server/upgrade/UpgradeCatalogHelper.java    |    37 +-
 .../server/upgrade/UpgradeCatalogTest.java      |    13 +-
 .../ambari/server/upgrade/UpgradeTest.java      |     2 +-
 .../utils/CollectionPresentationUtils.java      |     2 +-
 .../ambari/server/utils/RequestUtilsTest.java   |     2 +-
 .../ambari/server/utils/SetUtilsTest.java       |     2 +-
 .../ambari/server/utils/StageUtilsTest.java     |   126 +-
 .../utils/SynchronousThreadPoolExecutor.java    |     2 +-
 .../ambari/server/utils/TestDateUtils.java      |     2 +-
 .../ambari/server/utils/TestHTTPUtils.java      |     2 +-
 .../ambari/server/utils/TestJsonUtils.java      |     2 +-
 .../ambari/server/utils/TestParallel.java       |     2 +-
 .../server/utils/TestShellCommandUtil.java      |     2 +-
 .../ambari/server/utils/TestVersionUtils.java   |     2 +-
 .../ambari/server/view/ClusterImplTest.java     |     4 +-
 .../ambari/server/view/DefaultMaskerTest.java   |     2 +-
 .../server/view/HttpImpersonatorImplTest.java   |     2 +-
 .../server/view/RemoteAmbariClusterTest.java    |     2 +-
 .../view/ViewAmbariStreamProviderTest.java      |     4 +-
 .../server/view/ViewArchiveUtilityTest.java     |     4 +-
 .../ambari/server/view/ViewClassLoaderTest.java |     2 +-
 .../ambari/server/view/ViewContextImplTest.java |     2 +-
 .../view/ViewDataMigrationContextImplTest.java  |     2 +-
 .../view/ViewDataMigrationUtilityTest.java      |     2 +-
 .../server/view/ViewDirectoryWatcherTest.java   |     2 +-
 .../ambari/server/view/ViewExtractorTest.java   |     2 +-
 .../ambari/server/view/ViewRegistryTest.java    |    13 +-
 .../view/ViewSubResourceDefinitionTest.java     |     2 +-
 .../view/ViewSubResourceProviderTest.java       |     2 +-
 .../server/view/ViewThrottleFilterTest.java     |     2 +-
 .../server/view/ViewURLStreamProviderTest.java  |     2 +-
 .../view/configuration/EntityConfigTest.java    |     2 +-
 .../view/configuration/InstanceConfigTest.java  |     2 +-
 .../view/configuration/ParameterConfigTest.java |     2 +-
 .../configuration/PermissionConfigTest.java     |     2 +-
 .../configuration/PersistenceConfigTest.java    |     2 +-
 .../view/configuration/PropertyConfigTest.java  |     2 +-
 .../view/configuration/ResourceConfigTest.java  |     2 +-
 .../view/configuration/ViewConfigTest.java      |     2 +-
 .../server/view/events/EventImplTest.java       |     2 +-
 .../view/persistence/DataStoreImplTest.java     |     4 +-
 .../InstanceValidationResultImplTest.java       |     4 +-
 .../validation/ValidationResultImplTest.java    |     4 +-
 .../src/test/python/TestAmbariServer.py         |   261 +-
 .../src/test/python/TestServerUpgrade.py        |    35 +-
 .../src/test/python/TestUpgradeHelper.py        |  1028 -
 ambari-server/src/test/python/TestVersion.py    |    12 +
 .../LOGSEARCH/test_service_advisor.py           |   164 +
 .../common-services/configs/hawq_default.json   |     6 +-
 .../custom_actions/TestInstallPackages.py       |   252 +-
 .../configs/install_packages_config.json        |    19 +-
 .../install_packages_repository_file.json       |   112 +
 .../python/custom_actions/test_ru_set_all.py    |   124 +-
 .../python/host_scripts/TestAlertDiskSpace.py   |    16 +-
 .../python/stacks/2.0.6/FLUME/test_flume.py     |    10 +-
 .../stacks/2.0.6/HBASE/test_hbase_master.py     |    11 +-
 .../python/stacks/2.0.6/HDFS/test_datanode.py   |    10 +
 .../stacks/2.0.6/HDFS/test_journalnode.py       |    11 +-
 .../python/stacks/2.0.6/HDFS/test_namenode.py   |    24 +-
 .../python/stacks/2.0.6/HDFS/test_nfsgateway.py |    10 +
 .../python/stacks/2.0.6/HDFS/test_snamenode.py  |    12 +-
 .../test/python/stacks/2.0.6/HDFS/test_zkfc.py  |    17 +-
 .../2.0.6/HIVE/test_hive_service_check.py       |    14 +-
 .../stacks/2.0.6/YARN/test_historyserver.py     |    12 +-
 .../stacks/2.0.6/YARN/test_mapreduce2_client.py |    10 +
 .../stacks/2.0.6/YARN/test_nodemanager.py       |    10 +
 .../stacks/2.0.6/YARN/test_resourcemanager.py   |    10 +
 .../stacks/2.0.6/YARN/test_yarn_client.py       |    10 +
 .../stacks/2.0.6/common/test_stack_advisor.py   |   155 +-
 .../configs/ha_bootstrap_standby_node.json      |     2 +-
 ...ha_bootstrap_standby_node_initial_start.json |     2 +-
 ...dby_node_initial_start_dfs_nameservices.json |     2 +-
 .../stacks/2.0.6/configs/hbase_with_phx.json    |    12 +
 .../stacks/2.0.6/configs/repository_file.json   |  1275 +
 .../hooks/before-INSTALL/test_before_install.py |    30 +
 .../stacks/2.1/STORM/test_storm_nimbus.py       |    60 +-
 .../stacks/2.1/configs/default-storm-start.json |    14 +
 .../test/python/stacks/2.1/configs/default.json |    13 +
 .../stacks/2.1/configs/secured-storm-start.json |    13 +
 .../test/python/stacks/2.1/configs/secured.json |    15 +-
 .../stacks/2.2/RANGER/test_ranger_admin.py      |     8 +
 .../stacks/2.3/common/test_stack_advisor.py     |   123 -
 .../stacks/2.4/AMBARI_INFRA/test_infra_solr.py  |     3 +
 .../stacks/2.5/RANGER/test_ranger_admin.py      |    10 +
 .../stacks/2.5/RANGER_KMS/test_kms_server.py    |    10 +
 .../stacks/2.5/common/test_stack_advisor.py     |     2 +-
 .../2.5/configs/ranger-admin-default.json       |   990 +-
 .../2.5/configs/ranger-admin-secured.json       |  1108 +-
 .../stacks/2.5/configs/ranger-kms-default.json  |  1158 +-
 .../stacks/2.5/configs/ranger-kms-secured.json  |  1320 +-
 .../test/python/stacks/2.6/DRUID/test_druid.py  |    23 +-
 .../stacks/2.6/RANGER/test_ranger_admin.py      |    10 +
 .../stacks/2.6/common/test_stack_advisor.py     |   123 +-
 .../test/python/stacks/2.6/configs/default.json |     6 +-
 .../2.6/configs/ranger-admin-default.json       |   953 +-
 .../2.6/configs/ranger-admin-secured.json       |  1066 +-
 .../src/test/python/stacks/utils/RMFTestCase.py |    20 +-
 .../stacks/HDP/2.0.6.1/role_command_order.json  |   101 +-
 .../upgrades/upgrade_execute_task_test.xml      |    42 +
 .../upgrades/upgrade_nonrolling_new_stack.xml   |     2 +-
 ambari-serviceadvisor/pom.xml                   |   124 +
 .../ambari/serviceadvisor/ServiceAdvisor.java   |   147 +
 .../ServiceAdvisorCommandType.java              |    63 +
 ambari-utility/checkstyle.xml                   |    38 +
 ambari-utility/pom.xml                          |   145 +
 .../src/main/java/category/AlertTest.java       |    27 +
 .../main/java/category/AmbariUpgradeTest.java   |    27 +
 .../src/main/java/category/BlueprintTest.java   |    27 +
 .../src/main/java/category/FastTest.java        |    27 +
 .../src/main/java/category/KerberosTest.java    |    27 +
 .../src/main/java/category/MetricsTest.java     |    27 +
 .../src/main/java/category/SlowTest.java        |    27 +
 .../main/java/category/StackUpgradeTest.java    |    27 +
 .../apache/ambari/annotations/ApiIgnore.java    |    29 +
 ...AvoidTransactionalOnPrivateMethodsCheck.java |    55 +
 .../UndocumentedRestApiOperationCheck.java      |    76 +
 .../ambari/swagger/AmbariSwaggerReader.java     |   222 +
 .../src/main/resources/checkstyle_packages.xml  |    15 +
 ...dTransactionalOnPrivateMethodsCheckTest.java |    49 +
 .../UndocumentedRestApiOperationCheckTest.java  |    53 +
 .../ambari/swagger/AmbariSwaggerReaderTest.java |   182 +
 .../src/test/resources/log4j.properties         |    19 +
 .../checkstyle/InputRestApiOperation.java       |   138 +
 .../InputTransactionalOnPrivateMethods.java     |    46 +
 ambari-views/examples/weather-view/pom.xml      |     2 +-
 ambari-web/api-docs/css/api-explorer.css        |  2423 +
 ambari-web/api-docs/css/index.css               | 17430 +++++
 ambari-web/api-docs/css/print.css               |  1167 +
 ambari-web/api-docs/css/reset.css               |   125 +
 ambari-web/api-docs/css/screen.css              |     9 +
 ambari-web/api-docs/css/standalone.css          |   293 +
 ambari-web/api-docs/css/typography.css          |    26 +
 .../api-docs/fonts/droid-sans-v6-latin-700.eot  |   Bin 0 -> 22922 bytes
 .../api-docs/fonts/droid-sans-v6-latin-700.svg  |   411 +
 .../api-docs/fonts/droid-sans-v6-latin-700.ttf  |   Bin 0 -> 40513 bytes
 .../api-docs/fonts/droid-sans-v6-latin-700.woff |   Bin 0 -> 25992 bytes
 .../fonts/droid-sans-v6-latin-700.woff2         |   Bin 0 -> 11480 bytes
 .../fonts/droid-sans-v6-latin-regular.eot       |   Bin 0 -> 22008 bytes
 .../fonts/droid-sans-v6-latin-regular.svg       |   403 +
 .../fonts/droid-sans-v6-latin-regular.ttf       |   Bin 0 -> 39069 bytes
 .../fonts/droid-sans-v6-latin-regular.woff      |   Bin 0 -> 24868 bytes
 .../fonts/droid-sans-v6-latin-regular.woff2     |   Bin 0 -> 11304 bytes
 ambari-web/api-docs/images/Swagger_explorer.png |   Bin 0 -> 108087 bytes
 .../api-docs/images/Swagger_explorer_min.png    |   Bin 0 -> 46646 bytes
 ambari-web/api-docs/images/explorer_icons.png   |   Bin 0 -> 5763 bytes
 ambari-web/api-docs/images/favicon-16x16.png    |   Bin 0 -> 645 bytes
 ambari-web/api-docs/images/favicon-32x32.png    |   Bin 0 -> 1654 bytes
 ambari-web/api-docs/images/favicon.ico          |   Bin 0 -> 5430 bytes
 .../api-docs/images/json_editor_integration.png |   Bin 0 -> 63019 bytes
 ambari-web/api-docs/images/logo_small.png       |   Bin 0 -> 770 bytes
 ambari-web/api-docs/images/pet_store_api.png    |   Bin 0 -> 824 bytes
 ambari-web/api-docs/images/senodio.png          |   Bin 0 -> 22838 bytes
 ambari-web/api-docs/images/throbber.gif         |   Bin 0 -> 9257 bytes
 ambari-web/api-docs/images/wordnik_api.png      |   Bin 0 -> 980 bytes
 ambari-web/api-docs/index.html                  |   241 +
 ambari-web/api-docs/lib/backbone-min.js         |    15 +
 ambari-web/api-docs/lib/bootstrap.min.js        |     6 +
 ambari-web/api-docs/lib/handlebars-2.0.0.js     |    28 +
 ambari-web/api-docs/lib/highlight.7.3.pack.js   |     1 +
 ambari-web/api-docs/lib/jquery-1.8.0.min.js     |     2 +
 ambari-web/api-docs/lib/jquery.ba-bbq.min.js    |    18 +
 ambari-web/api-docs/lib/jquery.slideto.min.js   |     1 +
 ambari-web/api-docs/lib/jquery.wiggle.min.js    |     8 +
 ambari-web/api-docs/lib/jsoneditor.js           |  7287 +++
 ambari-web/api-docs/lib/marked.js               |  1272 +
 ambari-web/api-docs/lib/swagger-oauth.js        |   286 +
 ambari-web/api-docs/lib/underscore-min.js       |     6 +
 ambari-web/api-docs/lib/underscore-min.map      |     1 +
 ambari-web/api-docs/o2c.html                    |    20 +
 ambari-web/api-docs/swagger-ui.js               | 22644 +++++++
 ambari-web/api-docs/swagger-ui.min.js           |    12 +
 ambari-web/app/app.js                           |     8 +-
 .../assets/data/stack_versions/upgrades.json    |    17 +-
 ambari-web/app/config.js                        |     9 +-
 .../controllers/global/cluster_controller.js    |     2 +-
 .../global/user_settings_controller.js          |     3 +
 .../global/wizard_watcher_controller.js         |     6 +-
 ambari-web/app/controllers/installer.js         |     8 +-
 .../progress_popup_controller.js                |     2 +-
 .../main/admin/stack_and_upgrade_controller.js  |    51 +-
 .../manage_alert_notifications_controller.js    |    35 +-
 .../app/controllers/main/host/add_controller.js |     3 -
 .../main/host/bulk_operations_controller.js     |    32 +-
 ambari-web/app/controllers/main/host/details.js |    85 +-
 ambari-web/app/controllers/main/service/item.js |     6 +-
 .../main/service/reassign/step3_controller.js   |     1 +
 .../app/controllers/main/views_controller.js    |     4 +-
 ambari-web/app/controllers/wizard.js            |     9 +-
 .../app/controllers/wizard/step7_controller.js  |     3 +
 .../app/controllers/wizard/step8_controller.js  |   183 +-
 ambari-web/app/data/controller_route.js         |     2 +-
 ambari-web/app/mappers/hosts_mapper.js          |     2 +-
 .../app/mappers/repository_version_mapper.js    |     2 +-
 .../app/mappers/stack_upgrade_history_mapper.js |    10 +-
 ambari-web/app/messages.js                      |    63 +-
 .../mixins/common/configs/enhanced_configs.js   |     3 +-
 .../app/mixins/common/widgets/widget_mixin.js   |     3 +-
 .../models/stack_version/repository_version.js  |     2 +-
 .../stack_version/stack_upgrade_history.js      |     4 +-
 ambari-web/app/models/view_instance.js          |     6 +-
 ambari-web/app/routes/add_host_routes.js        |    38 +-
 ambari-web/app/routes/add_service_routes.js     |     2 +-
 ambari-web/app/routes/main.js                   |     2 +-
 ambari-web/app/styles/alerts.less               |    66 +-
 ambari-web/app/styles/application.less          |   125 +-
 ambari-web/app/styles/bootstrap_overrides.less  |    65 +-
 ambari-web/app/styles/common.less               |     1 +
 ambari-web/app/styles/config_history_flow.less  |     7 +-
 ambari-web/app/styles/dashboard.less            |   116 +-
 .../app/styles/enhanced_service_dashboard.less  |    79 +-
 .../app/styles/theme/bootstrap-ambari.css       |    34 +-
 ambari-web/app/templates/common/progress.hbs    |     4 +
 .../templates/common/widget/gauge_widget.hbs    |    33 +-
 .../templates/common/widget/graph_widget.hbs    |    44 +-
 .../templates/common/widget/number_widget.hbs   |    33 +-
 .../templates/common/widget/template_widget.hbs |    35 +-
 ambari-web/app/templates/main.hbs               |     2 +-
 .../app/templates/main/admin/kerberos.hbs       |    34 +-
 .../admin/stack_upgrade/upgrade_history.hbs     |    14 +-
 .../main/alerts/create_alert_notification.hbs   |    14 +
 ambari-web/app/templates/main/dashboard.hbs     |     2 +-
 .../main/dashboard/widgets/cluster_metrics.hbs  |    25 +-
 .../main/dashboard/widgets/hbase_links.hbs      |    15 +-
 .../main/dashboard/widgets/hdfs_links.hbs       |    17 +-
 .../main/dashboard/widgets/pie_chart.hbs        |    21 +-
 .../main/dashboard/widgets/simple_text.hbs      |    21 +-
 .../templates/main/dashboard/widgets/uptime.hbs |    16 +-
 .../main/dashboard/widgets/yarn_links.hbs       |    18 +-
 .../main/host/delete_hosts_result_popup.hbs     |     8 +-
 .../main/service/all_services_actions.hbs       |     6 +-
 .../app/templates/main/service/info/summary.hbs |    91 +-
 .../main/service/info/summary/base.hbs          |    13 +-
 .../service/info/summary/client_components.hbs  |    10 +-
 .../service/info/summary/master_components.hbs  |    26 +-
 .../service/info/summary/slave_components.hbs   |    12 +-
 ambari-web/app/templates/main/service/item.hbs  |    40 +-
 .../app/templates/main/service/menu_item.hbs    |    11 +-
 .../templates/main/service/services/hbase.hbs   |   128 +-
 .../templates/main/service/services/hdfs.hbs    |   270 +-
 .../templates/main/service/services/hive.hbs    |    13 +-
 .../templates/main/service/services/ranger.hbs  |    59 +-
 .../templates/main/service/services/storm.hbs   |   118 +-
 .../templates/main/service/services/yarn.hbs    |   194 +-
 .../app/templates/main/side-menu-item.hbs       |     6 +-
 ambari-web/app/templates/wizard/step4.hbs       |    16 +-
 ambari-web/app/templates/wizard/step6.hbs       |     2 +-
 ambari-web/app/templates/wizard/step8.hbs       |     2 +-
 ambari-web/app/utils/ajax/ajax.js               |    12 +-
 ambari-web/app/utils/array_utils.js             |     6 +-
 ambari-web/app/utils/config.js                  |     2 +-
 ambari-web/app/utils/db.js                      |    14 +-
 ambari-web/app/utils/validator.js               |     8 +
 ambari-web/app/views/common/chart/pie.js        |    10 +-
 .../configs/service_config_container_view.js    |     2 +-
 .../app/views/common/quick_view_link_view.js    |    14 +-
 .../views/common/widget/gauge_widget_view.js    |    14 +-
 ambari-web/app/views/loading.js                 |     2 +-
 ambari-web/app/views/main/admin.js              |    14 +-
 .../views/main/admin/kerberos/disable_view.js   |     3 +-
 .../main/admin/stack_upgrade/services_view.js   |     2 +-
 .../admin/stack_upgrade/upgrade_history_view.js |    42 +-
 .../stack_upgrade/upgrade_version_box_view.js   |    14 +-
 .../upgrade_version_column_view.js              |     2 +-
 .../admin/stack_upgrade/upgrade_wizard_view.js  |     2 +-
 .../main/admin/stack_upgrade/versions_view.js   |     2 +-
 .../main/alerts/definition_details_view.js      |     2 +-
 ambari-web/app/views/main/dashboard/widgets.js  |     2 +-
 .../dashboard/widgets/cluster_metrics_widget.js |     3 -
 .../main/dashboard/widgets/pie_chart_widget.js  |    23 +-
 ambari-web/app/views/main/host.js               |     8 +-
 ambari-web/app/views/main/menu.js               |    28 +-
 .../app/views/main/service/info/summary.js      |    24 +
 ambari-web/app/views/main/service/item.js       |     2 +-
 ambari-web/app/views/main/service/menu.js       |     4 -
 ambari-web/app/views/main/service/service.js    |    13 +-
 .../app/views/main/service/services/hbase.js    |     2 +-
 .../app/views/main/service/services/hdfs.js     |    19 +-
 .../app/views/main/service/services/yarn.js     |     3 +-
 ambari-web/app/views/wizard/step4_view.js       |     7 +-
 ambari-web/brunch-config.js                     |     3 +-
 ambari-web/pom.xml                              |    66 +-
 ambari-web/test/app_test.js                     |    10 +-
 .../global/wizard_watcher_controller_test.js    |     3 +-
 .../admin/stack_and_upgrade_controller_test.js  |    72 +-
 ...anage_alert_notifications_controller_test.js |    38 +-
 .../main/host/add_controller_test.js            |    19 -
 .../test/controllers/main/host/details_test.js  |    64 +-
 .../controllers/main/views_controller_test.js   |    14 +-
 .../test/controllers/wizard/step8_test.js       |    82 +-
 ambari-web/test/controllers/wizard_test.js      |     4 -
 .../stack_upgrade_history_mapper_test.js        |    32 +-
 .../test/mixins/common/widget_mixin_test.js     |     2 +
 ambari-web/test/models/view_instance_test.js    |     6 +-
 ambari-web/test/utils/config_test.js            |     2 +-
 .../common/widget/gauge_widget_view_test.js     |     2 +-
 .../admin/stack_upgrade/services_view_test.js   |     1 +
 .../stack_upgrade/upgrade_history_view_test.js  |    83 +-
 .../upgrade_version_box_view_test.js            |    43 +-
 .../stack_upgrade/upgrade_wizard_view_test.js   |     2 +-
 .../admin/stack_upgrade/version_view_test.js    |     6 +-
 .../main/alerts/definition_details_view_test.js |     2 +-
 .../test/views/main/dashboard/widgets_test.js   |     4 +-
 ambari-web/test/views/main/host_test.js         |     4 +-
 ambari-web/test/views/main/service/menu_test.js |    12 -
 .../vendor/scripts/theme/bootstrap-ambari.js    |    20 +-
 .../stacks/HDF/2.0/services/KAFKA/kerberos.json |     3 +
 .../src/main/assemblies/odpi-ambari-mpack.xml   |     2 +-
 .../stacks/ODPi/2.0/services/stack_advisor.py   |     2 +-
 .../addon/components/directory-viewer.js        |   324 +-
 .../hdfs-directory-viewer/addon/styles/app.css  |   190 +
 .../templates/components/directory-viewer.hbs   |   145 +
 .../addon/utils/viewer-config.js                |     4 +
 .../ui/hdfs-directory-viewer/bower.json         |     1 -
 .../resources/ui/hdfs-directory-viewer/index.js |     3 -
 .../ui/hdfs-directory-viewer/package.json       |     5 +-
 .../view/filebrowser/DownloadService.java       |    13 +-
 contrib/views/hawq/pom.xml                      |     2 +-
 contrib/views/hive-next/pom.xml                 |     4 +-
 .../ambari/view/hive2/actor/DeathWatch.java     |     5 +-
 .../view/hive2/client/NonPersistentCursor.java  |     4 +-
 .../hive2/resources/uploads/UploadService.java  |     4 +-
 .../src/main/resources/ui/hive-web/Brocfile.js  |     1 +
 .../ui/hive-web/vendor/browser-pollyfills.js    |   213 +
 contrib/views/hive20/pom.xml                    |     4 +-
 .../ambari/view/hive20/actor/DeathWatch.java    |     7 +-
 .../view/hive20/client/NonPersistentCursor.java |     4 +-
 .../main/resources/ui/app/models/worksheet.js   |     1 +
 .../resources/ui/app/routes/queries/query.js    |    15 +-
 .../ui/app/routes/queries/query/results.js      |     6 +-
 .../src/main/resources/ui/app/styles/app.scss   |     1 +
 .../templates/components/query-result-table.hbs |    92 +-
 .../ui/app/templates/queries/query.hbs          |    10 +-
 .../ui/app/templates/queries/query/log.hbs      |    12 +-
 .../ui/app/templates/queries/query/results.hbs  |     9 +-
 .../src/main/resources/ui/ember-cli-build.js    |     1 +
 .../resources/ui/vendor/browser-pollyfills.js   |   213 +
 contrib/views/pig/pom.xml                       |     2 +-
 contrib/views/pom.xml                           |     1 -
 contrib/views/slider/docs/index.md              |   164 -
 contrib/views/slider/gzip-content.cmd           |    17 -
 contrib/views/slider/gzip-content.ps1           |    81 -
 contrib/views/slider/pom.xml                    |   463 -
 .../apache/ambari/view/slider/AlertField.java   |    62 -
 .../apache/ambari/view/slider/AlertState.java   |    40 -
 .../ambari/view/slider/MetricsHolder.java       |    44 -
 .../apache/ambari/view/slider/SliderApp.java    |   198 -
 .../ambari/view/slider/SliderAppComponent.java  |    62 -
 .../ambari/view/slider/SliderAppType.java       |   107 -
 .../view/slider/SliderAppTypeComponent.java     |   103 -
 .../slider/SliderAppTypesResourceProvider.java  |    94 -
 .../ambari/view/slider/SliderAppsAlerts.java    |   127 -
 .../view/slider/SliderAppsConfiguration.java    |    52 -
 .../view/slider/SliderAppsResourceProvider.java |   124 -
 .../view/slider/SliderAppsViewController.java   |   112 -
 .../slider/SliderAppsViewControllerImpl.java    |  1510 -
 .../apache/ambari/view/slider/TemporalInfo.java |    48 -
 .../apache/ambari/view/slider/ViewStatus.java   |    72 -
 .../view/slider/clients/AmbariClient.java       |    58 -
 .../view/slider/clients/AmbariCluster.java      |    52 -
 .../view/slider/clients/AmbariClusterInfo.java  |    40 -
 .../slider/clients/AmbariHostComponent.java     |    49 -
 .../view/slider/clients/AmbariHostInfo.java     |    32 -
 .../view/slider/clients/AmbariService.java      |    36 -
 .../view/slider/clients/AmbariServiceInfo.java  |    51 -
 .../slider/rest/SliderAppTypesResource.java     |    54 -
 .../view/slider/rest/SliderAppsResource.java    |   163 -
 .../view/slider/rest/ViewStatusResource.java    |    40 -
 .../slider/rest/client/AmbariHttpClient.java    |   233 -
 .../view/slider/rest/client/BaseHttpClient.java |   157 -
 .../slider/rest/client/JMXMetricHolder.java     |    50 -
 .../ambari/view/slider/rest/client/Metric.java  |   158 -
 .../slider/rest/client/SliderAppJmxHelper.java  |   205 -
 .../rest/client/SliderAppMasterClient.java      |   324 -
 .../rest/client/SliderAppMetricsHelper.java     |   159 -
 .../view/slider/rest/client/TimelineMetric.java |   172 -
 .../slider/rest/client/TimelineMetrics.java     |   101 -
 .../rest/client/URLStreamProviderBasicAuth.java |   105 -
 .../slider/src/main/resources/slider.properties |    19 -
 .../slider/src/main/resources/ui/.gitignore     |    31 -
 .../views/slider/src/main/resources/ui/LICENSE  |    21 -
 .../slider/src/main/resources/ui/README.md      |   122 -
 .../src/main/resources/ui/app/assets/404.html   |   175 -
 .../app/assets/apple-touch-icon-precomposed.png |   Bin 1226 -> 0 bytes
 .../resources/ui/app/assets/crossdomain.xml     |    31 -
 .../resources/ui/app/assets/data/apps/apps.json |  1320 -
 .../ui/app/assets/data/apptypes/all_fields.json |   642 -
 .../ui/app/assets/data/metrics/metric.json      |   946 -
 .../ui/app/assets/data/metrics/metric2.json     |  3838 --
 .../ui/app/assets/data/metrics/metric3.json     |  1856 -
 .../ui/app/assets/data/metrics/metric4.json     |   968 -
 .../ui/app/assets/data/resource/empty_json.json |     1 -
 .../data/resource/slider-properties-2.json      |     9 -
 .../assets/data/resource/slider-properties.json |   148 -
 .../app/assets/data/resource/status_false.json  |     8 -
 .../app/assets/data/resource/status_true.json   |     5 -
 .../main/resources/ui/app/assets/favicon.ico    |   Bin 766 -> 0 bytes
 .../ui/app/assets/font/fontawesome-webfont.eot  |   Bin 37405 -> 0 bytes
 .../ui/app/assets/font/fontawesome-webfont.svg  |   399 -
 .../ui/app/assets/font/fontawesome-webfont.ttf  |   Bin 79076 -> 0 bytes
 .../ui/app/assets/font/fontawesome-webfont.woff |   Bin 43572 -> 0 bytes
 .../resources/ui/app/assets/images/.gitkeep     |     0
 .../ui-bg_flat_0_aaaaaa_40x100.png              |   Bin 180 -> 0 bytes
 .../ui-bg_glass_55_fbf9ee_1x400.png             |   Bin 120 -> 0 bytes
 .../ui-bg_glass_65_ffffff_1x400.png             |   Bin 105 -> 0 bytes
 .../ui-bg_glass_75_dadada_1x400.png             |   Bin 111 -> 0 bytes
 .../ui-bg_glass_75_e6e6e6_1x400.png             |   Bin 110 -> 0 bytes
 .../ui-bg_glass_75_ffffff_1x400.png             |   Bin 107 -> 0 bytes
 .../ui-bg_highlight-soft_75_cccccc_1x100.png    |   Bin 101 -> 0 bytes
 .../ui-bg_inset-soft_95_fef1ec_1x100.png        |   Bin 123 -> 0 bytes
 .../ui-icons_222222_256x240.png                 |   Bin 4369 -> 0 bytes
 .../ui-icons_2e83ff_256x240.png                 |   Bin 4369 -> 0 bytes
 .../ui-icons_454545_256x240.png                 |   Bin 4369 -> 0 bytes
 .../ui-icons_888888_256x240.png                 |   Bin 4369 -> 0 bytes
 .../ui-icons_cd0a0a_256x240.png                 |   Bin 4369 -> 0 bytes
 .../ui-icons_f6cf3b_256x240.png                 |   Bin 8884 -> 0 bytes
 .../src/main/resources/ui/app/assets/index.html |    46 -
 .../ui/app/assets/javascripts/ember-qunit.js    |   266 -
 .../ui/app/assets/javascripts/jquery.mockjax.js |   692 -
 .../assets/javascripts/modernizr-2.6.2.min.js   |     4 -
 .../ui/app/assets/javascripts/qunit.js          |  2495 -
 .../ui/app/assets/javascripts/sinon-1.13.0.js   |  5830 --
 .../app/assets/javascripts/sinon-qunit-1.0.0.js |    62 -
 .../ui/app/assets/javascripts/tests.js          |    29 -
 .../ui/app/assets/stylesheets/qunit.css         |   237 -
 .../src/main/resources/ui/app/assets/tests.html |    46 -
 .../main/resources/ui/app/components/.gitkeep   |     0
 .../ui/app/components/configSection.js          |   164 -
 .../src/main/resources/ui/app/config/app.js     |    27 -
 .../src/main/resources/ui/app/config/env.js     |    33 -
 .../src/main/resources/ui/app/config/router.js  |    35 -
 .../src/main/resources/ui/app/config/store.js   |    23 -
 .../main/resources/ui/app/controllers/.gitkeep  |     0
 .../app/controllers/application_controller.js   |    27 -
 .../createAppWizard/step1_controller.js         |   251 -
 .../createAppWizard/step2_controller.js         |   136 -
 .../createAppWizard/step3_controller.js         |   250 -
 .../createAppWizard/step4_controller.js         |   176 -
 .../controllers/create_app_wizard_controller.js |   122 -
 .../slider_app/summary_controller.js            |    27 -
 .../ui/app/controllers/slider_app_controller.js |   472 -
 .../app/controllers/slider_apps_controller.js   |    35 -
 .../ui/app/controllers/slider_controller.js     |   138 -
 .../ui/app/controllers/tooltip_controller.js    |    19 -
 .../src/main/resources/ui/app/helpers/.gitkeep  |     0
 .../src/main/resources/ui/app/helpers/ajax.js   |   388 -
 .../src/main/resources/ui/app/helpers/helper.js |   169 -
 .../resources/ui/app/helpers/string_utils.js    |   163 -
 .../src/main/resources/ui/app/initialize.js     |   171 -
 .../ui/app/mappers/application_type.js          |   162 -
 .../src/main/resources/ui/app/mappers/mapper.js |    56 -
 .../ui/app/mappers/slider_apps_mapper.js        |   292 -
 .../ui/app/mixins/ajax_error_handler.js         |    82 -
 .../resources/ui/app/mixins/run_periodically.js |   109 -
 .../main/resources/ui/app/mixins/with_panels.js |    53 -
 .../src/main/resources/ui/app/models/.gitkeep   |     0
 .../resources/ui/app/models/config_property.js  |    47 -
 .../src/main/resources/ui/app/models/host.js    |    33 -
 .../main/resources/ui/app/models/slider_app.js  |   207 -
 .../resources/ui/app/models/slider_app_alert.js |   149 -
 .../ui/app/models/slider_app_component.js       |    65 -
 .../resources/ui/app/models/slider_app_type.js  |    64 -
 .../ui/app/models/slider_app_type_component.js  |    63 -
 .../resources/ui/app/models/slider_config.js    |    45 -
 .../ui/app/models/slider_quick_link.js          |    33 -
 .../resources/ui/app/models/typed_property.js   |    38 -
 .../ui/app/routes/create_app_wizard.js          |    54 -
 .../src/main/resources/ui/app/routes/main.js    |    75 -
 .../src/main/resources/ui/app/styles/app.less   |   303 -
 .../resources/ui/app/styles/application.less    |    23 -
 .../resources/ui/app/styles/application.styl    |    18 -
 .../resources/ui/app/styles/apps-table.less     |   320 -
 .../main/resources/ui/app/styles/common.less    |   109 -
 .../resources/ui/app/styles/old-bootstrap.less  |   164 -
 .../main/resources/ui/app/styles/wizard.less    |   232 -
 .../resources/ui/app/templates/application.hbs  |    56 -
 .../ui/app/templates/common/ajax_error.hbs      |    24 -
 .../ui/app/templates/common/app_tooltip.hbs     |    24 -
 .../resources/ui/app/templates/common/chart.hbs |    26 -
 .../ui/app/templates/common/config.hbs          |    37 -
 .../ui/app/templates/components/.gitkeep        |     0
 .../app/templates/components/configSection.hbs  |    78 -
 .../ui/app/templates/createAppWizard.hbs        |    43 -
 .../ui/app/templates/createAppWizard/step1.hbs  |   192 -
 .../ui/app/templates/createAppWizard/step2.hbs  |    62 -
 .../ui/app/templates/createAppWizard/step3.hbs  |    37 -
 .../ui/app/templates/createAppWizard/step4.hbs  |    41 -
 .../main/resources/ui/app/templates/index.hbs   |    21 -
 .../resources/ui/app/templates/slider_app.hbs   |    70 -
 .../ui/app/templates/slider_app/configs.hbs     |    40 -
 .../slider_app/destroy/destroy_popup.hbs        |    20 -
 .../slider_app/destroy/destroy_popup_footer.hbs |    28 -
 .../ui/app/templates/slider_app/flex_popup.hbs  |    40 -
 .../ui/app/templates/slider_app/summary.hbs     |   135 -
 .../resources/ui/app/templates/slider_apps.hbs  |    87 -
 .../ui/app/templates/slider_title_tooltip.hbs   |    27 -
 .../ui/app/templates/unavailable_apps.hbs       |    22 -
 .../src/main/resources/ui/app/translations.js   |   169 -
 .../src/main/resources/ui/app/views/.gitkeep    |     0
 .../resources/ui/app/views/application_view.js  |    70 -
 .../resources/ui/app/views/common/chart_view.js |   914 -
 .../ui/app/views/common/config_set_view.js      |    57 -
 .../ui/app/views/common/filter_view.js          |   370 -
 .../resources/ui/app/views/common/sort_view.js  |   206 -
 .../resources/ui/app/views/common/table_view.js |   418 -
 .../ui/app/views/createAppWizard/step1_view.js  |    47 -
 .../ui/app/views/createAppWizard/step2_view.js  |    33 -
 .../ui/app/views/createAppWizard/step3_view.js  |    25 -
 .../ui/app/views/createAppWizard/step4_view.js  |    24 -
 .../ui/app/views/create_app_wizard_view.js      |    80 -
 .../ui/app/views/slider_app/configs_view.js     |    57 -
 .../slider_app/destroy_modal_footer_view.js     |    41 -
 .../app/views/slider_app/destroy_popup_view.js  |    37 -
 .../views/slider_app/metrics/app_metric_view.js |    77 -
 .../views/slider_app/metrics/metric2_view.js    |    63 -
 .../views/slider_app/metrics/metric3_view.js    |    61 -
 .../views/slider_app/metrics/metric4_view.js    |    54 -
 .../app/views/slider_app/metrics/metric_view.js |    70 -
 .../ui/app/views/slider_app/summary_view.js     |   141 -
 .../resources/ui/app/views/slider_app_view.js   |    30 -
 .../resources/ui/app/views/slider_apps_view.js  |   175 -
 .../slider/src/main/resources/ui/config.js      |   123 -
 .../main/resources/ui/envs/development/env.js   |    21 -
 .../main/resources/ui/envs/production/env.js    |    21 -
 .../arraycontroller/arraycontroller.js.hbs      |    23 -
 .../generators/arraycontroller/generator.json   |    10 -
 .../ui/generators/component/component.hbs.hbs   |    19 -
 .../ui/generators/component/component.js.hbs    |    23 -
 .../ui/generators/component/generator.json      |    14 -
 .../ui/generators/controller/controller.js.hbs  |    23 -
 .../ui/generators/controller/generator.json     |    10 -
 .../ui/generators/helper/generator.json         |    10 -
 .../ui/generators/helper/helper.js.hbs          |    24 -
 .../ui/generators/model/generator.json          |    10 -
 .../resources/ui/generators/model/model.js.hbs  |    24 -
 .../ui/generators/route/generator.json          |    10 -
 .../resources/ui/generators/route/route.js.hbs  |    25 -
 .../ui/generators/template/generator.json       |    10 -
 .../ui/generators/template/template.hbs.hbs     |    19 -
 .../resources/ui/generators/view/generator.json |    10 -
 .../resources/ui/generators/view/view.js.hbs    |    23 -
 .../slider/src/main/resources/ui/karma.conf.js  |    94 -
 .../slider/src/main/resources/ui/package.json   |    37 -
 .../slider/src/main/resources/ui/runner.js      |   136 -
 .../views/slider/src/main/resources/ui/setup.js |    78 -
 .../slider/src/main/resources/ui/test/index.md  |    28 -
 .../ui/test/integration/pages/index_test.js     |   127 -
 .../integration/pages/slider_errors_test.js     |    63 -
 .../processes/create_new_app_test.js            |   358 -
 .../createAppWizard/step1_controller_test.js    |   431 -
 .../createAppWizard/step2_controller_test.js    |   403 -
 .../createAppWizard/step3_controller_test.js    |   421 -
 .../createAppWizard/step4_controller_test.js    |   440 -
 .../create_app_wizard_controller_test.js        |   201 -
 .../slider_app/summary_controller_test.js       |    36 -
 .../controllers/slider_app_controller_test.js   |   607 -
 .../controllers/slider_apps_controller_test.js  |    58 -
 .../unit/controllers/slider_controller_test.js  |   140 -
 .../unit/mappers/slider_apps_mapper_test.js     |    85 -
 .../unit/models/slider_app_component_test.js    |    51 -
 .../ui/test/unit/models/slider_app_test.js      |    95 -
 .../test/unit/views/common/table_view_test.js   |    35 -
 .../unit/views/slider_app/summary_view_test.js  |    68 -
 .../ui/vendor/scripts/common/bootstrap.js       |  1951 -
 .../ui/vendor/scripts/common/bs-basic.min.js    |     1 -
 .../ui/vendor/scripts/common/bs-button.min.js   |     1 -
 .../ui/vendor/scripts/common/bs-core.min.js     |     1 -
 .../ui/vendor/scripts/common/bs-modal.min.js    |     1 -
 .../ui/vendor/scripts/common/bs-nav.min.js      |     1 -
 .../ui/vendor/scripts/common/bs-popover.min.js  |     1 -
 .../vendor/scripts/common/console-polyfill.js   |    13 -
 .../ui/vendor/scripts/common/cubism.v1.js       |  1085 -
 .../resources/ui/vendor/scripts/common/d3.v2.js |  7033 ---
 .../vendor/scripts/common/ember-i18n-1.4.1.js   |   199 -
 .../ui/vendor/scripts/common/handlebars.js      |  2746 -
 .../ui/vendor/scripts/common/jquery.js          |  8829 ---
 .../ui/vendor/scripts/common/jquery.timeago.js  |   214 -
 .../ui/vendor/scripts/common/jquery.ui.core.js  |   334 -
 .../ui/vendor/scripts/common/jquery.ui.mouse.js |   175 -
 .../vendor/scripts/common/jquery.ui.sortable.js |  1088 -
 .../vendor/scripts/common/jquery.ui.widget.js   |   276 -
 .../ui/vendor/scripts/common/moment.min.js      |     7 -
 .../ui/vendor/scripts/common/rickshaw.js        |  2659 -
 .../resources/ui/vendor/scripts/common/tv4.js   |  1605 -
 .../ui/vendor/scripts/development/ember-data.js | 10620 ----
 .../ui/vendor/scripts/development/ember.js      | 43235 -------------
 .../ui/vendor/scripts/production/ember-data.js  | 10626 ----
 .../ui/vendor/scripts/production/ember.js       | 41620 ------------
 .../resources/ui/vendor/styles/bootstrap.css    |  5785 --
 .../main/resources/ui/vendor/styles/cubism.css  |    82 -
 .../ui/vendor/styles/font-awesome-ie7.css       |  1203 -
 .../resources/ui/vendor/styles/font-awesome.css |  1479 -
 .../jquery-ui-1.8.16.custom.css                 |  1320 -
 .../resources/ui/vendor/styles/rickshaw.css     |   307 -
 .../src/main/resources/view.log4j.properties    |    27 -
 .../views/slider/src/main/resources/view.xml    |    82 -
 .../ambari/view/slider/SliderClientTest.java    |    31 -
 .../rest/client/SliderAppMasterClientTest.java  |   177 -
 contrib/views/tez/pom.xml                       |     3 +-
 contrib/views/wfmanager/pom.xml                 |     1 +
 .../ui/app/components/flow-designer.js          |    27 +
 .../resources/ui/app/components/hdfs-browser.js |     8 +-
 .../ui/app/components/search-create-new-bar.js  |    12 +-
 .../ui/app/domain/actionjob_hanlder.js          |     3 +
 .../ui/app/domain/workflow-xml-generator.js     |     3 +
 .../ui/app/services/workspace-manager.js        |     5 +
 .../src/main/resources/ui/app/styles/app.less   |     5 +-
 .../app/templates/components/flow-designer.hbs  |     9 +-
 .../app/templates/components/hdfs-browser.hbs   |    16 +-
 .../components/search-create-new-bar.hbs        |     4 +
 .../app/templates/components/spark-action.hbs   |     7 +-
 .../main/resources/ui/app/utils/constants.js    |     3 +-
 .../main/resources/ui/app/utils/hdfsviewer.js   |     3 +
 .../wfmanager/src/main/resources/ui/bower.json  |     5 +-
 .../addon/components/directory-viewer.js        |   325 +-
 .../hdfs-directory-viewer/addon/styles/app.css  |   190 +
 .../templates/components/directory-viewer.hbs   |   146 +
 .../addon/utils/viewer-config.js                |     3 +
 .../hdfs-directory-viewer/bower.json            |     1 -
 .../hdfs-directory-viewer/index.js              |     3 -
 .../hdfs-directory-viewer/package.json          |     5 +-
 .../src/main/resources/ui/package.json          |     3 +-
 .../wfmanager/src/main/resources/ui/yarn.lock   |    68 +-
 .../config-utils/diff_stack_properties.py       |   154 +
 docs/pom.xml                                    |    38 +-
 docs/src/site/apt/index.apt                     |     2 +-
 docs/src/site/apt/whats-new.apt                 |     4 +-
 docs/src/site/site.xml                          |     4 +
 pom.xml                                         |    18 +-
 utility/pom.xml                                 |   101 -
 utility/src/main/java/category/AlertTest.java   |    27 -
 .../main/java/category/AmbariUpgradeTest.java   |    27 -
 .../src/main/java/category/BlueprintTest.java   |    27 -
 utility/src/main/java/category/FastTest.java    |    27 -
 .../src/main/java/category/KerberosTest.java    |    27 -
 utility/src/main/java/category/MetricsTest.java |    27 -
 utility/src/main/java/category/SlowTest.java    |    27 -
 .../main/java/category/StackUpgradeTest.java    |    27 -
 ...AvoidTransactionalOnPrivateMethodsCheck.java |    55 -
 .../src/main/resources/checkstyle_packages.xml  |    15 -
 ...dTransactionalOnPrivateMethodsCheckTest.java |    49 -
 .../InputTransactionalOnPrivateMethods.java     |    46 -
 3523 files changed, 196021 insertions(+), 267619 deletions(-)
----------------------------------------------------------------------