Branch 2.6

.gitignore

@@ -10,6 +10,7 @@ target
 /ambari-web/npm-debug.log
 /ambari-web/public/
 /ambari-web/node_modules/
+/ambari-web/node/
 *.pyc
 *.py~
 *.iml
@@ -24,3 +25,7 @@ ambari-metrics/ambari-metrics-host-monitoring/src/main/python/psutil/build/
 rebel.xml
 rebel-remote.xml
 out
+createDDL.jdbc
+/contrib/views/storm/src/main/resources/ui/node_modules/
+/contrib/views/storm/src/main/resources/ui/public/
+/contrib/views/storm/src/main/resources/ui/npm-debug.log

.reviewboardrc

@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific
+
+REVIEWBOARD_URL = 'https://reviews.apache.org'
+REPOSITORY = 'ambari'
+
+# Default value for the request's Reviewers > Groups field
+TARGET_GROUPS = 'Ambari'

KEYS

@@ -521,3 +521,72 @@ E0acC3N0t01mN3I94vrjheb/Zm9PK1bDWS8xPmt6WUQ9o28DK+FCmNselwwYNNHV
 JH93bd2K+dqt3ZLR5z2FNzk+oJ4kdqIdO0rRgpfV9LZaBbX7e9acLelS
 =P4K4
 -----END PGP PUBLIC KEY BLOCK-----
+pub   2048R/088372A9 2017-03-21 [expires: 2019-03-21]
+uid       [ultimate] Aravindan Vijayan (avijayan) <avijayan@apache.org>
+sub   2048R/9911BCB0 2017-03-21 [expires: 2019-03-21]
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFjQcuUBCAC616QZ44KvVtycj5JX0voZGea6G1i0OMNnEPtgbYBcbOIyrpr/
+eO+HbrtLYOG+9/aDfQwEGstlYoYEELoKiHsI3hLuO76trcHzXAASDRzyYQWsVdDz
+xhRvEJEaIlIn+NH/xgzdLdZsXKDYSXm3NuR22yIknJMZsf2YuvqThBxDsh22ceY8
+c5dGCInQBWdn0zoXoJOZ/eKxrgHzNdT2HkRy3IQty4NCMSMozsfANgdxlGX6bnUd
+aUb2wg/kWNjHltyuEG5fT6ShhUY6I7DKmkEfXmh1chHWSrJn0wy1EQoWatb9rj38
+24mLWIMpA/5Kg4Z8tDFnNLDYTfbZckVMFSwZABEBAAG0MkFyYXZpbmRhbiBWaWph
+eWFuIChhdmlqYXlhbikgPGF2aWpheWFuQGFwYWNoZS5vcmc+iQE9BBMBCgAnBQJY
+0HLlAhsDBQkDwmcABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEC6XbzAIg3Kp
+WvwIAIF+WOTLzeemSuaQ0kSdth1oNW6/rVk28Yzq7ZlSrwFEz5ysTTyyiKav1068
+dUjftqmXxdoXuJ7/lmA5Sn8dkQ438xoF8Sg9ezyPG946OkK02j47J7I4AOtLRcDB
+94YPdYp7g4Zt9TwFPwzgi78Vxi1ApuefL/G9u9GgaMaLx+iTg9pujdALoSTQ80M6
+tq+VIq+1MWyl0mbE7UQgcsVR42rdXtjVo2J107mi6KM5n2baFhQL+cqjFO5VctNA
+1reGsA7dcXXHRVsFzxcyp0mnYid5I9QrnLyMcNMHbKc7bJAvdfb/YJ4qoMqH7TY/
+wF1CNYIKU24RwDv4QNKVUf4eZaW5AQ0EWNBy5QEIALPcAD1o2YFOFxNhMtbmcS5Z
+OT4E5CQgDtY19AbXvIbGqjsxbyWvmNSzyWmkucacpy5mBqyoOP2LHuB1S7t5JK2W
+fPhd0dXXIeAszmWlLTy1grFbqigcCFfgyrkIKxryhO7Cn8BAaCsyzUG0b0OzMnY1
++neZ/ObGM1OXrbIOqOQkR7fA9PljM5514BxuUJFNq+Adh9MtU+rvs+K8voJbPwfZ
+aShrqx89CO6lQ5/6TkxM4DmEQFLL701QozGr52zHI0arQimG55hsAbNLM13PXmZ2
+upYvZCX3ksO1s5ZDXB6UnMGyKd5HFbYfTt87OpaYXyj/bUsysZRzRaKiJYEDLHMA
+EQEAAYkBJQQYAQoADwUCWNBy5QIbDAUJA8JnAAAKCRAul28wCINyqfsmB/9UKUWX
+OvC5I8O6J8t7STow9ucJJEHqDuemTnhaXQk144t65cv2eZzygmrbC1kKmXiy+E8I
+N/JdaXBMTe9m0c1boh0yCMnKkDJKEyh2MkvYfXhUBUT3N7hfBRnJxR3tq5BH8BbX
+4taidE6XakvMxPDL/3J94/tYz1CHfbMmKJqnirWrDHkkpLfT6arb7F/J7pUKomoa
+A3rDQuY80JHiAgWXYjoz5hwGi8QN2RROnA8hG09ixDKFgKdwr7T0RnA1iqqJteqf
+y98PGhV5I/D/lnMEmt0jiGBolpFHvFn7wdTXgebU0yng5w8XNFlNMwrj3NuTl+oF
+a2PUifxYEOeykKn4
+=id3i
+-----END PGP PUBLIC KEY BLOCK-----
+pub   rsa2048 2017-10-23 [SC]
+      202F902A7791D3D127102F64BCC5EA25D0203B18
+uid           [ultimate] Swapan Shridhar <swapan@apache.org>
+sub   rsa2048 2017-10-23 [E]
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFnuL8cBCAC0rVq/PpjshVR6h9I699OrEDMjANqBzlxjEc6G8TU4KDaoI4Zw
+NbESTFH/1y3btXj+SIdWIuWmv5X4QWoAR3ydhffFuO1cCLKz4vVtjkkHTYiUsW/F
+ZhHfl4kfjRzGkmu/ePZHbkevvtDWuO8dw/y9cDlhqRX6iajue7bzrX3BlYo3YVJN
+R9kySeczqq+4pfeIFAF0XxnlKwqI3+XDhoROAuwmpSepT825H2jeQV10CWfSDFKz
+4sksajATCEFIKBosAdVs3PnzbhL9Ij7QjxXXzldN+fcQa66ReFN8lbD5z3AG7T4q
+ji1dIrtAnaiL2dJC+5AcNJovqojb7oOVDRXPABEBAAG0I1N3YXBhbiBTaHJpZGhh
+ciA8c3dhcGFuQGFwYWNoZS5vcmc+iQFOBBMBCAA4FiEEIC+QKneR09EnEC9kvMXq
+JdAgOxgFAlnuL8cCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQvMXqJdAg
+Oxhf0Qf+M4Cp9dybybccUMRF4RfLguZGfp6IFMkMyB3svTrV0dh5maOpZfbY2zBE
+l++rmowUqJFf9cMm4BsVDyUHX5tNCkFTVlloirV9X/HEauKu58oVUJe4m83HGEHc
+fDl5NlHAk5uzU2NRrk+M2xP8XZ/TX/tRv3MwbF9fM6ZVQOOg6LMbP/YKE/NL7hha
+3yTowEhCIM8lyd2qjzt4tq+4oDWmg7j1zTpzdXcBP0Ye4aUR5uV8JZDY+lXeUptw
+VJi6+MksP2YbzqD2icUuYGfKDoP21RmKp52HOZXYFRwrZ6QYOmJLziakX0CBOlIz
+w82/hjT66/tb6XXVooDisJbTiPC/K7kBDQRZ7i/HAQgAtQsdgLw++t6v7oAwe3lT
+YyC1bHrohiVA/0oaSHcs4+1hmSzRQYRl79fbhchb444VswSVBjYOqDr9ydVkrKlV
+3/rD9X5pEy87bgpHYMjh1MoDId3S1gr/sJ+jTVpgXuhMOsFNI4LPn1xD5ySIXzEI
+fExnb6jvpnl4I3HHXSLdnLqmHmWogaK+rvEhfrWGBJyFWNwORlIscSyOsg5oKcJ5
+izQdkbcrg+S6zJHPvzO1JaS9djvTjzQqyNBrRQkrpvbmXBZsJPB1wTlBqFDJNnSX
+cS8OxjiNVhCvwYrSfyidSuNYlMnPYF+nNPLPPt6ifAlP4ij8yhNhQgMkscRJRT9W
+HQARAQABiQE2BBgBCAAgFiEEIC+QKneR09EnEC9kvMXqJdAgOxgFAlnuL8cCGwwA
+CgkQvMXqJdAgOxhjQgf6Apf+qF/nsuZZ8H9/23GjtDHtUSaTSnWVXuvKcZhs8gsJ
+ypGatRxXWTFJjpupk62SyBAu6AHncWm+xq7ZxmW0KxUmxLdAW4he4fVRc/BqDU/K
+S36gnlNj3XswaYS28lC8UKkykDABlDGHrJA26odPYb9+IgANX56gYLOSwEmZeCFv
+lLaKxbaoJ9Atg20bBz4afYOj/lJH1fONxSBPnZr1QEodVcTPa2kZeO5sUk1U9cUL
+2DwvhCvtDfChAke4vaOvlIk/ueLTe6+8GSedBdD65ZQZQJwGp8S50e+wWmBuoESE
+8KCgd2hSG6KX86H4dOgFKGmI8Y+KoBNkFPUo6lVpGA==
+=gFpV
+-----END PGP PUBLIC KEY BLOCK-----

ambari-admin/pom.xml

@@ -19,15 +19,15 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>2.6.1.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-admin</artifactId>
   <packaging>jar</packaging>
   <name>Ambari Admin View</name>
-  <version>2.0.0.0-SNAPSHOT</version>
+  <version>2.6.1.0.0</version>
   <description>Admin control panel</description>
   <build>
     <plugins>
@@ -61,11 +61,12 @@
       <plugin>
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
-        <version>0.0.16</version>
+        <version>1.3</version>
         <configuration>
-          <nodeVersion>v0.10.44</nodeVersion>
+          <nodeVersion>v4.5.0</nodeVersion>
           <npmVersion>2.15.0</npmVersion>
           <workingDirectory>src/main/resources/ui/admin-web/</workingDirectory>
+          <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven>
         </configuration>
         <executions>
           <execution>

ambari-admin/src/main/resources/ui/admin-web/app/index.html

@@ -48,14 +48,14 @@
   <header class="navbar navbar-static-top navbar-inverse">
     <div class="navbar-inner">
       <div class="container">
-        <a href="/#/main/dashboard" class="logo"><img src="/img/logo-white.png" alt="{{'common.apacheAmbari' | translate}}" title="{{'common.apacheAmbari' | translate}}"></a>
-        <a href="/#/main/dashboard" class="brand" title="{{'common.apacheAmbari' | translate}}">{{'common.ambari' | translate}}</a>
+        <a href="{{fromSiteRoot('/#/main/dashboard')}}" class="logo"><img src="/img/logo-white.png" alt="{{'common.apacheAmbari' | translate}}" title="{{'common.apacheAmbari' | translate}}"></a>
+        <a href="{{fromSiteRoot('/#/main/dashboard')}}" class="brand" title="{{'common.apacheAmbari' | translate}}">{{'common.ambari' | translate}}</a>
         <ul class="nav navbar-nav navbar-right">
           <li>
             <div class="btn-group navbar-views-dropdown" dropdown is-open="viewsdropdown.isopen" ng-mouseover="viewsdropdown.isopen=true" ng-mouseout="viewsdropdown.isopen=false">
-              <a href="/#/main/views" ng-click="gotoViewsDashboard()" class="dropdown-toggle"><i class="fa fa-th"></i></a>
+              <a href="{{fromSiteRoot('/#/main/views')}}" ng-click="gotoViewsDashboard()" class="dropdown-toggle"><i class="fa fa-th"></i></a>
               <ul class="dropdown-menu" role="menu">
-                <li ng-repeat="instance in viewInstances"><a href="/#/main{{instance.context_path}}" ng-click="about()">{{instance.label}}</a></li>
+                <li ng-repeat="instance in viewInstances"><a href="{{fromSiteRoot('/#/main/views/' + instance.viewUrl)}}" ng-click="about()">{{instance.label}}</a></li>
                 <li ng-show="!viewInstances.length" class="disabled"><a>{{'common.noViews' | translate}}</a></li>
               </ul>
             </div>
@@ -155,8 +155,10 @@
 <script src="scripts/directives/PasswordVerify.js"></script>
 <script src="scripts/directives/disabledTooltip.js"></script>
 <script src="scripts/directives/editableList.js"></script>
+<script src="scripts/services/Utility.js"></script>
 <script src="scripts/services/UserConstants.js"></script>
 <script src="scripts/services/User.js"></script>
+<script src="scripts/services/GroupConstants.js"></script>
 <script src="scripts/services/Group.js"></script>
 <script src="scripts/services/RemoteCluster.js"></script>
 <script src="scripts/services/View.js"></script>
@@ -165,11 +167,13 @@
 <script src="scripts/services/PermissionLoader.js"></script>
 <script src="scripts/services/PermissionsSaver.js"></script>
 <script src="scripts/services/ConfirmationModal.js"></script>
+<script src="scripts/services/DeregisterClusterModal.js"></script>
 <script src="scripts/services/Auth.js"></script>
 <script src="scripts/services/GetDifference.js"></script>
 <script src="scripts/services/UnsavedDialog.js"></script>
 <script src="scripts/services/Stack.js"></script>
 <script src="scripts/services/AddRepositoryModal.js"></script>
+<script src="scripts/services/AddVersionModal.js"></script>
 <script src="scripts/services/RoleDetailsModal.js"></script>
 <!-- endbuild -->
 </body>

ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js

@@ -26,15 +26,16 @@ angular.module('ambariAdminConsole', [
   'pascalprecht.translate'
 ])
 .constant('Settings', {
-	baseUrl: '/api/v1',
+  siteRoot: '{proxy_root}/'.replace(/\{.+\}/g, ''),
+	baseUrl: '{proxy_root}/api/v1'.replace(/\{.+\}/g, ''),
   testMode: (window.location.port == 8000),
   mockDataPrefix: 'assets/data/',
   isLDAPConfigurationSupported: false,
   isLoginActivitiesSupported: false
 })
-.config(['RestangularProvider', '$httpProvider', '$provide', function(RestangularProvider, $httpProvider, $provide) {
+.config(['RestangularProvider', '$httpProvider', '$provide', 'Settings', function(RestangularProvider, $httpProvider, $provide, Settings) {
   // Config Ajax-module
-  RestangularProvider.setBaseUrl('/api/v1');
+  RestangularProvider.setBaseUrl(Settings.baseUrl);
   RestangularProvider.setDefaultHeaders({'X-Requested-By':'ambari'});
 
   $httpProvider.defaults.headers.post['Content-Type'] = 'plain/text';
@@ -66,7 +67,7 @@ angular.module('ambariAdminConsole', [
 
     function error(response) {
       if (response.status == 403) {
-        window.location = "/";
+        window.location = Settings.siteRoot;
         return;
       }
       return $q.reject(response);
@@ -131,4 +132,25 @@ angular.module('ambariAdminConsole', [
     }];
     return $delegate;
   }]);
+
+  if (!Array.prototype.find) {
+    Array.prototype.find = function (callback, context) {
+      if (this == null) {
+        throw new TypeError('Array.prototype.find called on null or undefined');
+      }
+      if (typeof callback !== 'function') {
+        throw new TypeError(callback + ' is not a function');
+      }
+      var list = Object(this),
+        length = list.length >>> 0,
+        value;
+      for (var i = 0; i < length; i++) {
+        value = list[i];
+        if (callback.call(context, value, i, list)) {
+          return value;
+        }
+      }
+      return undefined;
+    };
+  }
 }]);

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js

@@ -100,7 +100,12 @@ angular.module('ambariAdminConsole')
   	angular.forEach(path.split('.'), function(routeObj) {
   		route = route[routeObj];
   	});
-  	var r = new RegExp( route.url.replace(/(:\w+)/, '\\w+'));
-  	return r.test($location.path());
+
+    // We should compare only root location part
+  	var r = new RegExp( route.url.replace(/(:\w+)/, '\\w+')),
+      secondSlashUrlIndex = $location.path().indexOf('/', 1),
+      locationIsRoot = !~secondSlashUrlIndex,
+      location = locationIsRoot ?  $location.path() : $location.path().slice(0, secondSlashUrlIndex);
+  	return r.test(location);
   };
 }]);

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js

@@ -105,7 +105,10 @@ angular.module('ambariAdminConsole')
        Cluster.getAllClusters().then(function (clusters) {
          if(clusters.length >0){
            clusters.forEach(function(cluster) {
-             $scope.clusters.push(cluster.Clusters.cluster_name)
+             $scope.clusters.push({
+              "name" : cluster.Clusters.cluster_name,
+              "id" : cluster.Clusters.cluster_id
+             })
            });
            $scope.noLocalClusterAvailible = false;
            if($scope.clusterConfigurable){
@@ -122,7 +125,10 @@ angular.module('ambariAdminConsole')
          RemoteCluster.listAll().then(function (clusters) {
            if(clusters.length >0){
              clusters.forEach(function(cluster) {
-               $scope.remoteClusters.push(cluster.ClusterInfo.name)
+               $scope.remoteClusters.push({
+                "name" : cluster.ClusterInfo.name,
+                "id" : cluster.ClusterInfo.cluster_id
+               })
              });
              $scope.noRemoteClusterAvailible = false;
            }else{
@@ -153,16 +159,17 @@ angular.module('ambariAdminConsole')
       switch($scope.instance.clusterType) {
         case 'LOCAL_AMBARI':
           console.log($scope.cluster);
-          $scope.instance.clusterName = $scope.cluster;
+          $scope.instance.clusterId = $scope.cluster.id;
           break;
         case 'REMOTE_AMBARI':
           console.log($scope.data.remoteCluster);
-          $scope.instance.clusterName = $scope.data.remoteCluster;
+          $scope.instance.clusterId = $scope.data.remoteCluster.id;
+
           break;
         default:
-          $scope.instance.clusterName = null;
+          $scope.instance.clusterId = null;
       }
-      console.log($scope.instance.clusterName);
+      console.log($scope.instance.clusterId);
       View.createInstance($scope.instance)
         .then(function(data) {
           Alert.success($t('views.alerts.instanceCreated', {instanceName: $scope.instance.instance_name}));

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewUrlCtrl.js

@@ -18,7 +18,7 @@
 'use strict';
 
 angular.module('ambariAdminConsole')
-.controller('ViewUrlCtrl',['$scope', 'View', 'Alert', 'Cluster', '$routeParams', '$location', 'UnsavedDialog', '$translate', function($scope, View, Alert, Cluster, $routeParams, $location, UnsavedDialog, $translate) {
+.controller('ViewUrlCtrl',['$scope', 'View', 'Alert', 'Cluster', '$routeParams', '$location', 'UnsavedDialog', '$translate', 'Settings', function($scope, View, Alert, Cluster, $routeParams, $location, UnsavedDialog, $translate, Settings) {
   var $t = $translate.instant;
   $scope.form = {};
   $scope.constants = {
@@ -115,6 +115,7 @@ angular.module('ambariAdminConsole')
 
       View.updateShortUrl(payload).then(function(urlStatus) {
         Alert.success($t('urls.urlCreated', {
+          siteRoot: Settings.siteRoot,
           viewName:$scope.url.selectedInstance.cname ,
           shortUrl:$scope.url.suffix,
           urlName:$scope.url.urlName

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewUrlEditCtrl.js

@@ -18,7 +18,7 @@
 'use strict';
 
 angular.module('ambariAdminConsole')
-.controller('ViewUrlEditCtrl',['$scope', 'View', 'Alert', 'Cluster', '$routeParams', '$location', 'UnsavedDialog', '$translate','ConfirmationModal' ,function($scope, View, Alert, Cluster, $routeParams, $location, UnsavedDialog, $translate,ConfirmationModal) {
+  .controller('ViewUrlEditCtrl',['$scope', 'View', 'Alert', 'Cluster', '$routeParams', '$location', 'UnsavedDialog', '$translate','ConfirmationModal', 'Settings' ,function($scope, View, Alert, Cluster, $routeParams, $location, UnsavedDialog, $translate,ConfirmationModal, Settings) {
   var $t = $translate.instant;
   $scope.form = {};
   $scope.constants = {
@@ -55,6 +55,7 @@ angular.module('ambariAdminConsole')
 
           View.editShortUrl(payload).then(function(urlStatus) {
               Alert.success($t('urls.urlUpdated', {
+                  siteRoot: Settings.siteRoot,
                   viewName:$scope.url.view_instance_common_name ,
                   shortUrl:$scope.url.suffix,
                   urlName:$scope.url.url_name