Merge branch 'trunk' of D:\incubator-ambari with conflicts.

ambari-web/karma.conf.js

@@ -102,7 +102,7 @@ module.exports = function(config) {
     },
 
     preprocessors: {
-//      '!(vendor|node_modules|test)/**/!(karma_setup|tests).js': 'coverage',
+      '!(vendor|node_modules|test)/**/!(karma_setup|tests).js': 'coverage',
       'app/templates/**/*.hbs': ['ember-precompiler-brunch', 'common-require'],
       'app!(assets)/**/!(karma_setup|tests).js': ['common-require'],
       'test/**/*.js': ['common-require']
@@ -117,7 +117,7 @@ module.exports = function(config) {
     // test results reporter to use
     // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
 //    reporters: ['progress', 'coverage'],
-    reporters: ['progress'],
+    reporters: ['progress', 'coverage'],
 
 
     // web server port

contrib/views/jobs/src/main/resources/ui/Gruntfile.js

@@ -181,6 +181,18 @@ module.exports = function (grunt) {
         dirs: ['<%= yeoman.dist %>']
       }
     },
+    imagemin: {
+      dist: {
+        files: [
+          {
+            expand: true,
+            cwd: '<%= yeoman.app %>/images',
+            src: '{,*/}*.{png,jpg,jpeg}',
+            dest: '<%= yeoman.dist %>/images'
+          }
+        ]
+      }
+    },
     svgmin: {
       dist: {
         files: [
@@ -260,24 +272,22 @@ module.exports = function (grunt) {
             cwd: '<%= yeoman.app %>',
             dest: '<%= yeoman.dist %>',
             src: [
-              '*.{ico,txt}',
+              '*.{ico,txt,php}',
               '.htaccess',
               'img/*',
               'styles/fonts/*',
               'scripts/assets/**/*'
             ]
-          },
-          {
-            expand: true,
-            flatten: true,
-            src: '<%= yeoman.app %>/bower_components/jquery-ui/themes/base/images/*',
-            dest: '<%= yeoman.dist %>/styles/images/'
-          },
+          }
+        ]
+      },
+      xampp: {
+        files: [
           {
             expand: true,
-            flatten: true,
-            src: '<%= yeoman.app %>/bower_components/font-awesome/font/*',
-            dest: '<%= yeoman.dist %>/font/'
+            flatten: false,
+            src: '<%= yeoman.dist %>/**/*',
+            dest: 'D:/xampp/htdocs/'
           }
         ]
       }
@@ -291,6 +301,7 @@ module.exports = function (grunt) {
       ],
       dist: [
         'emberTemplates',
+        'imagemin',
         'svgmin',
         'htmlmin'
       ]
@@ -385,7 +396,8 @@ module.exports = function (grunt) {
     //'uglify',
     'copy:dist',
     //'rev',
-    'usemin'
+    'usemin',
+    'copy:xampp'
   ]);
 
   grunt.registerTask('default', [