ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [50/50] [abbrv] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
Date Thu, 05 Jan 2017 00:05:31 GMT
Merge branch 'trunk' into branch-dev-patch-upgrade


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 608f0b55ecfe96043ac3bd7bc41e4eb580691fe4
Parents: 4807928 82a64e4
Author: Nate Cole <ncole@hortonworks.com>
Authored: Wed Jan 4 19:04:17 2017 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Wed Jan 4 19:04:17 2017 -0500

----------------------------------------------------------------------
 ambari-agent/pom.xml                            |   64 +-
 .../java/org/apache/ambari/tools/zk/ZkAcl.java  |  107 +
 .../apache/ambari/tools/zk/ZkConnection.java    |   53 +
 .../org/apache/ambari/tools/zk/ZkMigrator.java  |   88 +
 .../src/main/python/ambari_agent/ActionQueue.py |   14 +-
 .../ambari_agent/AlertSchedulerHandler.py       |   17 +-
 .../src/main/python/ambari_agent/Controller.py  |   29 +-
 .../src/main/python/ambari_agent/FileCache.py   |    2 +
 .../src/main/python/ambari_agent/Hardware.py    |    6 +-
 .../python/ambari_agent/alerts/script_alert.py  |    8 +
 .../apache/ambari/tools/zk/ZkMigratorTest.java  |  159 ++
 .../ambari_agent/TestAlertSchedulerHandler.py   |   51 +-
 .../src/test/python/ambari_agent/TestAlerts.py  |   61 +-
 .../core/resources/zkmigrator.py                |   47 +
 .../libraries/functions/constants.py            |    1 +
 .../libraries/functions/solr_cloud_util.py      |   15 +-
 .../libraries/script/script.py                  |    6 +
 .../org/apache/ambari/logsearch/LogSearch.java  |    7 +-
 .../apache/ambari/logsearch/util/SSLUtil.java   |   46 +-
 .../src/main/scripts/run.sh                     |    2 +-
 .../test-config/logsearch/logsearch-env.sh      |    2 -
 ambari-metrics/ambari-metrics-assembly/pom.xml  |   12 +
 .../src/main/assembly/collector-windows.xml     |    1 +
 .../src/main/assembly/collector.xml             |    1 +
 .../sink/timeline/TimelineMetricMetadata.java   |   12 +-
 .../conf/unix/metrics_whitelist                 |  527 +++++
 .../conf/windows/metrics_whitelist              |  527 +++++
 .../ambari-metrics-timelineservice/pom.xml      |   37 +-
 .../timeline/HBaseTimelineMetricStore.java      |   17 +-
 .../metrics/timeline/PhoenixHBaseAccessor.java  |   28 +-
 .../timeline/TimelineMetricConfiguration.java   |    3 +
 .../metrics/timeline/TimelineMetricStore.java   |    2 +-
 .../metrics/timeline/TimelineMetricsFilter.java |  153 ++
 .../timeline/aggregators/AggregatorUtils.java   |   45 -
 .../TimelineMetricAppAggregator.java            |    5 +-
 .../availability/AggregationTaskRunner.java     |    5 +-
 .../MetricCollectorHAController.java            |    3 +-
 .../OnlineOfflineStateModelFactory.java         |   17 +-
 .../TimelineMetricMetadataManager.java          |    5 +-
 .../timeline/query/PhoenixTransactSQL.java      |   12 +-
 .../webapp/TimelineWebServices.java             |    7 +-
 .../timeline/TestTimelineMetricStore.java       |    2 +-
 .../timeline/TimelineMetricsFilterTest.java     |   99 +
 .../MetricCollectorHAControllerTest.java        |    3 +-
 .../timeline/discovery/TestMetadataManager.java |   21 +-
 .../timeline/discovery/TestMetadataSync.java    |   10 +-
 .../resources/test_data/metric_whitelist.dat    |    6 +
 ambari-server/conf/unix/metrics.properties      |   15 +-
 ambari-server/conf/windows/metrics.properties   |   28 +
 ambari-server/pom.xml                           |    6 +
 .../src/main/assemblies/server-windows.xml      |    4 +
 ambari-server/src/main/assemblies/server.xml    |    4 +
 .../actionmanager/ActionDBAccessorImpl.java     |    4 +-
 .../server/api/services/ComponentService.java   |   27 +-
 .../api/services/HostComponentService.java      |   25 +-
 .../server/checks/AbstractCheckDescriptor.java  |   20 +-
 .../ambari/server/checks/CheckDescription.java  |    6 -
 .../server/checks/ClientRetryPropertyCheck.java |    5 +-
 .../checks/ComponentsInstallationCheck.java     |    6 +-
 .../server/checks/ConfigurationMergeCheck.java  |    5 +-
 .../HardcodedStackVersionPropertiesCheck.java   |    5 +-
 .../ambari/server/checks/HealthCheck.java       |    5 +-
 .../HiveDynamicServiceDiscoveryCheck.java       |    6 +-
 .../server/checks/HiveNotRollingWarning.java    |    2 +-
 .../server/checks/HostMaintenanceModeCheck.java |    5 +-
 .../server/checks/HostsHeartbeatCheck.java      |    6 +-
 .../checks/HostsMasterMaintenanceCheck.java     |    7 +-
 .../checks/HostsRepositoryVersionCheck.java     |    5 +-
 .../server/checks/InstallPackagesCheck.java     |    6 +-
 .../server/checks/PreviousUpgradeCompleted.java |   87 +-
 .../server/checks/RangerPasswordCheck.java      |    6 +-
 .../checks/ServiceCheckValidityCheck.java       |    5 +-
 .../checks/ServicesMaintenanceModeCheck.java    |    8 +-
 .../ambari/server/checks/ServicesUpCheck.java   |    6 +-
 .../server/checks/StormRestAPIDeletedCheck.java |  109 -
 .../server/checks/StormShutdownWarning.java     |    2 +-
 .../ambari/server/checks/UpgradeCheck.java      |   14 +-
 .../server/checks/UpgradeCheckRegistry.java     |    2 +-
 .../server/checks/VersionMismatchCheck.java     |    6 +-
 .../server/configuration/Configuration.java     |   27 +
 .../AmbariManagementControllerImpl.java         |    4 +-
 .../ambari/server/controller/AmbariServer.java  |   19 +-
 .../server/controller/KerberosHelperImpl.java   |   81 +
 .../internal/ClientConfigResourceProvider.java  |  850 +++++---
 .../internal/ConfigGroupResourceProvider.java   |    4 +-
 .../internal/HostResourceProvider.java          |   20 +-
 .../internal/UpgradeResourceProvider.java       |    4 +-
 .../ambari/server/events/HostAddedEvent.java    |   51 -
 .../ambari/server/events/HostRemovedEvent.java  |   69 -
 .../ambari/server/events/HostsAddedEvent.java   |   50 +
 .../ambari/server/events/HostsRemovedEvent.java |   88 +
 .../listeners/alerts/AlertHostListener.java     |   32 +-
 .../upgrade/HostVersionOutOfSyncListener.java   |   23 +-
 .../ambari/server/metadata/ActionMetadata.java  |    1 +
 .../server/metrics/system/AmbariMetricSink.java |   34 -
 .../server/metrics/system/MetricsService.java   |   16 +-
 .../server/metrics/system/MetricsSink.java      |   43 +
 .../server/metrics/system/MetricsSource.java    |    5 +-
 .../server/metrics/system/SingleMetric.java     |   44 +
 .../system/impl/AbstractMetricsSource.java      |   15 +-
 .../system/impl/AmbariMetricSinkImpl.java       |  239 ++-
 .../metrics/system/impl/Configuration.java      |   83 -
 .../metrics/system/impl/JvmMetricsSource.java   |   54 +-
 .../system/impl/MetricsConfiguration.java       |   89 +
 .../metrics/system/impl/MetricsServiceImpl.java |  154 +-
 .../dispatchers/AmbariSNMPDispatcher.java       |    5 +-
 .../orm/EclipseLinkSessionCustomizer.java       |   16 +
 .../apache/ambari/server/orm/dao/CrudDAO.java   |   14 +
 .../ambari/server/orm/dao/HostVersionDAO.java   |    4 +-
 .../ambari/server/orm/dao/UpgradeDAO.java       |    9 +-
 .../apache/ambari/server/state/AlertState.java  |   20 +-
 .../apache/ambari/server/state/Clusters.java    |   11 +-
 .../server/state/cluster/ClusterImpl.java       |    4 +-
 .../server/state/cluster/ClustersImpl.java      |   87 +-
 .../ambari/server/state/host/HostImpl.java      |    2 +-
 .../ambari/server/state/quicklinks/Link.java    |   16 +-
 .../quicklinksprofile/AcceptAllFilter.java      |    2 +-
 .../state/quicklinksprofile/Component.java      |    7 +
 .../server/state/quicklinksprofile/Filter.java  |   10 +-
 .../quicklinksprofile/LinkAttributeFilter.java  |   61 +
 .../state/quicklinksprofile/PropertyFilter.java |   60 -
 .../quicklinksprofile/QuickLinksProfile.java    |    7 +
 .../QuickLinksProfileEvaluator.java             |  202 ++
 .../QuickLinksProfileEvaluatorException.java    |   27 +
 .../QuickLinksProfileParser.java                |   10 +-
 .../server/state/quicklinksprofile/Service.java |    8 +
 .../ambari/server/topology/TopologyManager.java |   32 +-
 .../server/upgrade/UpgradeCatalog250.java       |   29 +
 .../python/ambari_server/resourceFilesKeeper.py |   20 +-
 .../configuration/infra-solr-client-log4j.xml   |   21 +
 .../0.1.0/configuration/infra-solr-log4j.xml    |   21 +
 .../0.1.0/package/scripts/params.py             |    6 +-
 .../0.1.0/package/scripts/setup_infra_solr.py   |    2 +-
 .../properties/solr-client-log4j.properties.j2  |    8 +-
 .../0.1.0/configuration/ams-hbase-log4j.xml     |   50 +-
 .../0.1.0/configuration/ams-log4j.xml           |   25 +-
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py |    2 +-
 .../0.1.0/package/scripts/hbase.py              |    2 +-
 .../0.1.0/package/scripts/params.py             |    8 +
 .../0.1.0.2.3/configuration/atlas-log4j.xml     |   23 +
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   |    2 +
 .../0.7.0.2.5/configuration/atlas-log4j.xml     |   27 +-
 .../DRUID/0.9.2/configuration/druid-common.xml  |    4 +-
 .../0.96.0.2.0/configuration/hbase-log4j.xml    |   50 +-
 .../HBASE/0.96.0.2.0/package/scripts/hbase.py   |    2 +-
 .../0.96.0.2.0/package/scripts/params_linux.py  |    6 +
 .../HIVE/0.12.0.2.0/package/scripts/hive.py     |   45 +-
 .../package/scripts/hive_interactive.py         |   20 +-
 .../KAFKA/0.8.1/configuration/kafka-log4j.xml   |   47 +-
 .../KAFKA/0.8.1/package/scripts/kafka.py        |    2 +-
 .../KAFKA/0.8.1/package/scripts/params.py       |    6 +
 .../0.5.0.2.2/configuration/gateway-log4j.xml   |   23 +
 .../KNOX/0.5.0.2.2/configuration/ldap-log4j.xml |   23 +
 .../KNOX/0.5.0.2.2/package/scripts/knox.py      |    2 +-
 .../KNOX/0.5.0.2.2/package/scripts/knox_ldap.py |    5 +-
 .../0.5.0.2.2/package/scripts/params_linux.py   |    6 +
 .../0.5.0/configuration/logfeeder-env.xml       |    2 +-
 .../0.5.0/configuration/logfeeder-log4j.xml     |   42 +
 .../configuration/logsearch-common-env.xml      |  104 +
 .../0.5.0/configuration/logsearch-env.xml       |   80 -
 .../0.5.0/configuration/logsearch-log4j.xml     |   84 +
 .../LOGSEARCH/0.5.0/metainfo.xml                |    3 +-
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |   29 +-
 .../0.5.0/package/scripts/setup_logsearch.py    |   20 +
 .../0.5.0/properties/logfeeder-log4j.xml.j2     |   10 +-
 .../0.5.0/properties/logsearch-env.sh.j2        |    2 -
 .../0.5.0/properties/logsearch-log4j.xml.j2     |   16 +-
 .../LOGSEARCH/0.5.0/themes/theme.json           |   52 +-
 .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml |    8 +
 .../4.0.0.2.0/configuration/oozie-log4j.xml     |   13 +-
 .../4.0.0.2.0/package/files/oozieSmoke2.sh      |   11 +-
 .../files/prepareOozieHdfsDirectories.sh        |   15 +-
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py    |  101 +-
 .../4.0.0.2.0/package/scripts/params_linux.py   |    3 +
 .../4.0.0.2.0/package/scripts/service_check.py  |    8 +-
 .../4.2.0.2.3/configuration/oozie-log4j.xml     |   13 +-
 .../RANGER/0.4.0/package/scripts/params.py      |    5 +
 .../0.4.0/package/scripts/setup_ranger_xml.py   |   41 +-
 .../configuration/ranger-solr-configuration.xml |   59 +
 .../common-services/RANGER/0.7.0/metainfo.xml   |    3 +
 .../0.7.0/properties/ranger-solrconfig.xml.j2   | 1881 ++++++++++++++++++
 .../YARN/2.1.0.2.0/configuration/yarn-log4j.xml |   25 +-
 .../YARN/2.1.0.2.0/kerberos.json                |    5 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |    9 +
 .../package/scripts/resourcemanager.py          |   18 +-
 .../YARN/2.1.0.2.0/package/scripts/yarn.py      |    5 +
 .../package/templates/yarn_jaas.conf.j2         |   26 +
 .../YARN/3.0.0.3.0/kerberos.json                |    5 +-
 .../3.0.0.3.0/package/scripts/params_linux.py   |    9 +
 .../package/scripts/resourcemanager.py          |   17 +-
 .../YARN/3.0.0.3.0/package/scripts/yarn.py      |    5 +
 .../package/templates/yarn_jaas.conf.j2         |   26 +
 .../ZEPPELIN/0.6.0.2.5/metainfo.xml             |    4 -
 .../0.6.0.2.5/package/scripts/master.py         |    9 +
 .../3.4.5/configuration/zookeeper-log4j.xml     |   25 +-
 .../3.4.5/package/scripts/params_linux.py       |    4 +
 .../HDP/2.0.6/properties/stack_features.json    |    5 +
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |   73 +-
 .../stacks/HDP/2.1/services/stack_advisor.py    |   20 +-
 .../stacks/HDP/2.2/services/YARN/kerberos.json  |    5 +-
 .../stacks/HDP/2.2/services/stack_advisor.py    |   13 +-
 .../HDP/2.3.ECS/services/YARN/kerberos.json     |    5 +-
 .../services/YARN/configuration/yarn-log4j.xml  |    6 +-
 .../stacks/HDP/2.3/services/YARN/kerberos.json  |    5 +-
 .../stacks/HDP/2.3/services/stack_advisor.py    |    2 +-
 .../stacks/HDP/2.5/services/YARN/kerberos.json  |    5 +-
 .../stacks/HDP/2.5/services/stack_advisor.py    |   20 +-
 .../HDP/2.5/upgrades/host-ordered-upgrade.xml   |   12 -
 .../ATLAS/configuration/atlas-log4j.xml         |   23 +
 .../stacks/HDP/2.6/services/HIVE/metainfo.xml   |    6 +
 .../HDP/2.6/services/HIVE/themes/theme.json     |   20 +
 .../stacks/HDP/2.6/services/stack_advisor.py    |    4 +-
 .../HDP/2.6/upgrades/host-ordered-upgrade.xml   |  573 ++++++
 .../server/agent/HeartbeatTestHelper.java       |    2 +-
 .../server/agent/TestHeartbeatMonitor.java      |   10 +-
 .../api/services/ComponentServiceTest.java      |    4 +-
 .../api/services/HostComponentServiceTest.java  |    4 +-
 .../checks/AbstractCheckDescriptorTest.java     |   70 +
 .../checks/PreviousUpgradeCompletedTest.java    |  171 +-
 .../AmbariManagementControllerTest.java         |    8 +-
 .../server/controller/KerberosHelperTest.java   |   23 +-
 .../ClientConfigResourceProviderTest.java       |   36 +-
 .../ConfigGroupResourceProviderTest.java        |    3 +
 .../internal/HostResourceProviderTest.java      |    5 +-
 .../internal/UpgradeResourceProviderTest.java   |    2 +-
 .../HostVersionOutOfSyncListenerTest.java       |    4 +-
 .../system/impl/JvmMetricsSourceTest.java       |   36 +
 .../metric/system/impl/MetricsServiceTest.java  |   40 +
 .../system/impl/TestAmbariMetricsSinkImpl.java  |   79 +
 .../metric/system/impl/TestMetricsSource.java   |   37 +
 .../dispatchers/AmbariSNMPDispatcherTest.java   |    8 +-
 .../apache/ambari/server/orm/OrmTestHelper.java |    5 +-
 .../ambari/server/orm/dao/UpgradeDAOTest.java   |    6 +-
 .../upgrades/UpgradeActionTest.java             |    2 +-
 .../QuickLinksConfigurationModuleTest.java      |   10 +-
 .../server/state/cluster/ClusterImplTest.java   |    8 +-
 .../server/state/cluster/ClusterTest.java       |    4 +-
 .../server/state/cluster/ClustersTest.java      |    6 +-
 .../state/quicklinksprofile/EvaluatorTest.java  |  203 ++
 .../QuickLinksProfileEvaluatorTest.java         |  168 ++
 .../QuickLinksProfileParserTest.java            |    4 +-
 .../svccomphost/ServiceComponentHostTest.java   |    2 +-
 .../server/upgrade/UpgradeCatalog250Test.java   |   72 +
 .../src/test/python/TestResourceFilesKeeper.py  |   11 +-
 .../AMBARI_METRICS/test_metrics_collector.py    |    6 +-
 .../stacks/2.0.6/HBASE/test_hbase_client.py     |    4 +-
 .../stacks/2.0.6/HBASE/test_hbase_master.py     |    6 +-
 .../2.0.6/HBASE/test_hbase_regionserver.py      |    8 +-
 .../2.0.6/HBASE/test_phoenix_queryserver.py     |    6 +-
 .../stacks/2.0.6/HIVE/test_hive_client.py       |    8 +
 .../stacks/2.0.6/HIVE/test_hive_metastore.py    |   33 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |   28 +-
 .../stacks/2.0.6/OOZIE/test_oozie_client.py     |    6 +-
 .../stacks/2.0.6/OOZIE/test_oozie_server.py     |    8 +-
 .../2.0.6/OOZIE/test_oozie_service_check.py     |    3 +-
 .../stacks/2.0.6/OOZIE/test_service_check.py    |    4 +-
 .../stacks/2.0.6/YARN/test_historyserver.py     |    8 +-
 .../stacks/2.0.6/YARN/test_mapreduce2_client.py |    8 +-
 .../stacks/2.0.6/YARN/test_nodemanager.py       |    8 +-
 .../stacks/2.0.6/YARN/test_resourcemanager.py   |    8 +-
 .../stacks/2.0.6/YARN/test_yarn_client.py       |    8 +-
 .../stacks/2.0.6/common/test_stack_advisor.py   |  389 +++-
 .../stacks/2.1/HIVE/test_hive_metastore.py      |   21 +-
 .../python/stacks/2.2/KNOX/test_knox_gateway.py |    8 +-
 .../stacks/2.2/common/test_stack_advisor.py     |   34 +-
 .../stacks/2.3/common/test_stack_advisor.py     |    8 +-
 .../stacks/2.4/LOGSEARCH/test_logsearch.py      |   20 +
 .../test/python/stacks/2.4/configs/default.json |    2 +
 .../stacks/2.5/HIVE/test_hive_server_int.py     |  208 +-
 .../stacks/2.5/ZEPPELIN/test_zeppelin_master.py |   28 +
 .../stacks/2.5/common/test_stack_advisor.py     |   60 +-
 .../stacks/2.6/RANGER/test_ranger_admin.py      |   46 +-
 .../stacks/2.6/common/test_stack_advisor.py     |    2 +-
 .../2.6/configs/ranger-admin-default.json       |   17 +-
 .../2.6/configs/ranger-admin-secured.json       |   19 +-
 .../HIVE/configuration/hive-site.xml            |  259 +++
 .../dummy_extension/HIVE/metainfo.xml           |   47 +
 .../dummy_extension/HIVE/package/.hash          |    1 +
 .../HIVE/package/files/startHiveserver2.sh      |   22 +
 .../HIVE/package/scripts/status_params.py       |   30 +
 .../HIVE/package/templates/hcat-env.sh.j2       |   25 +
 .../child_quicklinks_with_attributes.json       |   64 +
 .../child_quicklinks_with_properties.json       |   64 -
 .../resources/example_quicklinks_profile.json   |    4 +-
 .../inconsistent_quicklinks_profile.json        |    2 +-
 .../src/test/resources/metrics.properties       |   29 +
 .../parent_quicklinks_with_attributes.json      |   65 +
 .../parent_quicklinks_with_properties.json      |   65 -
 ambari-web/app/assets/test/tests.js             |    8 +
 .../global/background_operations_controller.js  |    4 +-
 .../app/controllers/global/update_controller.js |   18 +-
 .../journalNode/progress_controller.js          |    3 +-
 .../journalNode/step1_controller.js             |   25 +-
 .../journalNode/step2_controller.js             |   15 +-
 .../journalNode/step4_controller.js             |   17 +-
 .../journalNode/step6_controller.js             |    4 +-
 .../journalNode/step7_controller.js             |    2 +-
 .../journalNode/wizard_controller.js            |   44 +-
 .../nameNode/rollback_controller.js             |    1 +
 .../nameNode/step9_controller.js                |   19 +-
 .../main/admin/kerberos/disable_controller.js   |   10 +-
 .../main/admin/stack_and_upgrade_controller.js  |   46 +-
 .../manage_alert_notifications_controller.js    |   34 +-
 ambari-web/app/controllers/main/host.js         |   20 +-
 ambari-web/app/controllers/main/host/details.js |  305 +--
 ambari-web/app/controllers/main/service.js      |    9 +-
 ambari-web/app/controllers/main/service/item.js |    2 +-
 ambari-web/app/controllers/wizard.js            |    6 +-
 .../app/controllers/wizard/step6_controller.js  |    4 +-
 .../data/configs/services/yarn_properties.js    |    6 +
 ambari-web/app/messages.js                      |   29 +-
 .../details/support_client_configs_download.js  |   45 +-
 ambari-web/app/routes/installer.js              |   22 +
 ambari-web/app/routes/views.js                  |   10 +
 ambari-web/app/styles/alerts.less               |   16 +
 ambari-web/app/styles/application.less          |    7 +-
 ambari-web/app/styles/bootstrap_overrides.less  |    4 +
 .../app/styles/enhanced_service_dashboard.less  |   40 +-
 ambari-web/app/styles/stack_versions.less       |   34 +-
 .../modal_popups/dependent_configs_list.hbs     |  138 +-
 .../templates/main/admin/service_auto_start.hbs |    2 +-
 .../stack_upgrade/upgrade_version_column.hbs    |    2 -
 .../main/admin/stack_upgrade/versions.hbs       |    2 +-
 .../alerts/manage_alert_notifications_popup.hbs |    2 +-
 ambari-web/app/templates/main/host/details.hbs  |    5 +
 .../host/details/addDeleteComponentPopup.hbs    |    8 +-
 .../main/service/all_services_actions.hbs       |    7 +
 ambari-web/app/utils/config.js                  |    8 +-
 ambari-web/app/utils/ember_reopen.js            |    5 +
 ambari-web/app/utils/http_client.js             |    6 +-
 ambari-web/app/utils/validator.js               |    4 +-
 .../app/views/common/chart/linear_time.js       |    6 +-
 .../configs/service_configs_by_category_view.js |    7 +-
 .../dependent_configs_list_popup.js             |    8 +-
 .../app/views/main/admin/service_auto_start.js  |    2 +-
 .../service_auto_start/component_auto_start.js  |    2 +-
 .../admin/stack_upgrade/upgrade_history_view.js |    4 +-
 .../upgrade_version_column_view.js              |   10 +-
 .../alerts/manage_alert_notifications_view.js   |    4 +
 ambari-web/app/views/main/host/details.js       |    2 +
 .../service/widgets/create/expression_view.js   |    1 +
 .../global/background_operations_test.js        |   17 +-
 .../journalNode/progress_controller_test.js     |   67 +
 .../journalNode/step1_controller_test.js        |  245 +++
 .../journalNode/step2_controller_test.js        |  281 +++
 .../journalNode/step4_controller_test.js        |  220 ++
 .../journalNode/step6_controller_test.js        |   74 +
 .../journalNode/step7_controller_test.js        |   46 +
 .../journalNode/step8_controller_test.js        |   61 +
 .../journalNode/wizard_controller_test.js       |  404 ++++
 .../nameNode/step3_controller_test.js           |    4 +-
 .../admin/stack_and_upgrade_controller_test.js  |  150 +-
 ...anage_alert_notifications_controller_test.js |  154 +-
 .../test/controllers/main/host/details_test.js  |  138 +-
 .../test/controllers/main/service/item_test.js  |    4 +-
 .../test/controllers/wizard/step6_test.js       |   10 +
 .../objects/service_config_property_test.js     |   25 +
 ambari-web/test/utils/validator_test.js         |    5 +-
 contrib/utils/perf/deploy-gce-perf-cluster.py   |    2 +
 .../view/hive2/resources/jobs/Aggregator.java   |  137 +-
 .../src/main/resources/view.log4j.properties    |    6 +-
 contrib/views/hive/pom.xml                      |  386 ----
 .../apache/ambari/view/hive/BaseService.java    |   54 -
 .../apache/ambari/view/hive/HelpService.java    |  132 --
 .../apache/ambari/view/hive/HiveViewImpl.java   |   50 -
 .../ambari/view/hive/PropertyValidator.java     |  113 --
 .../org/apache/ambari/view/hive/TestBean.java   |   36 -
 .../backgroundjobs/BackgroundJobController.java |   90 -
 .../view/hive/client/ColumnDescription.java     |   48 -
 .../hive/client/ColumnDescriptionExtended.java  |  103 -
 .../hive/client/ColumnDescriptionShort.java     |   72 -
 .../ambari/view/hive/client/Connection.java     |  740 -------
 .../view/hive/client/ConnectionFactory.java     |  166 --
 .../apache/ambari/view/hive/client/Cursor.java  |  243 ---
 .../ambari/view/hive/client/DDLDelegator.java   |  140 --
 .../view/hive/client/HiveAuthCredentials.java   |   31 -
 .../hive/client/HiveAuthRequiredException.java  |   27 -
 .../ambari/view/hive/client/HiveCall.java       |  120 --
 .../client/HiveClientAuthRequiredException.java |   25 -
 .../view/hive/client/HiveClientException.java   |   25 -
 .../hive/client/HiveClientRuntimeException.java |   25 -
 .../hive/client/HiveErrorStatusException.java   |   30 -
 .../hive/client/HiveInvalidQueryException.java  |   27 -
 .../hive/client/HttpBasicAuthInterceptor.java   |   55 -
 .../client/HttpKerberosRequestInterceptor.java  |   72 -
 .../hive/client/HttpRequestInterceptorBase.java |   88 -
 .../ambari/view/hive/client/LogsCursor.java     |   36 -
 .../org/apache/ambari/view/hive/client/Row.java |   74 -
 .../view/hive/client/UserLocalConnection.java   |   48 -
 .../client/UserLocalHiveAuthCredentials.java    |   33 -
 .../apache/ambari/view/hive/client/Utils.java   |  141 --
 .../view/hive/client/ViewSessionState.java      |   32 -
 .../view/hive/persistence/DataStoreStorage.java |  142 --
 .../view/hive/persistence/IStorageFactory.java  |   23 -
 .../persistence/InstanceKeyValueStorage.java    |  135 --
 .../view/hive/persistence/KeyValueStorage.java  |  163 --
 .../hive/persistence/LocalKeyValueStorage.java  |   73 -
 .../persistence/PersistentConfiguration.java    |   52 -
 .../ambari/view/hive/persistence/Storage.java   |   77 -
 .../utils/ContextConfigurationAdapter.java      |  260 ---
 .../persistence/utils/FilteringStrategy.java    |   32 -
 .../view/hive/persistence/utils/Indexed.java    |   36 -
 .../hive/persistence/utils/ItemNotFound.java    |   43 -
 .../utils/OnlyOwnersFilteringStrategy.java      |   38 -
 .../view/hive/persistence/utils/Owned.java      |   36 -
 .../persistence/utils/PersonalResource.java     |   22 -
 .../hive/persistence/utils/StorageFactory.java  |   69 -
 .../hive/resources/CRUDResourceManager.java     |  131 --
 .../view/hive/resources/IResourceManager.java   |   37 -
 .../resources/PersonalCRUDResourceManager.java  |   99 -
 .../resources/SharedCRUDResourceManager.java    |   44 -
 .../resources/browser/HiveBrowserService.java   |  276 ---
 .../view/hive/resources/files/FileResource.java |   70 -
 .../view/hive/resources/files/FileService.java  |  266 ---
 .../view/hive/resources/jobs/Aggregator.java    |  417 ----
 .../resources/jobs/ConnectionController.java    |   74 -
 .../hive/resources/jobs/FileResourceShort.java  |   55 -
 .../jobs/IOperationHandleResourceManager.java   |   40 -
 .../resources/jobs/JobResourceProvider.java     |  113 --
 .../view/hive/resources/jobs/JobService.java    |  609 ------
 .../view/hive/resources/jobs/LogParser.java     |  139 --
 .../jobs/ModifyNotificationDelegate.java        |   23 -
 .../ModifyNotificationInvocationHandler.java    |   40 -
 .../jobs/NoOperationStatusSetException.java     |   23 -
 .../jobs/OperationHandleController.java         |  135 --
 .../jobs/OperationHandleControllerFactory.java  |   43 -
 .../jobs/OperationHandleResourceManager.java    |  120 --
 .../hive/resources/jobs/ProgressRetriever.java  |   67 -
 .../jobs/ResultsPaginationController.java       |  240 ---
 .../resources/jobs/StoredOperationHandle.java   |  146 --
 .../hive/resources/jobs/atsJobs/ATSParser.java  |  248 ---
 .../jobs/atsJobs/ATSParserFactory.java          |   45 -
 .../jobs/atsJobs/ATSRequestsDelegate.java       |   47 -
 .../jobs/atsJobs/ATSRequestsDelegateImpl.java   |  175 --
 .../resources/jobs/atsJobs/HiveQueryId.java     |   42 -
 .../hive/resources/jobs/atsJobs/IATSParser.java |   39 -
 .../hive/resources/jobs/atsJobs/TezDagId.java   |   26 -
 .../resources/jobs/atsJobs/TezVertexId.java     |   24 -
 .../view/hive/resources/jobs/rm/RMParser.java   |  129 --
 .../hive/resources/jobs/rm/RMParserFactory.java |   49 -
 .../resources/jobs/rm/RMRequestsDelegate.java   |   31 -
 .../jobs/rm/RMRequestsDelegateImpl.java         |  100 -
 .../jobs/viewJobs/IJobControllerFactory.java    |   23 -
 .../view/hive/resources/jobs/viewJobs/Job.java  |  130 --
 .../resources/jobs/viewJobs/JobController.java  |   53 -
 .../jobs/viewJobs/JobControllerFactory.java     |   41 -
 .../jobs/viewJobs/JobControllerImpl.java        |  401 ----
 .../hive/resources/jobs/viewJobs/JobImpl.java   |  323 ---
 .../hive/resources/jobs/viewJobs/JobInfo.java   |   78 -
 .../jobs/viewJobs/JobResourceManager.java       |  107 -
 .../resources/resources/FileResourceItem.java   |   78 -
 .../resources/FileResourceResourceManager.java  |   65 -
 .../resources/FileResourceResourceProvider.java |  110 -
 .../resources/FileResourceService.java          |  180 --
 .../hive/resources/savedQueries/SavedQuery.java |   96 -
 .../savedQueries/SavedQueryResourceManager.java |  162 --
 .../SavedQueryResourceProvider.java             |  113 --
 .../savedQueries/SavedQueryService.java         |  266 ---
 .../ambari/view/hive/resources/udfs/UDF.java    |   87 -
 .../hive/resources/udfs/UDFResourceManager.java |   65 -
 .../resources/udfs/UDFResourceProvider.java     |  111 --
 .../view/hive/resources/udfs/UDFService.java    |  193 --
 .../view/hive/resources/uploads/CSVParams.java  |   74 -
 .../uploads/ColumnDescriptionImpl.java          |  142 --
 .../hive/resources/uploads/HiveFileType.java    |   30 -
 .../hive/resources/uploads/TableDataReader.java |  111 --
 .../view/hive/resources/uploads/TableInput.java |   51 -
 .../resources/uploads/UploadFromHdfsInput.java  |  130 --
 .../hive/resources/uploads/UploadService.java   |  556 ------
 .../resources/uploads/parsers/DataParser.java   |   66 -
 .../uploads/parsers/EndOfDocumentException.java |   41 -
 .../hive/resources/uploads/parsers/IParser.java |   32 -
 .../resources/uploads/parsers/ParseOptions.java |   61 -
 .../resources/uploads/parsers/ParseUtils.java   |  213 --
 .../hive/resources/uploads/parsers/Parser.java  |  161 --
 .../resources/uploads/parsers/PreviewData.java  |   56 -
 .../resources/uploads/parsers/RowIterator.java  |   98 -
 .../uploads/parsers/RowMapIterator.java         |   29 -
 .../parsers/csv/commonscsv/CSVIterator.java     |   57 -
 .../parsers/csv/commonscsv/CSVParser.java       |   88 -
 .../parsers/csv/opencsv/OpenCSVIterator.java    |   56 -
 .../parsers/csv/opencsv/OpenCSVParser.java      |   92 -
 .../uploads/parsers/json/JSONIterator.java      |  160 --
 .../uploads/parsers/json/JSONParser.java        |   85 -
 .../uploads/parsers/xml/XMLIterator.java        |  195 --
 .../uploads/parsers/xml/XMLParser.java          |  100 -
 .../uploads/query/DeleteQueryInput.java         |   48 -
 .../uploads/query/InsertFromQueryInput.java     |   92 -
 .../resources/uploads/query/LoadQueryInput.java |   67 -
 .../resources/uploads/query/QueryGenerator.java |  142 --
 .../hive/resources/uploads/query/RowFormat.java |   57 -
 .../hive/resources/uploads/query/TableInfo.java |   96 -
 .../utils/BadRequestFormattedException.java     |   27 -
 .../ambari/view/hive/utils/FilePaginator.java   |  127 --
 .../utils/HiveClientFormattedException.java     |   26 -
 .../MisconfigurationFormattedException.java     |   47 -
 .../hive/utils/NotFoundFormattedException.java  |   27 -
 .../hive/utils/ServiceFormattedException.java   |  107 -
 .../view/hive/utils/SharedObjectsFactory.java   |  187 --
 .../src/main/resources/ui/hive-web/.bowerrc     |    4 -
 .../main/resources/ui/hive-web/.editorconfig    |   34 -
 .../src/main/resources/ui/hive-web/.ember-cli   |   27 -
 .../src/main/resources/ui/hive-web/.gitignore   |   37 -
 .../src/main/resources/ui/hive-web/.jshintrc    |   33 -
 .../src/main/resources/ui/hive-web/.travis.yml  |   38 -
 .../src/main/resources/ui/hive-web/Brocfile.js  |   54 -
 .../src/main/resources/ui/hive-web/README.md    |   14 -
 .../ui/hive-web/app/adapters/application.js     |   54 -
 .../ui/hive-web/app/adapters/database.js        |   25 -
 .../ui/hive-web/app/adapters/file-upload.js     |   30 -
 .../resources/ui/hive-web/app/adapters/file.js  |   26 -
 .../ui/hive-web/app/adapters/upload-table.js    |   89 -
 .../src/main/resources/ui/hive-web/app/app.js   |   34 -
 .../ui/hive-web/app/components/.gitkeep         |    0
 .../app/components/alert-message-widget.js      |   35 -
 .../app/components/collapsible-widget.js        |   38 -
 .../app/components/column-filter-widget.js      |   56 -
 .../app/components/date-range-widget.js         |   98 -
 .../hive-web/app/components/expander-widget.js  |   36 -
 .../hive-web/app/components/extended-input.js   |   50 -
 .../ui/hive-web/app/components/file-upload.js   |   34 -
 .../ui/hive-web/app/components/input-header.js  |   61 -
 .../ui/hive-web/app/components/job-tr-view.js   |   41 -
 .../ui/hive-web/app/components/modal-widget.js  |   58 -
 .../ui/hive-web/app/components/navbar-widget.js |   42 -
 .../ui/hive-web/app/components/no-bubbling.js   |   31 -
 .../ui/hive-web/app/components/notify-widget.js |   31 -
 .../app/components/number-range-widget.js       |   79 -
 .../ui/hive-web/app/components/panel-widget.js  |   30 -
 .../hive-web/app/components/popover-widget.js   |   34 -
 .../hive-web/app/components/progress-widget.js  |   30 -
 .../ui/hive-web/app/components/query-editor.js  |  129 --
 .../ui/hive-web/app/components/radio-button.js  |   39 -
 .../ui/hive-web/app/components/select-widget.js |   66 -
 .../ui/hive-web/app/components/tabs-widget.js   |   68 -
 .../ui/hive-web/app/components/tree-view.js     |   23 -
 .../hive-web/app/components/typeahead-widget.js |  108 -
 .../ui/hive-web/app/components/udf-tr-view.js   |   81 -
 .../ui/hive-web/app/components/upload-query.js  |   32 -
 .../app/components/validated-text-field.js      |   62 -
 .../app/components/visualization-tabs-widget.js |   56 -
 .../ui/hive-web/app/controllers/.gitkeep        |    0
 .../ui/hive-web/app/controllers/application.js  |   26 -
 .../ui/hive-web/app/controllers/databases.js    |  465 -----
 .../ui/hive-web/app/controllers/history.js      |  257 ---
 .../ui/hive-web/app/controllers/index.js        |  767 -------
 .../controllers/index/history-query/explain.js  |  142 --
 .../app/controllers/index/history-query/logs.js |  108 -
 .../controllers/index/history-query/results.js  |  238 ---
 .../ui/hive-web/app/controllers/insert-udfs.js  |   58 -
 .../ui/hive-web/app/controllers/messages.js     |   41 -
 .../ui/hive-web/app/controllers/modal-delete.js |   33 -
 .../app/controllers/modal-save-query.js         |   42 -
 .../ui/hive-web/app/controllers/modal-save.js   |   34 -
 .../ui/hive-web/app/controllers/open-queries.js |  400 ----
 .../ui/hive-web/app/controllers/queries.js      |  145 --
 .../ui/hive-web/app/controllers/query-tabs.js   |  176 --
 .../ui/hive-web/app/controllers/settings.js     |   69 -
 .../ui/hive-web/app/controllers/splash.js       |  164 --
 .../ui/hive-web/app/controllers/tez-ui.js       |  106 -
 .../ui/hive-web/app/controllers/udfs.js         |  143 --
 .../ui/hive-web/app/controllers/upload-table.js |  965 ---------
 .../hive-web/app/controllers/visual-explain.js  |   64 -
 .../app/controllers/visualization-ui.js         |  134 --
 .../resources/ui/hive-web/app/helpers/.gitkeep  |    0
 .../ui/hive-web/app/helpers/all-uppercase.js    |   25 -
 .../ui/hive-web/app/helpers/code-helper.js      |   28 -
 .../ui/hive-web/app/helpers/date-binding.js     |   27 -
 .../hive-web/app/helpers/format-column-type.js  |   39 -
 .../ui/hive-web/app/helpers/log-helper.js       |   28 -
 .../ui/hive-web/app/helpers/path-binding.js     |   29 -
 .../hive-web/app/helpers/preformatted-string.js |   28 -
 .../ui/hive-web/app/helpers/tb-helper.js        |   33 -
 .../main/resources/ui/hive-web/app/index.html   |   42 -
 .../ui/hive-web/app/initializers/i18n.js        |  348 ----
 .../ui/hive-web/app/mixins/filterable.js        |  106 -
 .../ui/hive-web/app/mixins/sortable.js          |   31 -
 .../resources/ui/hive-web/app/models/.gitkeep   |    0
 .../ui/hive-web/app/models/database.js          |   25 -
 .../ui/hive-web/app/models/file-resource.js     |   25 -
 .../resources/ui/hive-web/app/models/file.js    |   26 -
 .../resources/ui/hive-web/app/models/job.js     |   55 -
 .../ui/hive-web/app/models/saved-query.js       |   29 -
 .../resources/ui/hive-web/app/models/udf.js     |   27 -
 .../main/resources/ui/hive-web/app/router.js    |   50 -
 .../resources/ui/hive-web/app/routes/.gitkeep   |    0
 .../ui/hive-web/app/routes/application.js       |   89 -
 .../resources/ui/hive-web/app/routes/history.js |   29 -
 .../app/routes/index/history-query/explain.js   |   28 -
 .../app/routes/index/history-query/index.js     |   44 -
 .../app/routes/index/history-query/logs.js      |   28 -
 .../app/routes/index/history-query/results.js   |   28 -
 .../ui/hive-web/app/routes/index/index.js       |   36 -
 .../ui/hive-web/app/routes/index/saved-query.js |   43 -
 .../resources/ui/hive-web/app/routes/loading.js |   22 -
 .../resources/ui/hive-web/app/routes/queries.js |   40 -
 .../resources/ui/hive-web/app/routes/splash.js  |   61 -
 .../resources/ui/hive-web/app/routes/udfs.js    |   36 -
 .../ui/hive-web/app/serializers/database.js     |   41 -
 .../ui/hive-web/app/serializers/file.js         |   23 -
 .../ui/hive-web/app/services/database.js        |  243 ---
 .../resources/ui/hive-web/app/services/file.js  |   59 -
 .../ui/hive-web/app/services/history.js         |  204 --
 .../ui/hive-web/app/services/job-progress.js    |  102 -
 .../resources/ui/hive-web/app/services/job.js   |   56 -
 .../app/services/ldap-authentication.js         |   41 -
 .../ui/hive-web/app/services/notify.js          |  113 --
 .../ui/hive-web/app/services/session.js         |   48 -
 .../ui/hive-web/app/services/settings.js        |  193 --
 .../resources/ui/hive-web/app/styles/.gitkeep   |    0
 .../resources/ui/hive-web/app/styles/app.scss   |  716 -------
 .../hive-web/app/styles/dropdown-submenu.scss   |   65 -
 .../ui/hive-web/app/styles/mixins.scss          |   28 -
 .../ui/hive-web/app/styles/notifications.scss   |   37 -
 .../ui/hive-web/app/styles/query-tabs.scss      |   69 -
 .../resources/ui/hive-web/app/styles/vars.scss  |   21 -
 .../ui/hive-web/app/templates/.gitkeep          |    0
 .../ui/hive-web/app/templates/application.hbs   |   26 -
 .../hive-web/app/templates/components/.gitkeep  |    0
 .../components/alert-message-widget.hbs         |   28 -
 .../templates/components/collapsible-widget.hbs |   33 -
 .../components/column-filter-widget.hbs         |   42 -
 .../templates/components/date-range-widget.hbs  |   22 -
 .../templates/components/expander-widget.hbs    |   31 -
 .../app/templates/components/input-header.hbs   |   20 -
 .../app/templates/components/job-tr-view.hbs    |   49 -
 .../app/templates/components/modal-widget.hbs   |   35 -
 .../app/templates/components/navbar-widget.hbs  |   45 -
 .../app/templates/components/no-bubbling.hbs    |   19 -
 .../app/templates/components/notify-widget.hbs  |   21 -
 .../components/number-range-widget.hbs          |   23 -
 .../app/templates/components/panel-widget.hbs   |   54 -
 .../app/templates/components/popover-widget.hbs |   19 -
 .../templates/components/progress-widget.hbs    |   23 -
 .../app/templates/components/query-editor.hbs   |   19 -
 .../app/templates/components/select-widget.hbs  |   39 -
 .../app/templates/components/tabs-widget.hbs    |   41 -
 .../app/templates/components/tree-view.hbs      |   28 -
 .../app/templates/components/udf-tr-view.hbs    |   77 -
 .../components/validated-text-field.hbs         |   23 -
 .../components/visualization-tabs-widget.hbs    |   27 -
 .../app/templates/databases-search-results.hbs  |   54 -
 .../hive-web/app/templates/databases-tree.hbs   |   50 -
 .../ui/hive-web/app/templates/databases.hbs     |   54 -
 .../ui/hive-web/app/templates/history.hbs       |   67 -
 .../ui/hive-web/app/templates/index.hbs         |  134 --
 .../templates/index/history-query/explain.hbs   |   27 -
 .../app/templates/index/history-query/logs.hbs  |   19 -
 .../templates/index/history-query/results.hbs   |   56 -
 .../ui/hive-web/app/templates/insert-udfs.hbs   |   46 -
 .../ui/hive-web/app/templates/loading.hbs       |   19 -
 .../ui/hive-web/app/templates/logs.hbs          |   19 -
 .../ui/hive-web/app/templates/message.hbs       |   36 -
 .../ui/hive-web/app/templates/messages.hbs      |   32 -
 .../ui/hive-web/app/templates/modal-delete.hbs  |   21 -
 .../hive-web/app/templates/modal-save-query.hbs |   24 -
 .../ui/hive-web/app/templates/modal-save.hbs    |   21 -
 .../ui/hive-web/app/templates/notification.hbs  |   23 -
 .../ui/hive-web/app/templates/open-queries.hbs  |   23 -
 .../ui/hive-web/app/templates/queries.hbs       |   96 -
 .../ui/hive-web/app/templates/query-tabs.hbs    |   28 -
 .../ui/hive-web/app/templates/redirect.hbs      |   19 -
 .../ui/hive-web/app/templates/settings.hbs      |   70 -
 .../ui/hive-web/app/templates/splash.hbs        |  117 --
 .../ui/hive-web/app/templates/tez-ui.hbs        |   31 -
 .../ui/hive-web/app/templates/udfs.hbs          |   53 -
 .../ui/hive-web/app/templates/upload-table.hbs  |  296 ---
 .../hive-web/app/templates/visual-explain.hbs   |   93 -
 .../hive-web/app/templates/visualization-ui.hbs |   37 -
 .../ui/hive-web/app/transforms/date.js          |   49 -
 .../ui/hive-web/app/utils/constants.js          |  230 ---
 .../ui/hive-web/app/utils/dag-rules.js          |  141 --
 .../ui/hive-web/app/utils/functions.js          |  139 --
 .../resources/ui/hive-web/app/views/.gitkeep    |    0
 .../resources/ui/hive-web/app/views/index.js    |   28 -
 .../resources/ui/hive-web/app/views/message.js  |   36 -
 .../resources/ui/hive-web/app/views/messages.js |   37 -
 .../ui/hive-web/app/views/notification.js       |   51 -
 .../resources/ui/hive-web/app/views/tez-ui.js   |   37 -
 .../ui/hive-web/app/views/visual-explain.js     |  461 -----
 .../ui/hive-web/app/views/visualization-ui.js   |   37 -
 .../main/resources/ui/hive-web/big_tables.js    |   54 -
 .../src/main/resources/ui/hive-web/bower.json   |   28 -
 .../resources/ui/hive-web/config/environment.js |   70 -
 .../src/main/resources/ui/hive-web/package.json |   47 -
 .../src/main/resources/ui/hive-web/testem.json  |   10 -
 .../main/resources/ui/hive-web/tests/.jshintrc  |   74 -
 .../ui/hive-web/tests/blanket-options.js        |   36 -
 .../ui/hive-web/tests/helpers/api-mock.js       |  304 ---
 .../ui/hive-web/tests/helpers/dbclick.js        |   26 -
 .../ui/hive-web/tests/helpers/resolver.js       |   29 -
 .../ui/hive-web/tests/helpers/start-app.js      |   43 -
 .../resources/ui/hive-web/tests/img/spinner.gif |  Bin 11435 -> 0 bytes
 .../main/resources/ui/hive-web/tests/index.html |   71 -
 .../hive-web/tests/integration/database-test.js |  130 --
 .../hive-web/tests/integration/history-test.js  |   95 -
 .../tests/integration/query-editor-test.js      |  126 --
 .../tests/integration/saved-queries-test.js     |  152 --
 .../hive-web/tests/integration/tez-ui-test.js   |   49 -
 .../ui/hive-web/tests/integration/udfs-test.js  |  109 -
 .../resources/ui/hive-web/tests/test-helper.js  |   24 -
 .../resources/ui/hive-web/tests/unit/.gitkeep   |    0
 .../hive-web/tests/unit/adapters/application.js |   48 -
 .../ui/hive-web/tests/unit/adapters/file.js     |   39 -
 .../components/alert-message-widget-test.js     |   91 -
 .../unit/components/collapsible-widget-test.js  |   46 -
 .../components/column-filter-widget-test.js     |  138 --
 .../unit/components/date-range-widget-test.js   |  132 --
 .../unit/components/expander-widget-test.js     |   59 -
 .../unit/components/extended-input-test.js      |   81 -
 .../tests/unit/components/job-tr-view-test.js   |   62 -
 .../tests/unit/components/modal-widget-test.js  |   69 -
 .../tests/unit/components/no-bubbling-test.js   |   44 -
 .../unit/components/number-range-widget-test.js |   70 -
 .../unit/components/popover-widget-test.js      |   36 -
 .../unit/components/progress-widget-test.js     |   40 -
 .../tests/unit/components/query-editor-test.js  |   52 -
 .../tests/unit/components/select-widget-test.js |  158 --
 .../tests/unit/components/tabs-wiget-test.js    |  117 --
 .../unit/components/typeahead-widget-test.js    |   46 -
 .../tests/unit/components/udf-tr-view-test.js   |  122 --
 .../tests/unit/controllers/databases-test.js    |  276 ---
 .../tests/unit/controllers/history-test.js      |  117 --
 .../tests/unit/controllers/index-test.js        |  328 ---
 .../tests/unit/controllers/insert-udfs-test.js  |   68 -
 .../tests/unit/controllers/messages-test.js     |   53 -
 .../tests/unit/controllers/open-queries-test.js |  102 -
 .../tests/unit/controllers/queries-test.js      |   35 -
 .../tests/unit/controllers/settings-test.js     |  136 --
 .../tests/unit/controllers/tez-ui-test.js       |   98 -
 .../tests/unit/controllers/udfs-test.js         |   82 -
 .../tests/unit/helpers/path-binding-test.js     |   35 -
 .../hive-web/tests/unit/services/notify-test.js |  155 --
 .../tests/unit/services/settings-test.js        |  155 --
 .../tests/unit/views/visual-explain-test.js     |  106 -
 .../main/resources/ui/hive-web/vendor/.gitkeep  |    0
 .../vendor/codemirror/codemirror-min.js         |   17 -
 .../hive-web/vendor/codemirror/codemirror.css   |  309 ---
 .../ui/hive-web/vendor/codemirror/show-hint.css |   38 -
 .../ui/hive-web/vendor/codemirror/show-hint.js  |  389 ----
 .../ui/hive-web/vendor/codemirror/sql-hint.js   |  192 --
 .../resources/ui/hive-web/vendor/dagre.min.js   |   27 -
 .../src/main/resources/view.log4j.properties    |   27 -
 contrib/views/hive/src/main/resources/view.xml  |  347 ----
 .../apache/ambari/view/hive/BaseHiveTest.java   |  116 --
 .../org/apache/ambari/view/hive/HDFSTest.java   |   64 -
 .../ambari/view/hive/PropertyValidatorTest.java |  112 --
 .../ambari/view/hive/ServiceTestUtils.java      |   63 -
 .../BackgroundJobControllerTest.java            |   77 -
 .../ambari/view/hive/client/ConnectionTest.java |   73 -
 .../ambari/view/hive/client/UtilsTest.java      |   78 -
 .../hive/resources/files/FileServiceTest.java   |  273 ---
 .../view/hive/resources/jobs/ATSParserTest.java |  512 -----
 .../hive/resources/jobs/AggregatorTest.java     |  506 -----
 .../hive/resources/jobs/JobLDAPServiceTest.java |  159 --
 .../hive/resources/jobs/JobServiceTest.java     |  225 ---
 .../view/hive/resources/jobs/LogParserTest.java |   73 -
 .../resources/FileResourceServiceTest.java      |  119 --
 .../SavedQueryResourceManagerTest.java          |   55 -
 .../savedQueries/SavedQueryServiceTest.java     |  191 --
 .../hive/resources/udfs/UDFServiceTest.java     |  119 --
 .../hive/resources/upload/CSVParserTest.java    |  275 ---
 .../resources/upload/DataParserCSVTest.java     |  326 ---
 .../resources/upload/DataParserJSONTest.java    |  263 ---
 .../resources/upload/DataParserXMLTest.java     |  295 ---
 .../hive/resources/upload/JsonParserTest.java   |  147 --
 .../resources/upload/OpenCSVParserTest.java     |  333 ----
 .../view/hive/resources/upload/OpenCSVTest.java |  259 ---
 .../hive/resources/upload/ParseUtilsTest.java   |   56 -
 .../resources/upload/QueryGeneratorTest.java    |  108 -
 .../resources/upload/TableDataReaderTest.java   |  127 --
 .../hive/resources/upload/XMLParserTest.java    |  138 --
 .../ambari/view/hive/utils/HdfsApiMock.java     |   86 -
 .../utils/SeekableByteArrayInputStream.java     |   71 -
 contrib/views/hive20/pom.xml                    |  431 ++++
 .../apache/ambari/view/hive20/AuthParams.java   |  102 +
 .../apache/ambari/view/hive20/BaseService.java  |   59 +
 .../ambari/view/hive20/ConnectionDelegate.java  |   37 +
 .../ambari/view/hive20/ConnectionFactory.java   |  167 ++
 .../ambari/view/hive20/ConnectionSystem.java    |  158 ++
 .../apache/ambari/view/hive20/DataMigrator.java |  101 +
 .../apache/ambari/view/hive20/HelpService.java  |  132 ++
 .../view/hive20/HiveJdbcConnectionDelegate.java |  106 +
 .../apache/ambari/view/hive20/HiveViewImpl.java |   52 +
 .../ambari/view/hive20/PropertyValidator.java   |  107 +
 .../org/apache/ambari/view/hive20/TestBean.java |   36 +
 .../hive20/actor/DatabaseChangeNotifier.java    |  168 ++
 .../view/hive20/actor/DatabaseManager.java      |  285 +++
 .../ambari/view/hive20/actor/DeathWatch.java    |   54 +
 .../ambari/view/hive20/actor/HiveActor.java     |   50 +
 .../ambari/view/hive20/actor/JdbcConnector.java |  642 ++++++
 .../ambari/view/hive20/actor/LogAggregator.java |  119 ++
 .../view/hive20/actor/MetaDataManager.java      |  134 ++
 .../view/hive20/actor/MetaDataRetriever.java    |  165 ++
 .../view/hive20/actor/OperationController.java  |  408 ++++
 .../view/hive20/actor/ResultSetIterator.java    |  165 ++
 .../view/hive20/actor/StatementExecutor.java    |  150 ++
 .../view/hive20/actor/TableChangeNotifier.java  |   95 +
 .../view/hive20/actor/YarnAtsGUIDFetcher.java   |   71 +
 .../view/hive20/actor/message/Connect.java      |   77 +
 .../view/hive20/actor/message/CursorReset.java  |   22 +
 .../view/hive20/actor/message/ExecuteJob.java   |   38 +
 .../view/hive20/actor/message/ExecuteQuery.java |   23 +
 .../view/hive20/actor/message/FetchError.java   |   42 +
 .../view/hive20/actor/message/FetchResult.java  |   42 +
 .../actor/message/GetColumnMetadataJob.java     |   59 +
 .../view/hive20/actor/message/GetMoreLogs.java  |   22 +
 .../view/hive20/actor/message/HiveJob.java      |   48 +
 .../view/hive20/actor/message/HiveMessage.java  |   53 +
 .../view/hive20/actor/message/JobRejected.java  |   44 +
 .../view/hive20/actor/message/JobSubmitted.java |   38 +
 .../actor/message/LogAggregationFinished.java   |   21 +
 .../ambari/view/hive20/actor/message/Ping.java  |   40 +
 .../hive20/actor/message/RegisterActor.java     |   34 +
 .../view/hive20/actor/message/ResetCursor.java  |   22 +
 .../hive20/actor/message/ResultInformation.java |   83 +
 .../hive20/actor/message/ResultNotReady.java    |   40 +
 .../view/hive20/actor/message/ResultReady.java  |   44 +
 .../view/hive20/actor/message/RunStatement.java |   73 +
 .../hive20/actor/message/SQLStatementJob.java   |   64 +
 .../actor/message/StartLogAggregation.java      |   34 +
 .../actor/message/job/AsyncExecutionFailed.java |   46 +
 .../hive20/actor/message/job/CancelJob.java     |   40 +
 .../actor/message/job/ExecuteNextStatement.java |   22 +
 .../actor/message/job/ExecutionFailed.java      |   31 +
 .../view/hive20/actor/message/job/Failure.java  |   37 +
 .../hive20/actor/message/job/FetchFailed.java   |   31 +
 .../view/hive20/actor/message/job/Next.java     |   22 +
 .../hive20/actor/message/job/NoMoreItems.java   |   21 +
 .../view/hive20/actor/message/job/NoResult.java |   21 +
 .../view/hive20/actor/message/job/Result.java   |   43 +
 .../actor/message/job/ResultSetHolder.java      |   33 +
 .../actor/message/job/SaveDagInformation.java   |   52 +
 .../hive20/actor/message/job/SaveGuidToDB.java  |   46 +
 .../actor/message/job/UpdateYarnAtsGuid.java    |   44 +
 .../hive20/actor/message/lifecycle/CleanUp.java |   21 +
 .../message/lifecycle/DestroyConnector.java     |   52 +
 .../actor/message/lifecycle/FreeConnector.java  |   53 +
 .../message/lifecycle/InactivityCheck.java      |   21 +
 .../actor/message/lifecycle/KeepAlive.java      |   21 +
 .../lifecycle/TerminateInactivityCheck.java     |   21 +
 .../backgroundjobs/BackgroundJobController.java |   84 +
 .../view/hive20/client/AsyncJobRunner.java      |   38 +
 .../view/hive20/client/AsyncJobRunnerImpl.java  |  143 ++
 .../view/hive20/client/ColumnDescription.java   |   45 +
 .../client/ColumnDescriptionExtended.java       |   74 +
 .../hive20/client/ColumnDescriptionShort.java   |   53 +
 .../view/hive20/client/ConnectionConfig.java    |   59 +
 .../ambari/view/hive20/client/Cursor.java       |   30 +
 .../ambari/view/hive20/client/DDLDelegator.java |   40 +
 .../view/hive20/client/DDLDelegatorImpl.java    |  267 +++
 .../ambari/view/hive20/client/EmptyCursor.java  |  110 +
 .../view/hive20/client/HiveAuthCredentials.java |   31 +
 .../client/HiveAuthRequiredException.java       |   27 +
 .../client/HiveClientAuthRequiredException.java |   25 +
 .../view/hive20/client/HiveClientException.java |   25 +
 .../client/HiveClientRuntimeException.java      |   25 +
 .../view/hive20/client/NonPersistentCursor.java |  153 ++
 .../view/hive20/client/PersistentCursor.java    |   87 +
 .../apache/ambari/view/hive20/client/Row.java   |   74 +
 .../exceptions/NotConnectedException.java       |   28 +
 .../hive20/exceptions/ServiceException.java     |   40 +
 .../hive20/internal/AsyncExecutionFailure.java  |   23 +
 .../hive20/internal/AsyncExecutionSuccess.java  |   25 +
 .../view/hive20/internal/Connectable.java       |   65 +
 .../hive20/internal/ConnectionException.java    |   25 +
 .../hive20/internal/ConnectionProperties.java   |   94 +
 .../hive20/internal/ConnectionSupplier.java     |   37 +
 .../view/hive20/internal/ContextSupplier.java   |   37 +
 .../hive20/internal/DataStorageSupplier.java    |   42 +
 .../view/hive20/internal/DefaultSupplier.java   |   60 +
 .../ambari/view/hive20/internal/Either.java     |   79 +
 .../view/hive20/internal/HdfsApiSupplier.java   |   63 +
 .../hive20/internal/HiveConnectionWrapper.java  |  152 ++
 .../ambari/view/hive20/internal/HiveQuery.java  |   71 +
 .../ambari/view/hive20/internal/HiveResult.java |  160 ++
 .../ambari/view/hive20/internal/HiveTask.java   |   53 +
 .../view/hive20/internal/HiveTaskMessage.java   |  118 ++
 .../view/hive20/internal/SafeViewContext.java   |  179 ++
 .../view/hive20/internal/dto/ColumnInfo.java    |  117 ++
 .../view/hive20/internal/dto/ColumnOrder.java   |   54 +
 .../view/hive20/internal/dto/DatabaseInfo.java  |   85 +
 .../hive20/internal/dto/DatabaseResponse.java   |   71 +
 .../hive20/internal/dto/DetailedTableInfo.java  |  124 ++
 .../ambari/view/hive20/internal/dto/Order.java  |   37 +
 .../view/hive20/internal/dto/PartitionInfo.java |   44 +
 .../view/hive20/internal/dto/Section.java       |   46 +
 .../view/hive20/internal/dto/StorageInfo.java   |  124 ++
 .../view/hive20/internal/dto/TableInfo.java     |   79 +
 .../view/hive20/internal/dto/TableMeta.java     |  125 ++
 .../view/hive20/internal/dto/TableResponse.java |   62 +
 .../view/hive20/internal/dto/ViewInfo.java      |   52 +
 .../parsers/AbstractTableMetaParser.java        |  177 ++
 .../internal/parsers/ColumnInfoParser.java      |   97 +
 .../parsers/CreateTableStatementParser.java     |   38 +
 .../parsers/DetailedTableInfoParser.java        |   71 +
 .../hive20/internal/parsers/ParserUtils.java    |   52 +
 .../internal/parsers/PartitionInfoParser.java   |   76 +
 .../internal/parsers/StorageInfoParser.java     |  100 +
 .../internal/parsers/TableMetaParser.java       |   30 +
 .../internal/parsers/TableMetaParserImpl.java   |   79 +
 .../parsers/TableMetaSectionParser.java         |   30 +
 .../hive20/internal/parsers/ViewInfoParser.java |   47 +
 .../generators/AlterTableQueryGenerator.java    |  365 ++++
 .../generators/CreateTableQueryGenerator.java   |  165 ++
 .../generators/DeleteTableQueryGenerator.java   |   67 +
 .../query/generators/QueryGenerationUtils.java  |  151 ++
 .../query/generators/QueryGenerator.java        |   26 +
 .../hive20/persistence/DataStoreStorage.java    |  140 ++
 .../hive20/persistence/IStorageFactory.java     |   23 +
 .../persistence/InstanceKeyValueStorage.java    |  132 ++
 .../hive20/persistence/KeyValueStorage.java     |  163 ++
 .../persistence/LocalKeyValueStorage.java       |   69 +
 .../persistence/PersistentConfiguration.java    |   52 +
 .../ambari/view/hive20/persistence/Storage.java |   77 +
 .../utils/ContextConfigurationAdapter.java      |  260 +++
 .../persistence/utils/FilteringStrategy.java    |   32 +
 .../view/hive20/persistence/utils/Indexed.java  |   36 +
 .../hive20/persistence/utils/ItemNotFound.java  |   43 +
 .../utils/OnlyOwnersFilteringStrategy.java      |   38 +
 .../view/hive20/persistence/utils/Owned.java    |   36 +
 .../persistence/utils/PersonalResource.java     |   22 +
 .../persistence/utils/StorageFactory.java       |   69 +
 .../hive20/resources/CRUDResourceManager.java   |  131 ++
 .../view/hive20/resources/IResourceManager.java |   37 +
 .../resources/PersonalCRUDResourceManager.java  |   99 +
 .../resources/SharedCRUDResourceManager.java    |   44 +
 .../resources/browser/ConnectionService.java    |  155 ++
 .../view/hive20/resources/browser/DDLProxy.java |  302 +++
 .../hive20/resources/browser/DDLService.java    |  222 +++
 .../hive20/resources/browser/FileService.java   |   35 +
 .../resources/browser/HiveBrowserService.java   |  259 +++
 .../hive20/resources/files/FileResource.java    |   70 +
 .../hive20/resources/files/FileService.java     |  266 +++
 .../view/hive20/resources/jobs/Aggregator.java  |  382 ++++
 .../resources/jobs/JobResourceProvider.java     |  117 ++
 .../view/hive20/resources/jobs/JobService.java  |  626 ++++++
 .../resources/jobs/JobServiceInternal.java      |   35 +
 .../jobs/ModifyNotificationDelegate.java        |   23 +
 .../ModifyNotificationInvocationHandler.java    |   40 +
 .../jobs/NoOperationStatusSetException.java     |   23 +
 .../resources/jobs/ProgressRetriever.java       |   66 +
 .../jobs/ResultsPaginationController.java       |  286 +++
 .../resources/jobs/atsJobs/ATSParser.java       |  248 +++
 .../jobs/atsJobs/ATSParserFactory.java          |   39 +
 .../jobs/atsJobs/ATSRequestsDelegate.java       |   47 +
 .../jobs/atsJobs/ATSRequestsDelegateImpl.java   |  175 ++
 .../resources/jobs/atsJobs/HiveQueryId.java     |   42 +
 .../resources/jobs/atsJobs/IATSParser.java      |   39 +
 .../hive20/resources/jobs/atsJobs/TezDagId.java |   26 +
 .../resources/jobs/atsJobs/TezVertexId.java     |   24 +
 .../view/hive20/resources/jobs/rm/RMParser.java |  129 ++
 .../resources/jobs/rm/RMParserFactory.java      |   48 +
 .../resources/jobs/rm/RMRequestsDelegate.java   |   31 +
 .../jobs/rm/RMRequestsDelegateImpl.java         |   99 +
 .../jobs/viewJobs/IJobControllerFactory.java    |   23 +
 .../hive20/resources/jobs/viewJobs/Job.java     |  131 ++
 .../resources/jobs/viewJobs/JobController.java  |   44 +
 .../jobs/viewJobs/JobControllerFactory.java     |   40 +
 .../jobs/viewJobs/JobControllerImpl.java        |  311 +++
 .../hive20/resources/jobs/viewJobs/JobImpl.java |  335 ++++
 .../hive20/resources/jobs/viewJobs/JobInfo.java |   78 +
 .../jobs/viewJobs/JobResourceManager.java       |   93 +
 .../resources/resources/FileResourceItem.java   |   78 +
 .../resources/FileResourceResourceManager.java  |   65 +
 .../resources/FileResourceResourceProvider.java |  110 +
 .../resources/FileResourceService.java          |  180 ++
 .../resources/savedQueries/SavedQuery.java      |   96 +
 .../savedQueries/SavedQueryResourceManager.java |  162 ++
 .../SavedQueryResourceProvider.java             |  113 ++
 .../savedQueries/SavedQueryService.java         |  267 +++
 .../view/hive20/resources/settings/Setting.java |   71 +
 .../settings/SettingsResourceManager.java       |   97 +
 .../resources/settings/SettingsService.java     |  145 ++
 .../hive20/resources/system/SystemService.java  |   48 +
 .../ambari/view/hive20/resources/udfs/UDF.java  |   87 +
 .../resources/udfs/UDFResourceManager.java      |   65 +
 .../resources/udfs/UDFResourceProvider.java     |  111 ++
 .../view/hive20/resources/udfs/UDFService.java  |  193 ++
 .../hive20/resources/uploads/CSVParams.java     |   74 +
 .../uploads/ColumnDescriptionImpl.java          |  119 ++
 .../hive20/resources/uploads/HiveFileType.java  |   30 +
 .../resources/uploads/TableDataReader.java      |  111 ++
 .../hive20/resources/uploads/TableInput.java    |   51 +
 .../resources/uploads/UploadFromHdfsInput.java  |  130 ++
 .../hive20/resources/uploads/UploadService.java |  565 ++++++
 .../resources/uploads/parsers/DataParser.java   |   66 +
 .../uploads/parsers/EndOfDocumentException.java |   41 +
 .../resources/uploads/parsers/IParser.java      |   32 +
 .../resources/uploads/parsers/ParseOptions.java |   61 +
 .../resources/uploads/parsers/ParseUtils.java   |  213 ++
 .../resources/uploads/parsers/Parser.java       |  161 ++
 .../resources/uploads/parsers/PreviewData.java  |   56 +
 .../resources/uploads/parsers/RowIterator.java  |   98 +
 .../uploads/parsers/RowMapIterator.java         |   29 +
 .../parsers/csv/commonscsv/CSVIterator.java     |   57 +
 .../parsers/csv/commonscsv/CSVParser.java       |   88 +
 .../parsers/csv/opencsv/OpenCSVIterator.java    |   56 +
 .../parsers/csv/opencsv/OpenCSVParser.java      |   92 +
 .../uploads/parsers/json/JSONIterator.java      |  160 ++
 .../uploads/parsers/json/JSONParser.java        |   85 +
 .../uploads/parsers/xml/XMLIterator.java        |  195 ++
 .../uploads/parsers/xml/XMLParser.java          |  100 +
 .../uploads/query/DeleteQueryInput.java         |   48 +
 .../uploads/query/InsertFromQueryInput.java     |   92 +
 .../resources/uploads/query/LoadQueryInput.java |   67 +
 .../resources/uploads/query/QueryGenerator.java |  143 ++
 .../resources/uploads/query/RowFormat.java      |   57 +
 .../resources/uploads/query/TableInfo.java      |   97 +
 .../utils/BadRequestFormattedException.java     |   27 +
 .../ambari/view/hive20/utils/FilePaginator.java |  127 ++
 .../hive20/utils/HiveActorConfiguration.java    |   71 +
 .../utils/HiveClientFormattedException.java     |   26 +
 .../view/hive20/utils/LoggingOutputStream.java  |   85 +
 .../MisconfigurationFormattedException.java     |   47 +
 .../utils/NotFoundFormattedException.java       |   27 +
 .../utils/ResultFetchFormattedException.java    |   27 +
 .../utils/ResultNotReadyFormattedException.java |   27 +
 .../hive20/utils/ServiceFormattedException.java |  105 +
 .../view/hive20/utils/SharedObjectsFactory.java |  185 ++
 .../UniqueConstraintViolationException.java     |   31 +
 .../hive20/src/main/resources/application.conf  |   57 +
 .../views/hive20/src/main/resources/ui/.bowerrc |    4 +
 .../hive20/src/main/resources/ui/.editorconfig  |   20 +
 .../hive20/src/main/resources/ui/.ember-cli     |   27 +
 .../hive20/src/main/resources/ui/.gitignore     |   18 +
 .../hive20/src/main/resources/ui/.jshintrc      |   32 +
 .../hive20/src/main/resources/ui/.travis.yml    |   40 +
 .../src/main/resources/ui/.watchmanconfig       |   21 +
 .../hive20/src/main/resources/ui/README.md      |   28 +
 .../resources/ui/app/adapters/application.js    |   62 +
 .../main/resources/ui/app/adapters/database.js  |   22 +
 .../src/main/resources/ui/app/adapters/ddl.js   |   26 +
 .../resources/ui/app/adapters/hdfs-viewer.js    |   26 +
 .../src/main/resources/ui/app/adapters/job.js   |   31 +
 .../src/main/resources/ui/app/adapters/ping.js  |   30 +
 .../src/main/resources/ui/app/adapters/query.js |   44 +
 .../resources/ui/app/adapters/table-info.js     |   37 +
 .../src/main/resources/ui/app/adapters/table.js |   48 +
 .../hive20/src/main/resources/ui/app/app.js     |   36 +
 .../src/main/resources/ui/app/breakpoints.js    |   23 +
 .../main/resources/ui/app/components/.gitkeep   |    0
 .../ui/app/components/alert-message-display.js  |   45 +
 .../ui/app/components/alert-message.js          |   32 +
 .../resources/ui/app/components/column-item.js  |   71 +
 .../resources/ui/app/components/create-table.js |  160 ++
 .../ui/app/components/database-drop-confirm.js  |   32 +
 .../ui/app/components/database-not-empty.js     |   29 +
 .../ui/app/components/database-search-bar.js    |   78 +
 .../ui/app/components/edit-setting-item.js      |  111 ++
 .../ui/app/components/hdfs-viewer-modal.js      |   51 +
 .../resources/ui/app/components/job-item.js     |   38 +
 .../resources/ui/app/components/jobs-browser.js |   48 +
 .../resources/ui/app/components/list-filter.js  |   45 +
 .../resources/ui/app/components/list-group.js   |   23 +
 .../resources/ui/app/components/list-item.js    |   29 +
 .../components/multiple-database-search-bar.js  |   84 +
 .../ui/app/components/property-item.js          |   43 +
 .../resources/ui/app/components/query-editor.js |  100 +
 .../ui/app/components/query-result-table.js     |   87 +
 .../resources/ui/app/components/setting-item.js |   32 +
 .../resources/ui/app/components/setting-list.js |   28 +
 .../app/components/table-advanced-settings.js   |  168 ++
 .../ui/app/components/table-columns.js          |   52 +
 .../ui/app/components/table-properties.js       |   39 +
 .../resources/ui/app/components/tabs-item.js    |   61 +
 .../resources/ui/app/components/tabs-pane.js    |   27 +
 .../ui/app/components/top-application-bar.js    |   22 +
 .../ui/app/configs/create-table-tabs.js         |   48 +
 .../main/resources/ui/app/configs/datatypes.js  |   34 +
 .../resources/ui/app/configs/file-format.js     |   26 +
 .../main/resources/ui/app/configs/helpers.js    |  151 ++
 .../resources/ui/app/configs/hive-parameters.js |   93 +
 .../app/configs/non-printable-escape-chars.js   |   53 +
 .../ui/app/configs/table-level-tabs.js          |   66 +
 .../resources/ui/app/configs/top-level-tabs.js  |   67 +
 .../main/resources/ui/app/controllers/.gitkeep  |    0
 .../main/resources/ui/app/controllers/jobs.js   |   37 +
 .../src/main/resources/ui/app/helpers/.gitkeep  |    0
 .../main/resources/ui/app/helpers/to-json.js    |   25 +
 .../hive20/src/main/resources/ui/app/index.html |   43 +
 .../main/resources/ui/app/initializers/.gitkeep |    0
 .../resources/ui/app/initializers/responsive.js |   33 +
 .../resources/ui/app/mixins/table-common.js     |   86 +
 .../src/main/resources/ui/app/models/.gitkeep   |    0
 .../src/main/resources/ui/app/models/alert.js   |   28 +
 .../src/main/resources/ui/app/models/column.js  |  107 +
 .../main/resources/ui/app/models/database.js    |   25 +
 .../src/main/resources/ui/app/models/file.js    |   26 +
 .../src/main/resources/ui/app/models/job.js     |   56 +
 .../src/main/resources/ui/app/models/setting.js |   25 +
 .../main/resources/ui/app/models/table-info.js  |   30 +
 .../resources/ui/app/models/table-property.js   |   54 +
 .../src/main/resources/ui/app/models/table.js   |   33 +
 .../src/main/resources/ui/app/resolver.js       |   21 +
 .../hive20/src/main/resources/ui/app/router.js  |   59 +
 .../src/main/resources/ui/app/routes/.gitkeep   |    0
 .../main/resources/ui/app/routes/application.js |   32 +
 .../main/resources/ui/app/routes/databases.js   |   96 +
 .../ui/app/routes/databases/database.js         |   25 +
 .../ui/app/routes/databases/database/index.js   |   27 +
 .../ui/app/routes/databases/database/tables.js  |   47 +
 .../routes/databases/database/tables/index.js   |   28 +
 .../app/routes/databases/database/tables/new.js |   71 +
 .../routes/databases/database/tables/table.js   |   44 +
 .../databases/database/tables/table/columns.js  |   23 +
 .../databases/database/tables/table/ddl.js      |   22 +
 .../databases/database/tables/table/details.js  |   22 +
 .../databases/database/tables/table/index.js    |   25 +
 .../database/tables/table/partitions.js         |   22 +
 .../databases/database/tables/table/stats.js    |   22 +
 .../databases/database/tables/table/storage.js  |   22 +
 .../database/tables/table/table-meta-router.js  |   27 +
 .../databases/database/tables/table/view.js     |   22 +
 .../resources/ui/app/routes/databases/index.js  |   26 +
 .../src/main/resources/ui/app/routes/jobs.js    |   69 +
 .../main/resources/ui/app/routes/messages.js    |   32 +
 .../resources/ui/app/routes/messages/message.js |   31 +
 .../src/main/resources/ui/app/routes/query.js   |  305 +++
 .../resources/ui/app/routes/savedqueries.js     |   22 +
 .../main/resources/ui/app/routes/settings.js    |   93 +
 .../src/main/resources/ui/app/routes/udfs.js    |   22 +
 .../main/resources/ui/app/serializers/file.js   |   23 +
 .../resources/ui/app/services/alert-messages.js |  144 ++
 .../resources/ui/app/services/create-table.js   |  182 ++
 .../src/main/resources/ui/app/services/jobs.js  |   28 +
 .../resources/ui/app/services/keep-alive.js     |   31 +
 .../src/main/resources/ui/app/services/query.js |   45 +
 .../src/main/resources/ui/app/styles/app.scss   |  798 ++++++++
 .../ui/app/styles/bootstrap-overrides.scss      |   51 +
 .../src/main/resources/ui/app/styles/fonts.scss |   31 +
 .../ui/app/styles/power-select-overrides.scss   |   24 +
 .../resources/ui/app/templates/application.hbs  |   42 +
 .../ui/app/templates/components/.gitkeep        |    0
 .../components/alert-message-display.hbs        |   34 +
 .../app/templates/components/alert-message.hbs  |   34 +
 .../ui/app/templates/components/column-item.hbs |  124 ++
 .../app/templates/components/create-table.hbs   |   63 +
 .../components/database-drop-confirm.hbs        |   37 +
 .../templates/components/database-not-empty.hbs |   38 +
 .../components/database-search-bar.hbs          |   57 +
 .../templates/components/edit-setting-item.hbs  |   42 +
 .../templates/components/hdfs-viewer-modal.hbs  |   50 +
 .../ui/app/templates/components/job-item.hbs    |   33 +
 .../app/templates/components/jobs-browser.hbs   |   62 +
 .../ui/app/templates/components/list-filter.hbs |   33 +
 .../ui/app/templates/components/list-group.hbs  |   22 +
 .../ui/app/templates/components/list-item.hbs   |   22 +
 .../components/multiple-database-search-bar.hbs |   45 +
 .../app/templates/components/property-item.hbs  |   45 +
 .../app/templates/components/query-editor.hbs   |   21 +
 .../templates/components/query-result-table.hbs |   52 +
 .../app/templates/components/setting-item.hbs   |   28 +
 .../app/templates/components/setting-list.hbs   |   37 +
 .../components/table-advanced-settings.hbs      |  226 +++
 .../app/templates/components/table-columns.hbs  |   42 +
 .../templates/components/table-properties.hbs   |   40 +
 .../ui/app/templates/components/tabs-item.hbs   |   24 +
 .../ui/app/templates/components/tabs-pane.hbs   |   21 +
 .../components/top-application-bar.hbs          |   25 +
 .../resources/ui/app/templates/databases.hbs    |   39 +
 .../ui/app/templates/databases/database.hbs     |   19 +
 .../app/templates/databases/database/tables.hbs |   45 +
 .../templates/databases/database/tables/new.hbs |   42 +
 .../databases/database/tables/table.hbs         |   42 +
 .../databases/database/tables/table/columns.hbs |   38 +
 .../databases/database/tables/table/ddl.hbs     |   27 +
 .../databases/database/tables/table/details.hbs |   65 +
 .../database/tables/table/partitions.hbs        |   38 +
 .../databases/database/tables/table/stats.hbs   |   17 +
 .../databases/database/tables/table/storage.hbs |   64 +
 .../databases/database/tables/table/view.hbs    |   40 +
 .../main/resources/ui/app/templates/jobs.hbs    |   23 +
 .../resources/ui/app/templates/messages.hbs     |   54 +
 .../ui/app/templates/messages/message.hbs       |   48 +
 .../main/resources/ui/app/templates/query.hbs   |   99 +
 .../resources/ui/app/templates/savedqueries.hbs |   19 +
 .../resources/ui/app/templates/settings.hbs     |   32 +
 .../main/resources/ui/app/templates/tables.hbs  |   19 +
 .../main/resources/ui/app/templates/udfs.hbs    |   19 +
 .../ui/app/utils/hdfs-picker-config.js          |   32 +
 .../hive20/src/main/resources/ui/bower.json     |   11 +
 .../src/main/resources/ui/config/environment.js |   64 +
 .../src/main/resources/ui/ember-cli-build.js    |   68 +
 .../hive20/src/main/resources/ui/package.json   |   64 +
 .../fonts/roboto/roboto-v15-latin-300.eot       |  Bin 0 -> 16205 bytes
 .../fonts/roboto/roboto-v15-latin-300.svg       |  314 +++
 .../fonts/roboto/roboto-v15-latin-300.ttf       |  Bin 0 -> 32664 bytes
 .../fonts/roboto/roboto-v15-latin-300.woff      |  Bin 0 -> 18520 bytes
 .../fonts/roboto/roboto-v15-latin-300.woff2     |  Bin 0 -> 14524 bytes
 .../fonts/roboto/roboto-v15-latin-regular.eot   |  Bin 0 -> 16227 bytes
 .../fonts/roboto/roboto-v15-latin-regular.svg   |  308 +++
 .../fonts/roboto/roboto-v15-latin-regular.ttf   |  Bin 0 -> 32652 bytes
 .../fonts/roboto/roboto-v15-latin-regular.woff  |  Bin 0 -> 18520 bytes
 .../fonts/roboto/roboto-v15-latin-regular.woff2 |  Bin 0 -> 14584 bytes
 .../hive20/src/main/resources/ui/testem.js      |   31 +
 .../src/main/resources/ui/tests/.jshintrc       |   53 +
 .../resources/ui/tests/helpers/destroy-app.js   |   23 +
 .../resources/ui/tests/helpers/flash-message.js |   24 +
 .../ui/tests/helpers/module-for-acceptance.js   |   41 +
 .../main/resources/ui/tests/helpers/resolver.js |   29 +
 .../resources/ui/tests/helpers/responsive.js    |   76 +
 .../resources/ui/tests/helpers/start-app.js     |   36 +
 .../src/main/resources/ui/tests/index.html      |   51 +
 .../resources/ui/tests/integration/.gitkeep     |    0
 .../src/main/resources/ui/tests/test-helper.js  |   28 +
 .../src/main/resources/ui/tests/unit/.gitkeep   |    0
 .../src/main/resources/ui/vendor/.gitkeep       |    0
 .../src/main/resources/view.log4j.properties    |   27 +
 .../views/hive20/src/main/resources/view.xml    |  362 ++++
 .../view/hive20/AsyncJobRunnerImplTest.java     |  138 ++
 .../view/hive20/ConnectionFailuresTest.java     |  157 ++
 .../hive20/HiveJdbcConnectionDelegateTest.java  |  105 +
 .../ambari/view/hive20/JobExecutionTest.java    |  116 ++
 .../view/hive20/PropertyValidatorTest.java      |  113 ++
 .../view/hive20/ResultSetIteratorTest.java      |  100 +
 .../internal/parsers/ParserUtilsTest.java       |   66 +
 .../AlterTableQueryGenerationSpecTest.groovy    |   59 +
 .../AlterTableQueryGeneratorTest.java           |   94 +
 .../CreateTableQueryGeneratorTest.java          |  101 +
 .../hive20/resources/upload/CSVParserTest.java  |  275 +++
 .../resources/upload/DataParserCSVTest.java     |  326 +++
 .../resources/upload/DataParserJSONTest.java    |  263 +++
 .../resources/upload/DataParserXMLTest.java     |  295 +++
 .../hive20/resources/upload/JsonParserTest.java |  146 ++
 .../resources/upload/OpenCSVParserTest.java     |  313 +++
 .../hive20/resources/upload/OpenCSVTest.java    |  245 +++
 .../hive20/resources/upload/ParseUtilsTest.java |   56 +
 .../resources/upload/QueryGeneratorTest.java    |  108 +
 .../resources/upload/TableDataReaderTest.java   |  127 ++
 .../hive20/resources/upload/XMLParserTest.java  |  135 ++
 .../rest/postman/hive2.postman_collection.json  |  107 +
 .../savedqueryset/MysqlQuerySetAmbariDB.java    |   30 +-
 .../savedqueryset/OracleQuerySetAmbariDB.java   |   29 +-
 .../hive/savedqueryset/QuerySetAmbariDB.java    |   76 +-
 .../pig/udfqueryset/MysqlQuerySetAmbariDB.java  |   48 +
 .../pig/udfqueryset/OracleQuerySetAmbariDB.java |   46 +
 .../udfqueryset/PostgressQuerySetAmbariDB.java  |   22 +
 .../pig/udfqueryset/QuerySetAmbariDB.java       |   82 +
 .../hive/historyqueryset/MysqlQuerySet.java     |   23 -
 .../historyqueryset/MysqlQuerySetHueDB.java     |   23 +
 .../hive/historyqueryset/OracleQuerySet.java    |   61 -
 .../historyqueryset/OracleQuerySetHueDB.java    |   66 +
 .../hive/historyqueryset/PostgressQuerySet.java |   22 -
 .../historyqueryset/PostgressQuerySetHueDB.java |   22 +
 .../hive/historyqueryset/QuerySet.java          |  130 --
 .../hive/historyqueryset/QuerySetHueDB.java     |  139 ++
 .../hive/historyqueryset/SqliteQuerySet.java    |   22 -
 .../historyqueryset/SqliteQuerySetHueDB.java    |   22 +
 .../hive/savedqueryset/MysqlQuerySet.java       |   23 -
 .../hive/savedqueryset/MysqlQuerySetHueDb.java  |   23 +
 .../hive/savedqueryset/OracleQuerySet.java      |   65 -
 .../hive/savedqueryset/OracleQuerySetHueDb.java |   71 +
 .../hive/savedqueryset/PostgressQuerySet.java   |   22 -
 .../savedqueryset/PostgressQuerySetHueDb.java   |   22 +
 .../hive/savedqueryset/QuerySet.java            |  134 --
 .../hive/savedqueryset/QuerySetHueDb.java       |  144 ++
 .../hive/savedqueryset/SqliteQuerySet.java      |   22 -
 .../hive/savedqueryset/SqliteQuerySetHueDb.java |   22 +
 .../pig/jobqueryset/MysqlQuerySet.java          |   22 -
 .../pig/jobqueryset/MysqlQuerySetHueDb.java     |   22 +
 .../pig/jobqueryset/OracleQuerySet.java         |   65 -
 .../pig/jobqueryset/OracleQuerySetHueDb.java    |   69 +
 .../pig/jobqueryset/PostgressQuerySet.java      |   22 -
 .../pig/jobqueryset/PostgressQuerySetHueDb.java |   22 +
 .../huequeryset/pig/jobqueryset/QuerySet.java   |  132 --
 .../pig/jobqueryset/QuerySetHueDb.java          |  141 ++
 .../pig/jobqueryset/SqliteQuerySet.java         |   22 -
 .../pig/jobqueryset/SqliteQuerySetHueDb.java    |   22 +
 .../pig/savedscriptqueryset/MysqlQuerySet.java  |   22 -
 .../savedscriptqueryset/MysqlQuerySetHueDb.java |   22 +
 .../pig/savedscriptqueryset/OracleQuerySet.java |   60 -
 .../OracleQuerySetHueDb.java                    |   64 +
 .../savedscriptqueryset/PostgressQuerySet.java  |   67 -
 .../PostgressQuerySetHueDb.java                 |   67 +
 .../pig/savedscriptqueryset/QuerySet.java       |  135 --
 .../pig/savedscriptqueryset/QuerySetHueDb.java  |  142 ++
 .../pig/savedscriptqueryset/SqliteQuerySet.java |   24 -
 .../SqliteQuerySetHueDb.java                    |   24 +
 .../pig/udfqueryset/MysqlQuerySet.java          |   22 +
 .../pig/udfqueryset/OracleQuerySet.java         |   41 +
 .../pig/udfqueryset/PostgressQuerySet.java      |   23 +
 .../huequeryset/pig/udfqueryset/QuerySet.java   |   75 +
 .../pig/udfqueryset/SqliteQuerySet.java         |   24 +
 .../migration/InitiateJobMigration.java         |    5 +
 .../HiveHistoryMigrationUtility.java            |  154 +-
 ...HiveHistoryQueryMigrationImplementation.java |   34 +-
 .../hive/historyquery/HiveHistoryStartJob.java  |    1 +
 .../HiveSavedQueryMigrationImplementation.java  |  117 +-
 .../HiveSavedQueryMigrationUtility.java         |  191 +-
 .../hive/savedquery/HiveSavedQueryStartJob.java |    1 +
 .../pigjob/PigJobMigrationImplementation.java   |   42 +-
 .../pig/pigjob/PigJobMigrationUtility.java      |  358 ++--
 .../migration/pig/pigjob/PigJobStartJob.java    |    1 +
 .../pig/pigscript/PigSavedScriptStartJob.java   |    1 +
 .../PigScriptMigrationImplementation.java       |   36 +-
 .../pigscript/PigScriptMigrationUtility.java    |  136 +-
 .../pigudf/PigUdfMigrationImplementation.java   |  387 ++++
 .../pig/pigudf/PigUdfMigrationUtility.java      |  235 +++
 .../migration/pig/pigudf/PigUdfStartJob.java    |   69 +
 .../resources/scripts/models/HiveModel.java     |   48 +-
 .../scripts/models/MigrationResponse.java       |    6 +-
 .../resources/scripts/models/PigModel.java      |   20 +
 .../app/models/checkprogress.js                 |    3 +-
 .../ui/hueambarimigration-view/app/router.js    |    2 +-
 .../app/routes/home-page/hive-history.js        |   45 +-
 .../app/routes/home-page/hive-saved-query.js    |   44 +-
 .../app/routes/home-page/pig-job.js             |   45 +-
 .../app/routes/home-page/pig-script.js          |   45 +-
 .../app/routes/home-page/pig-udf.js             |  121 ++
 .../app/templates/home-page.hbs                 |    5 +-
 .../app/templates/home-page/hive-history.hbs    |    4 +-
 .../templates/home-page/hive-saved-query.hbs    |    4 +-
 .../app/templates/home-page/pig-job.hbs         |    4 +-
 .../app/templates/home-page/pig-script.hbs      |    4 +-
 .../app/templates/home-page/pig-udf.hbs         |  109 +
 contrib/views/pom.xml                           |    5 +-
 .../ambari/view/AssetDefinitionRefType.java     |   23 +
 .../org/apache/oozie/ambari/view/Constants.java |   25 +
 .../apache/oozie/ambari/view/EntityStatus.java  |   23 +
 .../apache/oozie/ambari/view/OozieDelegate.java |  243 +++
 .../ambari/view/OozieProxyImpersonator.java     | 1087 +++++-----
 .../apache/oozie/ambari/view/OozieUtils.java    |  226 ++-
 .../ambari/view/ServiceFormattedException.java  |   53 +
 .../oozie/ambari/view/WorkflowFilesService.java |  174 +-
 .../ambari/view/assets/AssetDefinitionRepo.java |   29 +
 .../oozie/ambari/view/assets/AssetRepo.java     |   37 +-
 .../oozie/ambari/view/assets/AssetResource.java |  197 ++
 .../oozie/ambari/view/assets/AssetService.java  |  102 +-
 .../ambari/view/assets/model/ActionAsset.java   |  112 +-
 .../assets/model/ActionAssetDefinition.java     |   42 +
 .../view/assets/model/AssetDefintion.java       |   69 +
 .../oozie/ambari/view/model/APIResult.java      |   63 +
 .../oozie/ambari/view/model/BaseModel.java      |   61 +-
 .../apache/oozie/ambari/view/model/Indexed.java |   24 +
 .../apache/oozie/ambari/view/model/Paging.java  |   30 +
 .../apache/oozie/ambari/view/model/When.java    |   28 +
 .../apache/oozie/ambari/view/repo/BaseRepo.java |  113 ++
 .../workflowmanager/WorkflowManagerService.java |   94 +-
 .../WorkflowsManagerResource.java               |    8 +-
 .../view/workflowmanager/WorkflowsRepo.java     |   63 +-
 .../view/workflowmanager/model/Workflow.java    |  133 +-
 .../resources/ui/app/components/asset-config.js |   46 +
 .../resources/ui/app/components/asset-list.js   |   82 +
 .../ui/app/components/asset-manager.js          |   70 +
 .../ui/app/components/bundle-config.js          |   51 +-
 .../resources/ui/app/components/coord-config.js |   40 +-
 .../ui/app/components/designer-workspace.js     |   24 +
 .../ui/app/components/flow-designer.js          |  136 +-
 .../resources/ui/app/components/fs-action.js    |    5 +-
 .../ui/app/components/prepare-config-fs.js      |   16 +-
 .../ui/app/components/workflow-actions.js       |    4 +
 .../ui/app/domain/actionjob_hanlder.js          |  126 +-
 .../resources/ui/app/services/asset-manager.js  |  142 ++
 .../ui/app/services/property-extractor.js       |    3 +-
 .../src/main/resources/ui/app/styles/app.less   |   38 +-
 .../app/templates/components/asset-config.hbs   |   55 +
 .../ui/app/templates/components/asset-list.hbs  |   63 +
 .../app/templates/components/asset-manager.hbs  |   62 +
 .../app/templates/components/bundle-config.hbs  |    3 +
 .../app/templates/components/coord-config.hbs   |    3 +
 .../templates/components/designer-workspace.hbs |    6 +
 .../app/templates/components/flow-designer.hbs  |   33 +-
 .../templates/components/prepare-config-fs.hbs  |  207 +-
 .../templates/components/workflow-actions.hbs   |    5 +-
 .../main/resources/ui/app/utils/constants.js    |    3 +
 .../ui/app/validators/fs-action-validator.js    |    8 +-
 .../wfmanager/src/main/resources/ui/bower.json  |    3 +-
 .../src/main/resources/ui/ember-cli-build.js    |   11 +-
 .../integration/components/asset-config-test.js |   40 +
 .../integration/components/asset-list-test.js   |   40 +
 .../components/asset-manager-test.js            |   40 +
 .../tests/unit/services/asset-manager-test.js   |   28 +
 .../views/wfmanager/src/main/resources/view.xml |   17 +
 pom.xml                                         |    5 +-
 1375 files changed, 55597 insertions(+), 45653 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/608f0b55/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
index 5b9cd00,36467c9..0046ec6
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
@@@ -41,8 -37,9 +41,10 @@@ import org.apache.ambari.server.state.R
  import org.apache.ambari.server.state.ServiceInfo;
  import org.apache.ambari.server.state.stack.PrereqCheckType;
  import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+ import org.apache.ambari.server.state.stack.UpgradePack;
  import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
 +import org.apache.commons.collections.CollectionUtils;
+ import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
  import org.apache.commons.lang.StringUtils;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/ambari/blob/608f0b55/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/608f0b55/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java
----------------------------------------------------------------------
diff --cc ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java
index 045d017,e65b3e4..7758924
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java
@@@ -56,8 -47,11 +56,12 @@@ import junit.framework.Assert
   */
  public class AbstractCheckDescriptorTest {
    final private Clusters clusters = EasyMock.createNiceMock(Clusters.class);
 +  private final RepositoryVersionDAO repositoryVersionDao = EasyMock.createNiceMock(RepositoryVersionDAO.class);
  
+   @UpgradeCheck(
+       group = UpgradeCheckGroup.DEFAULT,
+       order = 1.0f,
+       required = { UpgradeType.ROLLING, UpgradeType.NON_ROLLING, UpgradeType.HOST_ORDERED })
    private class TestCheckImpl extends AbstractCheckDescriptor {
      private PrereqCheckType m_type;
  
@@@ -165,50 -202,26 +213,72 @@@
      Assert.assertEquals(false, check.isApplicable(request, nonExistedList, true));
    }
  
 +  @Test
 +  public void testIsApplicableWithVDF() throws Exception{
 +    final String clusterName = "c1";
 +    final Cluster cluster = EasyMock.createMock(Cluster.class);
 +
 +    Map<String, Service> services = new HashMap<String, Service>(){{
 +      put("SERVICE1", null);
 +      put("SERVICE2", null);
 +      put("SERVICE3", null);
 +    }};
 +
 +    expect(clusters.getCluster(anyString())).andReturn(cluster).atLeastOnce();
 +    expect(cluster.getServices()).andReturn(services).atLeastOnce();
 +
 +    RepositoryVersionEntity repoVersion = EasyMock.createMock(RepositoryVersionEntity.class);
 +    VersionDefinitionXml repoXml = EasyMock.createMock(VersionDefinitionXml.class);
 +    expect(repoVersion.getType()).andReturn(RepositoryType.PATCH).atLeastOnce();
 +    expect(repoVersion.getRepositoryXml()).andReturn(repoXml).atLeastOnce();
 +    expect(repoXml.getAvailableServiceNames()).andReturn(Collections.singleton("SERVICE2")).atLeastOnce();
 +
 +    expect(repositoryVersionDao.findByStackNameAndVersion(
 +        anyString(), anyString())).andReturn(repoVersion).atLeastOnce();
 +
 +    replay(clusters, cluster, repositoryVersionDao, repoVersion, repoXml);
 +
 +    AbstractCheckDescriptor check = new TestCheckImpl(PrereqCheckType.SERVICE);
 +    PrereqCheckRequest request = new PrereqCheckRequest(clusterName, UpgradeType.ROLLING);
 +    request.setTargetStackId(new StackId("HDP-2.5"));
 +
 +    List<String> allServicesList = Arrays.asList("SERVICE1", "SERVICE2");
 +
 +    // SERVICE2 is the only thing in VDF
 +    Assert.assertEquals(true, check.isApplicable(request, allServicesList, false));
 +
 +    List<String> oneServicesList = Arrays.asList("SERVICE1");
 +
 +    // SERVICE2 is the only thing in VDF, a check for only SERVICE1 fail
 +    Assert.assertEquals(false, check.isApplicable(request, oneServicesList, false));
 +
 +    // a VDF without available services is technically invalid, so expect any passed services to return false
 +    reset(repoXml);
 +    expect(repoXml.getAvailableServiceNames()).andReturn(Collections.<String>emptySet()).atLeastOnce();
 +    replay(repoXml);
 +    Assert.assertEquals(false, check.isApplicable(request, allServicesList, false));
 +  }
 +
+   /**
+    * Tests {@link UpgradeCheck#required()}.
+    *
+    * @throws Exception
+    */
+   @Test
+   public void testRequired() throws Exception {
+     RollingTestCheckImpl rollingCheck = new RollingTestCheckImpl(PrereqCheckType.SERVICE);
+     Assert.assertTrue(rollingCheck.isRequired(UpgradeType.ROLLING));
+     Assert.assertFalse(rollingCheck.isRequired(UpgradeType.NON_ROLLING));
+ 
+     NotRequiredCheckTest notRequiredCheck = new NotRequiredCheckTest(PrereqCheckType.SERVICE);
+     Assert.assertFalse(notRequiredCheck.isRequired(UpgradeType.ROLLING));
+     Assert.assertFalse(notRequiredCheck.isRequired(UpgradeType.NON_ROLLING));
+     Assert.assertFalse(notRequiredCheck.isRequired(UpgradeType.HOST_ORDERED));
+ 
+     TestCheckImpl requiredCheck = new TestCheckImpl(PrereqCheckType.SERVICE);
+     Assert.assertTrue(requiredCheck.isRequired(UpgradeType.ROLLING));
+     Assert.assertTrue(requiredCheck.isRequired(UpgradeType.NON_ROLLING));
+     Assert.assertTrue(requiredCheck.isRequired(UpgradeType.HOST_ORDERED));
+   }
+ 
  }


Mime
View raw message