From a794cfbb5e8bb26ed98a90a2e37a955370a61a6a Mon Sep 17 00:00:00 2001
From: Yang <xiaoryang@ebay.com>
Date: Wed, 31 May 2017 14:28:27 +0800
Subject: [PATCH 1/6] add ui of schedule

---
 ui/js/app.js                                  |  19 +++
 ui/js/bs.js                                   |  19 +++
 ui/js/controllers/bigChart-ctrl.js            |  21 ++-
 ui/js/controllers/createdataasset-ctrl.js     |  19 +++
 ui/js/controllers/createjob-ac-ctrl.js        | 144 ++++++++++++++++++
 ui/js/controllers/createjob0.js               |  27 ++++
 ui/js/controllers/createrule-ac-ctrl.js       |  19 +++
 ui/js/controllers/createrule-an-ctrl.js       |  19 +++
 ui/js/controllers/createrule-pu-ctrl.js       |  19 +++
 ui/js/controllers/createrule-va-ctrl.js       |  19 +++
 ui/js/controllers/createrule0-ctrl.js         |  19 +++
 ui/js/controllers/dataassets-ctrl.js          |  19 +++
 ui/js/controllers/downloadSample-ctrl.js      |  21 ++-
 ui/js/controllers/editdataasset-ctrl.js       |  19 +++
 ui/js/controllers/footer-ctrl.js              |  19 +++
 ui/js/controllers/health-ctrl.js              |  19 +++
 ui/js/controllers/index.js                    |  21 +++
 ui/js/controllers/job-ctrl.js                 | 111 ++++++++++++++
 ui/js/controllers/main-ctrl.js                |  21 ++-
 ui/js/controllers/metrics-ctrl.js             |  24 ++-
 ui/js/controllers/module.js                   |  19 +++
 ui/js/controllers/mydashboard-ctrl.js         |  19 +++
 ui/js/controllers/nav-ctrl.js                 |  19 +++
 ui/js/controllers/rule-ctrl.js                |  19 +++
 ui/js/controllers/sidebar-ctrl.js             |  19 +++
 ui/js/controllers/subscribemodel-ctrl.js      |  19 +++
 ui/js/controllers/viewrule-ctrl.js            |  19 +++
 ui/js/directives/bigchart.js                  |  19 +++
 ui/js/directives/index.js                     |  19 +++
 ui/js/directives/module.js                    |  19 +++
 ui/js/directives/treeview.js                  |  19 +++
 ui/js/filters/index.js                        |  19 +++
 ui/js/filters/module.js                       |  19 +++
 ui/js/filters/strmap.js                       |  19 +++
 ui/js/filters/strshorten.js                   |  19 +++
 ui/js/main.js                                 |  19 +++
 ui/js/routes.js                               |  47 ++++--
 ui/js/services/bark-chart.js                  |  19 +++
 ui/js/services/index.js                       |  19 +++
 ui/js/services/module.js                      |  19 +++
 ui/js/services/services.js                    |  37 ++++-
 .../dataassets/confirmation-dataasset.html    |  21 +++
 .../confirmation-delete-dataasset.html        |  21 +++
 ui/pages/dataassets/createdataasset.html      |  21 +++
 ui/pages/dataassets/dataassets.html           |  21 +++
 ui/pages/dataassets/editdataasset.html        |  21 +++
 ui/pages/health/health.html                   |  21 +++
 ui/pages/jobs/confirmation-ac.html            |  67 ++++++++
 ui/pages/jobs/createjob-ac.html               | 120 +++++++++++++++
 ui/pages/jobs/createjob0.html                 |  10 ++
 ui/pages/jobs/delete-confirm.html             |  76 +++++++++
 ui/pages/jobs/job.css                         |   0
 ui/pages/jobs/jobs.html                       |  66 ++++++++
 .../{rules => measures}/confirmation-ac.html  |  21 +++
 .../{rules => measures}/confirmation-an.html  |  21 +++
 .../{rules => measures}/confirmation-pu.html  |  21 +++
 .../{rules => measures}/confirmation-va.html  |  21 +++
 .../{rules => measures}/createrule-ac.html    |  28 +++-
 .../{rules => measures}/createrule-an.html    |  27 +++-
 .../{rules => measures}/createrule-pu.html    |  29 +++-
 .../{rules => measures}/createrule-va.html    |  29 +++-
 ui/pages/{rules => measures}/createrule0.html |  21 +++
 .../{rules => measures}/delete-confirm.html   |  21 +++
 .../{rules/rule.css => measures/measure.css}  |  19 +++
 .../rules.html => measures/measures.html}     |  27 +++-
 .../{rules => measures}/va-explaination.html  |  21 +++
 ui/pages/{rules => measures}/viewrule.html    |  21 +++
 ui/pages/metrics/dashboard.html               |  21 +++
 ui/pages/metrics/download-sample.html         |  21 +++
 ui/pages/metrics/metrics.css                  |  19 +++
 .../mydashboard/confirmation-subscribe.html   |  21 +++
 ui/pages/mydashboard/mydashboard.html         |  21 +++
 ui/pages/mydashboard/subscribemodel.html      |  21 +++
 ui/pages/template/bigchart.css                |  19 +++
 ui/pages/template/bigchart.html               |  21 +++
 ui/pages/template/undercons.html              |  21 +++
 ui/tests/ut/karma.conf.js                     |  19 +++
 .../controllers/createjob-ac-ctrl.spec.js     |  43 ++++++
 .../controllers/createrule-ac-ctrl.spec.js    |  19 +++
 .../controllers/createrule-pu-ctrl.spec.js    |  19 +++
 .../controllers/createrule-va-ctrl.spec.js    |  19 +++
 .../controllers/createrule0-ctrl.spec.js      |  19 +++
 .../ut/specs/controllers/health-ctrl.spec.js  |  19 +++
 .../ut/specs/controllers/job-ctrl.spec.js     |  43 ++++++
 .../ut/specs/controllers/metrics-ctrl.spec.js |  19 +++
 .../ut/specs/controllers/nav-ctrl_spec.js     |  19 +++
 .../ut/specs/controllers/rule-ctrl.spec.js    |  19 +++
 .../ut/specs/controllers/sidebar-ctrl_spec.js |  19 +++
 .../specs/controllers/viewrule-ctrl.spec.js   |  19 +++
 ui/tests/ut/specs/filters/strmap_spec.js      |  19 +++
 ui/tests/ut/specs/filters/strshorten_spec.js  |  19 +++
 ui/tests/ut/specs/services/services_spec.js   |  19 +++
 ui/tests/ut/test-main.js                      |  19 +++
 93 files changed, 2375 insertions(+), 36 deletions(-)
 create mode 100644 ui/js/controllers/createjob-ac-ctrl.js
 create mode 100644 ui/js/controllers/createjob0.js
 create mode 100644 ui/js/controllers/job-ctrl.js
 create mode 100644 ui/pages/jobs/confirmation-ac.html
 create mode 100644 ui/pages/jobs/createjob-ac.html
 create mode 100644 ui/pages/jobs/createjob0.html
 create mode 100644 ui/pages/jobs/delete-confirm.html
 create mode 100644 ui/pages/jobs/job.css
 create mode 100644 ui/pages/jobs/jobs.html
 rename ui/pages/{rules => measures}/confirmation-ac.html (85%)
 rename ui/pages/{rules => measures}/confirmation-an.html (87%)
 rename ui/pages/{rules => measures}/confirmation-pu.html (88%)
 rename ui/pages/{rules => measures}/confirmation-va.html (88%)
 rename ui/pages/{rules => measures}/createrule-ac.html (95%)
 rename ui/pages/{rules => measures}/createrule-an.html (95%)
 rename ui/pages/{rules => measures}/createrule-pu.html (92%)
 rename ui/pages/{rules => measures}/createrule-va.html (95%)
 rename ui/pages/{rules => measures}/createrule0.html (94%)
 rename ui/pages/{rules => measures}/delete-confirm.html (81%)
 rename ui/pages/{rules/rule.css => measures/measure.css} (90%)
 rename ui/pages/{rules/rules.html => measures/measures.html} (84%)
 rename ui/pages/{rules => measures}/va-explaination.html (96%)
 rename ui/pages/{rules => measures}/viewrule.html (92%)
 create mode 100644 ui/tests/ut/specs/controllers/createjob-ac-ctrl.spec.js
 create mode 100644 ui/tests/ut/specs/controllers/job-ctrl.spec.js

diff --git a/ui/js/app.js b/ui/js/app.js
index e2dc9fe0d..03452f4f3 100644
--- a/ui/js/app.js
+++ b/ui/js/app.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/bs.js b/ui/js/bs.js
index f6f67d3c4..0cd866e33 100644
--- a/ui/js/bs.js
+++ b/ui/js/bs.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/bigChart-ctrl.js b/ui/js/controllers/bigChart-ctrl.js
index 5525cd243..56a506a06 100644
--- a/ui/js/controllers/bigChart-ctrl.js
+++ b/ui/js/controllers/bigChart-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
@@ -55,4 +74,4 @@ define(['./module'], function(controllers) {
       }
 
     }]);
-});
\ No newline at end of file
+});
diff --git a/ui/js/controllers/createdataasset-ctrl.js b/ui/js/controllers/createdataasset-ctrl.js
index d951851e1..1fa2a17f1 100644
--- a/ui/js/controllers/createdataasset-ctrl.js
+++ b/ui/js/controllers/createdataasset-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/createjob-ac-ctrl.js b/ui/js/controllers/createjob-ac-ctrl.js
new file mode 100644
index 000000000..428fcc4ea
--- /dev/null
+++ b/ui/js/controllers/createjob-ac-ctrl.js
@@ -0,0 +1,144 @@
+define(['./module'], function(controllers) {
+    'use strict';
+    controllers.controller('CreateJobACCtrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route', '$filter', function($scope, $http, $config, $location, toaster, $timeout, $route, $filter) {
+        console.log('Create job controller');
+        $scope.currentStep = 1;
+
+        $scope.Measures = [];
+        $scope.$on('$viewContentLoaded', function() {
+            // console.log($('#footerwrap').css('height'));
+            // console.log($('.formStep').offset());
+            $scope.$emit('initReq');
+            resizeWindow();
+
+            //  $('#confirm').on('hidden.bs.modal', function (e) {
+            //    console.log('hidden');
+            //   //  $('#confirm').off('hidden.bs.modal');
+            //    $location.path('/rules');
+            //   });
+
+            // $('.formStep').css({height: 800});
+        });
+        var getMeasureUrl = $config.uri.getMeasuresByOwner+$scope.ntAccount;
+        $http.get(getMeasureUrl).success(function(res){
+            angular.forEach(res,function(measure){
+                $scope.Measures.push(measure);
+            })
+            console.log($scope.Measures);
+        })
+
+
+
+        $scope.$on('resizeHandler', function(e) {
+            if ($route.current.$$route.controller == "CreateRuleACCtrl") {
+                $scope.$emit('initReq');
+                resizeWindow();
+            }
+        });
+
+
+        function resizeWindow() {
+                    var stepSelection = '.formStep[id=step-' + $scope.currentStep + ']';
+                    $(stepSelection).css({
+                        height: window.innerHeight - $(stepSelection).offset().top - $('#footerwrap').outerHeight()
+                    });
+                    $('fieldset').height($(stepSelection).height() - $(stepSelection + '>.stepDesc').height() - $('.btn-container').height() - 80);
+                    $('.y-scrollable').css({
+                        'max-height': $('fieldset').height()- $('.add-dataset').outerHeight()
+                    });
+
+        }
+
+        // Initial Value
+        $scope.form = {
+            submit: function(form) {
+                if (!form.$valid) {
+                    var field = null
+                      , firstError = null ;
+                    for (field in form) {
+                        if (field[0] != '$') {
+                            if (firstError === null  && !form[field].$valid) {
+                                firstError = form[field].$name;
+                            }
+
+                            if (form[field].$invalid) {
+                                form[field].$dirty = true;
+                            }
+                        }
+                    }
+                    angular.element('.ng-invalid[name=' + firstError + ']').focus();
+                    errorMessage($scope.currentStep);
+                } else {
+                    //  $location.path('/rules');
+                    form.$setPristine();
+                    var rule = '';
+                    this.data={
+                      "sourcePat":$scope.sourcePat,
+                      "targetPat":$scope.targetPat,
+                      "jobStartTime":$scope.jobStartTime,
+                      "periodTime":$scope.periodTime,
+                      "groupName":'BA',
+                    };
+                    $('#confirm-job').modal('show');
+                }
+            },
+
+            save: function() {
+
+
+                //::TODO: Need to save the data to backend with POST/PUT method
+                console.log(JSON.stringify($scope.form.data));
+
+//                var newModel = $config.uri.newAccuracyModel;
+//                var BACKEND_SERVER = '';
+                var date = new Date();
+                var month = date.getMonth()+1;
+                var timestamp = Date.parse(date);
+                timestamp = timestamp / 1000;
+                var jobName = $scope.Measures[$scope.measure] + '-BA-' + $scope.ntAccount + '-' + date.getFullYear() + '-'+ month + '-'+date.getDate();
+                var newJob = $config.uri.addJobs + this.data.groupName + '/' + jobName + '/' + $scope.Measures[$scope.measure];
+                console.log(newJob);
+                console.log(this.data);
+                $http.post(newJob, this.data).success(function(data) {
+                	// if(data.status=='0')
+                	// {
+                	  console.log(data);
+                      if(data=='fail'){
+                          toaster.pop('error', 'Please modify the name of job, because there is already a same model in database ', data.message);
+                          return;
+                      }
+
+	                  $('#confirm-job').on('hidden.bs.modal', function(e) {
+	                      $('#confirm-job').off('hidden.bs.modal');
+	                      $location.path('/jobs').replace();
+	                      $scope.$apply();
+	                  });
+	                	$('#confirm-job').modal('hide');
+	                // }
+                	// else
+                	// {
+                	// 	errorMessage(0, data.result);
+                	// }
+
+                }).error(function(data){
+                  // errorMessage(0, 'Save model failed, please try again!');
+                  toaster.pop('error', 'Save model failed, please try again!', data.message);
+                });
+
+            },
+
+        }
+
+        var errorMessage = function(i, msg) {
+            var errorMsgs = ['Please select at least one attribute!', 'Please select at least one attribute in target, make sure target is different from source!', 'Please make sure to map each target to a unique source.', 'please complete the form in this step before proceeding'];
+            if (!msg) {
+                toaster.pop('error', 'Error', errorMsgs[i - 1], 0);
+            } else {
+                toaster.pop('error', 'Error', msg, 0);
+            }
+        };
+    }
+    ]);
+
+
+});
diff --git a/ui/js/controllers/createjob0.js b/ui/js/controllers/createjob0.js
new file mode 100644
index 000000000..a63f07414
--- /dev/null
+++ b/ui/js/controllers/createjob0.js
@@ -0,0 +1,27 @@
+define(['./module'], function (controllers) {
+    'use strict';
+    controllers.controller('CreateJob0Ctrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route',  function ($scope, $http, $config, $location, toaster, $timeout, $route) {
+      console.log('Create job 0 controller');
+      $scope.publishURL = document.location.origin;
+
+      $scope.click = function(type){
+        $location.path('/createjob-' + type);
+      }
+      $scope.$on('$viewContentLoaded', function(){
+        $scope.$emit('initReq');
+        resizeWindow();
+      });
+
+      $scope.$on('resizeHandler', function(e) {
+        if($route.current.$$route.controller == 'CreateJob0Ctrl'){
+            console.log('createjob0 resize');
+            resizeWindow();
+        }
+      });
+
+      function resizeWindow(){
+        $('#panel-2 >.panel-body').css({height: $('#panel-1 >.panel-body').outerHeight() + $('#panel-1 >.panel-footer').outerHeight() - $('#panel-2 >.panel-footer').outerHeight()});
+        $('#panel-4 >.panel-body').css({height: $('#panel-3 >.panel-body').outerHeight() + $('#panel-3 >.panel-footer').outerHeight() - $('#panel-4 >.panel-footer').outerHeight()});
+      }
+    }]);
+});
diff --git a/ui/js/controllers/createrule-ac-ctrl.js b/ui/js/controllers/createrule-ac-ctrl.js
index 4e0074978..f6fb91d00 100644
--- a/ui/js/controllers/createrule-ac-ctrl.js
+++ b/ui/js/controllers/createrule-ac-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/createrule-an-ctrl.js b/ui/js/controllers/createrule-an-ctrl.js
index 891c23e19..925f0f1d6 100644
--- a/ui/js/controllers/createrule-an-ctrl.js
+++ b/ui/js/controllers/createrule-an-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/createrule-pu-ctrl.js b/ui/js/controllers/createrule-pu-ctrl.js
index 1786fb3b9..cc8a5e524 100644
--- a/ui/js/controllers/createrule-pu-ctrl.js
+++ b/ui/js/controllers/createrule-pu-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/createrule-va-ctrl.js b/ui/js/controllers/createrule-va-ctrl.js
index 882f80794..20cb7291a 100644
--- a/ui/js/controllers/createrule-va-ctrl.js
+++ b/ui/js/controllers/createrule-va-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/createrule0-ctrl.js b/ui/js/controllers/createrule0-ctrl.js
index 241445a03..be40e809e 100644
--- a/ui/js/controllers/createrule0-ctrl.js
+++ b/ui/js/controllers/createrule0-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/dataassets-ctrl.js b/ui/js/controllers/dataassets-ctrl.js
index 110da44a7..897662878 100644
--- a/ui/js/controllers/dataassets-ctrl.js
+++ b/ui/js/controllers/dataassets-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/downloadSample-ctrl.js b/ui/js/controllers/downloadSample-ctrl.js
index aa1ad899e..1799673fb 100644
--- a/ui/js/controllers/downloadSample-ctrl.js
+++ b/ui/js/controllers/downloadSample-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,4 +52,4 @@ define(['./module'], function(controllers) {
 
     }
     ]);
-});
\ No newline at end of file
+});
diff --git a/ui/js/controllers/editdataasset-ctrl.js b/ui/js/controllers/editdataasset-ctrl.js
index 718525cde..1c6ea9713 100644
--- a/ui/js/controllers/editdataasset-ctrl.js
+++ b/ui/js/controllers/editdataasset-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/footer-ctrl.js b/ui/js/controllers/footer-ctrl.js
index 7eb9e1366..923141c38 100644
--- a/ui/js/controllers/footer-ctrl.js
+++ b/ui/js/controllers/footer-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/health-ctrl.js b/ui/js/controllers/health-ctrl.js
index 3c0c66208..85e2c4c0b 100644
--- a/ui/js/controllers/health-ctrl.js
+++ b/ui/js/controllers/health-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
     Copyright (c) 2016 eBay Software Foundation.
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/index.js b/ui/js/controllers/index.js
index a374161f7..8d6083eb6 100644
--- a/ui/js/controllers/index.js
+++ b/ui/js/controllers/index.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +37,8 @@ define([
     './sidebar-ctrl',
     './health-ctrl',
     './rule-ctrl',
+    './job-ctrl',
+    './createjob-ac-ctrl',
     './createrule0-ctrl',
     './createrule-ac-ctrl',
     './createrule-va-ctrl',
diff --git a/ui/js/controllers/job-ctrl.js b/ui/js/controllers/job-ctrl.js
new file mode 100644
index 000000000..8ac03a64a
--- /dev/null
+++ b/ui/js/controllers/job-ctrl.js
@@ -0,0 +1,111 @@
+define(['./module'], function (controllers) {
+    'use strict';
+    controllers.controller('JobCtrl', ['$scope', '$http', '$config', '$location', '$timeout', '$route', 'toaster', '$filter', function ($scope, $http, $config, $location, $timeout, $route, toaster, $filter) {
+      console.log('job controller');
+      console.log($scope.ntAccount);
+      var allJobs = $config.uri.allJobs;
+      var ts = null;
+      var start = 0;
+      var number = 10;
+      var originalRowCollection = undefined;
+
+      $scope.paging = function(tableState){
+        console.log(tableState);
+        ts = tableState;
+
+        // tableState.pagination.numberOfPages = $scope.rowCollection.length/10 + 1;
+        start = tableState.pagination.start || 0;
+        number = tableState.pagination.number || 10;
+
+        if(start == 0 && !$scope.rowCollection){
+         $http.get(allJobs).success(function(data) {
+           originalRowCollection = angular.copy(data);
+           $scope.rowCollection = angular.copy(data);
+
+           $scope.displayed = $scope.rowCollection.slice(start, start+number);
+           tableState.pagination.numberOfPages = Math.ceil($scope.rowCollection.length/number);
+         });
+        }else{
+         $scope.displayed = $scope.rowCollection.slice(start, start+number);
+        }
+      };
+
+
+
+
+      $scope.remove = function remove(row) {
+//        var getJobUrl = $config.uri.getJob + '/' +row.name;
+//        $http.get(getJobUrl).success(function(data){
+//  			  $scope.deletedRow = data;
+//
+//  		  });
+        $scope.deletedRow = row;
+        $scope.deletedBriefRow = row;
+        $('#deleteJobConfirmation').modal('show');
+      }
+
+      $scope.confirmDelete = function(){
+        var row =   $scope.deletedBriefRow;
+        var deleteModelUrl = $config.uri.deleteJob + row.groupName+'/jobs/'+row.jobName;
+        $http.delete(deleteModelUrl).success(function(){
+
+          var index = $scope.rowCollection.indexOf(row);
+          $scope.rowCollection.splice(index, 1);
+
+          index = $scope.displayed.indexOf(row);
+          $scope.displayed.splice(index, 1);
+
+          $('#deleteJobConfirmation').modal('hide');
+
+        }).error(function(data, status){
+          toaster.pop('error', 'Error when deleting record', data);
+        });
+      }
+
+
+
+      $scope.edit = function edit() {
+      }
+
+
+      $scope.$on('$viewContentLoaded', function() {
+        $scope.$emit('initReq');
+      });
+
+
+/*
+       function createRowCollection(){
+         var data = [];
+         for (var j = 0; j < 22; j++) {
+              data.push(createRandomItem());
+          }
+
+          return data;
+       }
+
+       function createRandomItem() {
+         var nameList = ['ViewItem', 'Search', 'BidEvent', 'user_dna', 'LAST_ITEMS_VIEWED'],
+             systemList = ['Bullseye', 'PDS', 'GPS', 'IDLS', 'Hadoop'],
+             dateList = ['2016-03-10', '2016-03-12', '2016-03-15', '2016-03-19', '2016-03-20'],
+             statusList = [0, 1, 2];
+
+           var
+               name = nameList[Math.floor(Math.random() * 5)],
+               system = Math.floor(Math.random() * 7),
+               type = Math.floor(Math.random() * 4),
+               description = 'Only for demo purpose',
+               createDate = dateList[Math.floor(Math.random() * 5)],
+               status = Math.floor(Math.random() * 3);
+
+           return{
+               name: name,
+               system: system,
+               type: type,
+               description: description,
+               createDate: createDate,
+               status:status
+           };
+       }
+*/
+    }]);
+});
\ No newline at end of file
diff --git a/ui/js/controllers/main-ctrl.js b/ui/js/controllers/main-ctrl.js
index 37274afab..95dcf1050 100644
--- a/ui/js/controllers/main-ctrl.js
+++ b/ui/js/controllers/main-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,4 +52,4 @@ define(['./module'], function(controllers) {
         })
     }
     ]);
-});
\ No newline at end of file
+});
diff --git a/ui/js/controllers/metrics-ctrl.js b/ui/js/controllers/metrics-ctrl.js
index 5452f27ac..1c4e5acd7 100644
--- a/ui/js/controllers/metrics-ctrl.js
+++ b/ui/js/controllers/metrics-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
   Copyright (c) 2016 eBay Software Foundation.
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,10 +56,7 @@ define(['./module'], function(controllers) {
                     orgNode.assetMap = value;
                });
                $scope.originalOrgs = angular.copy($scope.orgs);
-
-               var url_briefmetrics = $config.uri.dashboard;
-               $http.post(url_dashboard, {"query": {"match_all":{}},  "sort": [{"tmst": {"order": "asc"}}], "size": 1000}).success(function(data) {
-                    $scope.briefmetrics = data;
+               $http.post(url_dashboard, {"query": {"match_all":{}},  "sort": [{"tmst": {"order": "asc"}}],"size":1000}).success(function(data) {
                     angular.forEach(data.hits.hits, function(sys) {
                         var chartData = sys._source;
                         chartData.sort = function(a,b){
diff --git a/ui/js/controllers/module.js b/ui/js/controllers/module.js
index 624c962f6..2673b29e6 100644
--- a/ui/js/controllers/module.js
+++ b/ui/js/controllers/module.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/mydashboard-ctrl.js b/ui/js/controllers/mydashboard-ctrl.js
index 3cc215d4b..606f9f838 100644
--- a/ui/js/controllers/mydashboard-ctrl.js
+++ b/ui/js/controllers/mydashboard-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/nav-ctrl.js b/ui/js/controllers/nav-ctrl.js
index 880800065..a3aabd2ec 100644
--- a/ui/js/controllers/nav-ctrl.js
+++ b/ui/js/controllers/nav-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/rule-ctrl.js b/ui/js/controllers/rule-ctrl.js
index a202c2c4c..8d73ea139 100644
--- a/ui/js/controllers/rule-ctrl.js
+++ b/ui/js/controllers/rule-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/sidebar-ctrl.js b/ui/js/controllers/sidebar-ctrl.js
index 7cf4945af..c613274e1 100644
--- a/ui/js/controllers/sidebar-ctrl.js
+++ b/ui/js/controllers/sidebar-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
   Copyright (c) 2016 eBay Software Foundation.
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/subscribemodel-ctrl.js b/ui/js/controllers/subscribemodel-ctrl.js
index e13bfd1d4..b645ebcd8 100644
--- a/ui/js/controllers/subscribemodel-ctrl.js
+++ b/ui/js/controllers/subscribemodel-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/controllers/viewrule-ctrl.js b/ui/js/controllers/viewrule-ctrl.js
index 0c8c7e5a2..2b66a7d84 100644
--- a/ui/js/controllers/viewrule-ctrl.js
+++ b/ui/js/controllers/viewrule-ctrl.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/directives/bigchart.js b/ui/js/directives/bigchart.js
index c8e3fc5f1..be5015303 100644
--- a/ui/js/directives/bigchart.js
+++ b/ui/js/directives/bigchart.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/directives/index.js b/ui/js/directives/index.js
index 7bbb0e46e..915c0310f 100644
--- a/ui/js/directives/index.js
+++ b/ui/js/directives/index.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/directives/module.js b/ui/js/directives/module.js
index 36569555d..16f2c409c 100644
--- a/ui/js/directives/module.js
+++ b/ui/js/directives/module.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/directives/treeview.js b/ui/js/directives/treeview.js
index fe409954b..0d2a618e8 100644
--- a/ui/js/directives/treeview.js
+++ b/ui/js/directives/treeview.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
   The MIT License (MIT)
 
diff --git a/ui/js/filters/index.js b/ui/js/filters/index.js
index bcd414c05..1f6f96ef1 100644
--- a/ui/js/filters/index.js
+++ b/ui/js/filters/index.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/filters/module.js b/ui/js/filters/module.js
index 3b35aeb7b..9a731885a 100644
--- a/ui/js/filters/module.js
+++ b/ui/js/filters/module.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/filters/strmap.js b/ui/js/filters/strmap.js
index daa8df76d..f5d77db5e 100644
--- a/ui/js/filters/strmap.js
+++ b/ui/js/filters/strmap.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/filters/strshorten.js b/ui/js/filters/strshorten.js
index f4dadf7eb..c5436e872 100644
--- a/ui/js/filters/strshorten.js
+++ b/ui/js/filters/strshorten.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/main.js b/ui/js/main.js
index 81033588b..e16787618 100644
--- a/ui/js/main.js
+++ b/ui/js/main.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/routes.js b/ui/js/routes.js
index 099e3ee6c..7843a4b98 100644
--- a/ui/js/routes.js
+++ b/ui/js/routes.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,46 +45,56 @@ define(['./app'], function(app) {
             controller: 'HealthCtrl'
         });
 
-        $routeProvider.when('/rules', {
-            templateUrl: '/pages/rules/rules.html',
+        $routeProvider.when('/measures', {
+            templateUrl: '/pages/measures/measures.html',
             controller: 'RuleCtrl'
         });
 
         $routeProvider.when('/createrule0', {
-            templateUrl: '/pages/rules/createrule0.html',
+            templateUrl: '/pages/measures/createrule0.html',
             controller: 'CreateRule0Ctrl'
         });
 
         $routeProvider.when('/createrule-ac', {
-            templateUrl: '/pages/rules/createrule-ac.html',
+            templateUrl: '/pages/measures/createrule-ac.html',
             controller: 'CreateRuleACCtrl'
         });
 
         $routeProvider.when('/createrule-va', {
-            templateUrl: '/pages/rules/createrule-va.html',
+            templateUrl: '/pages/measures/createrule-va.html',
             controller: 'CreateRuleVACtrl'
         });
 
         $routeProvider.when('/createrule-an', {
-            templateUrl: '/pages/rules/createrule-an.html',
+            templateUrl: '/pages/measures/createrule-an.html',
             controller: 'CreateRuleANCtrl'
         });
 
         $routeProvider.when('/createrule-pu', {
-            templateUrl: '/pages/rules/createrule-pu.html',
+            templateUrl: '/pages/measures/createrule-pu.html',
             controller: 'CreateRulePUCtrl'
         });
 
         $routeProvider.when('/viewrule/:modelname/:modeltype', {
-            templateUrl: '/pages/rules/viewrule.html',
+            templateUrl: '/pages/measures/viewrule.html',
             controller: 'ViewRuleCtrl'
         });
 
         $routeProvider.when('/viewrule/:modelname', {
-            templateUrl: '/pages/rules/viewrule.html',
+            templateUrl: '/pages/measures/viewrule.html',
             controller: 'ViewRuleCtrl'
         });
 
+        $routeProvider.when('/jobs',{
+            templateUrl:'pages/jobs/jobs.html',
+            controller:'JobCtrl'
+        });
+
+        $routeProvider.when('/createjob-ac', {
+            templateUrl: '/pages/jobs/createjob-ac.html',
+            controller: 'CreateJobACCtrl'
+        });
+
         $routeProvider.when('/metrics', {
             templateUrl: '/pages/metrics/dashboard.html',
             controller: 'MetricsCtrl'
diff --git a/ui/js/services/bark-chart.js b/ui/js/services/bark-chart.js
index 2df874877..19acbb285 100644
--- a/ui/js/services/bark-chart.js
+++ b/ui/js/services/bark-chart.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
   Copyright (c) 2016 eBay Software Foundation.
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/services/index.js b/ui/js/services/index.js
index 17a5aa783..35b61c20e 100644
--- a/ui/js/services/index.js
+++ b/ui/js/services/index.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/services/module.js b/ui/js/services/module.js
index f8fbecb64..317ce3308 100644
--- a/ui/js/services/module.js
+++ b/ui/js/services/module.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/js/services/services.js b/ui/js/services/services.js
index 39b0df7bc..7118a0a20 100644
--- a/ui/js/services/services.js
+++ b/ui/js/services/services.js
@@ -1,9 +1,31 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 The Apache Software Foundation
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
   Copyright (c) 2016 eBay Software Foundation.
   Licensed 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.
@@ -19,8 +41,8 @@ define(['./module'], function (services) {
 
 
 //    var BACKEND_SERVER = 'http://10.149.247.156:38080';
-//      var BACKEND_SERVER = 'http://localhost:8080';
-      var BACKEND_SERVER = '';
+      var BACKEND_SERVER = 'http://localhost:8080';
+//      var BACKEND_SERVER = '';
       var API_ROOT_PATH = '/api/v1';
 
 //      var ES_SERVER = 'http://10.149.247.156:59200';
@@ -59,7 +81,8 @@ define(['./module'], function (services) {
               metricsByOrg:'',
 //              organization:'/org.json',
 //              dashboard:'/dashboard.json',
-              organization: BACKEND_SERVER + '/orgWithMetrics',
+
+              organization:BACKEND_SERVER + '/orgWithMetrics',
               dashboard:ES_SERVER+'/griffin/accuracy/_search?pretty&filter_path=hits.hits._source',
               metricsample: BACKEND_SERVER + API_ROOT_PATH + '/metrics/sample',
               metricdownload: BACKEND_SERVER + API_ROOT_PATH + '/metrics/download',
@@ -70,6 +93,12 @@ define(['./module'], function (services) {
               getModel: BACKEND_SERVER + '/measures/findByName',
               enableModel: BACKEND_SERVER + API_ROOT_PATH + '/models/enableModel',
 
+              //Jobs
+              allJobs:BACKEND_SERVER + '/jobs/',
+              addJobs:BACKEND_SERVER+'/jobs/add/',
+              getMeasuresByOwner:BACKEND_SERVER+'/measures/owner/',
+              deleteJob:BACKEND_SERVER + '/jobs/groups/',
+//              allJobs:'/jobs.json',
               newAccuracyModel: BACKEND_SERVER + API_ROOT_PATH + '/models' ,
               newValidityModel: BACKEND_SERVER + API_ROOT_PATH + '/models' ,
               newAnomalyModel: BACKEND_SERVER + API_ROOT_PATH + '/models' ,
@@ -91,4 +120,4 @@ define(['./module'], function (services) {
 
       return config;
     });
-});
\ No newline at end of file
+});
diff --git a/ui/pages/dataassets/confirmation-dataasset.html b/ui/pages/dataassets/confirmation-dataasset.html
index 93f5145d2..b5c60a2d8 100644
--- a/ui/pages/dataassets/confirmation-dataasset.html
+++ b/ui/pages/dataassets/confirmation-dataasset.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/dataassets/confirmation-delete-dataasset.html b/ui/pages/dataassets/confirmation-delete-dataasset.html
index b39731467..969b47711 100644
--- a/ui/pages/dataassets/confirmation-delete-dataasset.html
+++ b/ui/pages/dataassets/confirmation-delete-dataasset.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/dataassets/createdataasset.html b/ui/pages/dataassets/createdataasset.html
index 13bbb4df2..8f9870034 100644
--- a/ui/pages/dataassets/createdataasset.html
+++ b/ui/pages/dataassets/createdataasset.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/dataassets/dataassets.html b/ui/pages/dataassets/dataassets.html
index b26af13e5..491b8ba8f 100644
--- a/ui/pages/dataassets/dataassets.html
+++ b/ui/pages/dataassets/dataassets.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/dataassets/editdataasset.html b/ui/pages/dataassets/editdataasset.html
index 8d22e912e..9db6c2023 100644
--- a/ui/pages/dataassets/editdataasset.html
+++ b/ui/pages/dataassets/editdataasset.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/health/health.html b/ui/pages/health/health.html
index ceb2d652f..664780c4e 100644
--- a/ui/pages/health/health.html
+++ b/ui/pages/health/health.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/jobs/confirmation-ac.html b/ui/pages/jobs/confirmation-ac.html
new file mode 100644
index 000000000..329c0f9e3
--- /dev/null
+++ b/ui/pages/jobs/confirmation-ac.html
@@ -0,0 +1,67 @@
+<div class="container-fluid" id="viewJobContent" style="overflow:auto;">
+    <div class="row">
+        <h5 class="over-title margin-bottom-15">Basic information</h5>
+    </div><!--//row-->
+    <div class="row">
+
+        <div  class="col-lg-12 col-md-12 col-sm-12">
+            <div id="viewrule-definition" class="viewrule-content">
+                <div class="row">
+                    <label class="col-md-4 col-lg-4 col-sm-4">
+                        Source Partition:
+                    </label>
+
+                    <div class="col-md-8 col-lg-8 col-sm-8 " style="color: #fff">
+                        {{sourcePat}}
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label class="col-md-4 col-lg-4 col-sm-4">
+                        Target Partition:
+                    </label>
+
+                    <div class="col-md-8 col-lg-8 col-sm-8 " style="color: #fff">
+                        {{targetPat}}
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label class="col-md-4 col-lg-4 col-sm-4">
+                        Measure Name:
+                    </label>
+
+                    <div class="col-md-8 col-lg-8 col-sm-8 " style="color: #fff">
+                        {{Measures[measure]}}
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label for="systemSelector" class="col-md-4 col-lg-4 col-sm-4">
+                        Start after:
+                    </label>
+
+                    <div class="col-md-8 col-lg-8 col-sm-8 " style="color: #fff">
+                        {{jobStartTime}}
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label class="col-md-4 col-lg-4 col-sm-4">
+                        Interval:
+                    </label>
+
+                    <div class="col-md-8 col-lg-8 col-sm-8" style="color: #fff"  >{{periodTime}}
+
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+    </div><!--//row-->
+
+    <br/>
+
+
+</div>
\ No newline at end of file
diff --git a/ui/pages/jobs/createjob-ac.html b/ui/pages/jobs/createjob-ac.html
new file mode 100644
index 000000000..78d865301
--- /dev/null
+++ b/ui/pages/jobs/createjob-ac.html
@@ -0,0 +1,120 @@
+<div class="container-fluid">
+    <div class="row">
+        <h5 class="over-title margin-bottom-15">Create Job</h5>
+    </div><!--//row-->
+    <div class="row">
+        <form name="Form" id="form" novalidate>
+                <div  class="formStep" >
+                    <label class="stepDesc">Please setup the job required information</label>
+                    <div class="container-fluid">
+
+                        <!-- schema definition list -->
+                        <div class="col-md-12 col-lg-12 col-sm-12">
+                            <fieldset>
+                                <legend>
+                                    Required Information
+                                </legend>
+                                <div class="y-scrollable">
+                                    <div class="col-md-12 col-lg-12 col-sm-12">
+                                        <div class="form-group" ng-class="{'has-error':Form.ruleName.$dirty&&Form.ruleName.$invalid, 'has-success':Form.ruleName.$valid}">
+                                            <label class="col-md-2 col-lg-2 col-sm-2 control-label">
+                                                Source Partition<span class="symbol required"></span>:
+                                            </label>
+
+                                            <div class="col-md-10 col-lg-10 col-sm-10 ">
+                                                <input type="text" class="form-control" ng-model="sourcePat" name="ruleName" placeholder="Please input the source partition" required ng-pattern="'([0-9a-zA-Z\\_\\-])+'">
+                                                <span class="error text-small block " ng-if="Form.ruleName.$dirty && Form.ruleName.$error.required">Model Name is required</span>
+                                                <span class="error text-small block " ng-if="Form.ruleName.$dirty && Form.ruleName.$error.pattern">Only letter, number, "-" and "_" are allowed</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12 col-lg-12 col-sm-12">
+                                        <div class="form-group">
+                                            <label class="col-md-2 col-lg-2 col-sm-2 control-label">
+                                                Target Partition:
+                                            </label>
+
+                                            <div class="col-md-10 col-lg-10 col-sm-10 ">
+                                                <input type="text" class="form-control" ng-model="targetPat" placeholder="Please input target partition of your model">
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="col-md-12 col-lg-12 col-sm-12">
+                                        <div class="form-group">
+                                            <label for="measureSelector" class="col-md-2 col-lg-2 col-sm-2 control-label">
+                                                Measure Name:
+                                            </label>
+
+                                            <div class="col-md-10 col-lg-10 col-sm-10 ">
+                                                <select id="measureSelector" class="form-control" ng-model="measure" ng-init="Measures[0]" required>
+                                                    <option ng-repeat="row in Measures" value="{{$index}}" >{{row}}</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12 col-lg-12 col-sm-12">
+                                        <div class="form-group">
+                                            <label class="col-md-2 col-lg-2 col-sm-2 control-label">
+                                                 Start After(s):
+                                            </label>
+
+                                            <div class="col-md-10 col-lg-10 col-sm-10 ">
+                                                <input type="text" class="form-control" ng-model="jobStartTime" >
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12 col-lg-12 col-sm-12">
+                                        <div class="form-group">
+                                            <label for="systemSelector" class="col-md-2 col-lg-2 col-sm-2 control-label">
+                                                Interval:
+                                            </label>
+
+                                            <div class="col-md-10 col-lg-10 col-sm-10 ">
+                                                <input type="text" id="systemSelector" class="form-control" ng-model="periodTime"  required >
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div style="color:#b2c831">
+                                    <p>
+                                        <i class="fa fa-info-circle"></i> After submitted, please go to "<a class="bark-link" href="#/jobs">Jobs</a>" to check the job status
+                                    </p>
+                                </div>
+
+                            </fieldset>
+                        </div>
+
+                        <div class="form-group btn-container" >
+                            <button class="btn btn-primary btn-o back-step btn-wide pull-left" ng-click="form.prev(Form)">
+                                <i class="fa fa-arrow-circle-left"></i> Back
+                            </button>
+                            <button class="btn btn-primary btn-o next-step btn-wide pull-right" ng-click="form.submit(Form)">
+                                <!-- <button class="btn btn-primary btn-o next-step btn-wide pull-right" data-toggle="modal" data-target="#confirm"> -->
+                                Submit
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="modal fade" id="confirm-job" role="dialog">
+                    <div class="modal-dialog modal-xg modal-lg">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                                <h4 class="modal-title">Save the job with the below information?</h4>
+                            </div>
+                            <div class="modal-body">
+                                <ng-include src="'/pages/jobs/confirmation-ac.html'"/>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                                <button type="button" class="btn btn-primary" ng-click="form.save()">Save</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+        </form>
+    </div><!--//row-->
+</div>
\ No newline at end of file
diff --git a/ui/pages/jobs/createjob0.html b/ui/pages/jobs/createjob0.html
new file mode 100644
index 000000000..566549bdf
--- /dev/null
+++ b/ui/pages/jobs/createjob0.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/ui/pages/jobs/delete-confirm.html b/ui/pages/jobs/delete-confirm.html
new file mode 100644
index 000000000..8b09b4c9a
--- /dev/null
+++ b/ui/pages/jobs/delete-confirm.html
@@ -0,0 +1,76 @@
+<div class="container-fluid" id="deleteContent" style="overflow:auto;">
+    <div class="row">
+        <h5 class="over-title margin-bottom-15">Basic information</h5>
+    </div><!--//row-->
+    <div class="row">
+
+        <div  class="col-lg-12 col-md-12 col-sm-12">
+            <div id="viewrule-definition" class="viewrule-content">
+                <div class="row">
+                    <label class="col-md-4 col-lg-4 col-sm-4">
+                        Job Name:
+                    </label>
+
+                    <div class="col-md-8 col-lg-8 col-sm-8 " style="color: #fff">
+                        {{deletedRow.jobName}}
+                    </div>
+                </div>
+                <div class="row">
+                    <label class="col-md-4 col-lg-4 col-sm-4">
+                        Source Partition:
+                    </label>
+
+                    <div class="col-md-8 col-lg-8 col-sm-8 " style="color: #fff">
+                        {{deletedRow.sourcePat}}
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label class="col-md-4 col-lg-4 col-sm-4">
+                        Target Partition:
+                    </label>
+
+                    <div class="col-md-8 col-lg-8 col-sm-8 " style="color: #fff">
+                        {{deletedRow.targetPat}}
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label for="systemSelector" class="col-md-4 col-lg-4 col-sm-4">
+                        Next Fire Time:
+                    </label>
+
+                    <div class="col-md-8 col-lg-8 col-sm-8 " style="color: #fff">
+                        {{deletedRow.nextFireTime}}
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label class="col-md-4 col-lg-4 col-sm-4">
+                        Interval:
+                    </label>
+
+                    <div class="col-md-8 col-lg-8 col-sm-8" style="color: #fff">
+                        {{deletedRow.periodTime}}
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label class="col-md-4 col-lg-4 col-sm-4">
+                        Group:
+                    </label>
+
+                    <div class="col-md-8 col-lg-8 col-sm-8" style="color: #fff">
+                        {{deletedRow.groupName}}
+                    </div>
+                </div>
+
+
+            </div>
+        </div>
+
+
+    </div><!--//row-->
+
+
+</div>
\ No newline at end of file
diff --git a/ui/pages/jobs/job.css b/ui/pages/jobs/job.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/ui/pages/jobs/jobs.html b/ui/pages/jobs/jobs.html
new file mode 100644
index 000000000..c26c55c02
--- /dev/null
+++ b/ui/pages/jobs/jobs.html
@@ -0,0 +1,66 @@
+<div >
+    <p>
+        <a class="btn btn-primary btn-o btn-wide" href="#/createjob-ac"><i class="fa fa-plus"></i> Create Job</a>
+    </p>
+
+    <div id="modelContainer">
+        <table st-table="displayed" st-pipe="paging" class="table table-striped">
+            <thead>
+            <tr style="background-color:#7D95CC">
+                <th st-ratio="15">Job Name</th>
+                <th st-ratio="15">Source Partition</th>
+                <th st-ratio="15">Target Partition</th>
+                <th st-ratio="20">Next Fire Time</th>
+                <th st-ratio="5">Interval</th>
+                <th st-ratio="5">Action</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr ng-if="!rowCollection || rowCollection.length == 0">
+                <td colspan="7" style="text-align:center">No content!</td>
+            </tr>
+            <tr ng-repeat="row in displayed">
+                <td>{{row.jobName}}</a></td>
+                <td>{{row.sourcePat}}</a></td>
+                <td>{{row.targetPat|strmap:'modeltype'}}</td>
+                <td>{{(row.nextFireTime | date: 'short':'-0700') || 'N/A' }}</td>
+                <td>{{row.periodTime}}</td>
+                <td>
+                    &nbsp;
+                    <a ng-class="" href="" ng-click="remove(row)" title="delete" style="text-decoration:none">
+                        <i class="fa fa-trash-o"></i>
+                    </a>
+                    &nbsp;
+                    <!--<a href="#/viewrule/{{row.name}}" title="subscribe">-->
+                        <!--<i class="fa fa-eye"></i>-->
+                    <!--</a>-->
+                </td>
+            </tr>
+            </tbody>
+            <tfoot>
+            <tr>
+                <td colspan="8" class="text-right">
+                    <div  st-items-by-page="10" st-pagination="" st-displayed-pages="10"></div>
+                </td>
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+    <div class="modal fade" id="deleteJobConfirmation" role="dialog">
+        <div class="modal-dialog modal-xg modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <h4 class="modal-title">Delete the model with the below information?</h4>
+                </div>
+                <div class="modal-body">
+                    <ng-include src="'/pages/jobs/delete-confirm.html'"/>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-primary" ng-click="confirmDelete()">Yes</button>
+                    <button type="button" class="btn btn-default" data-dismiss="modal">No</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/ui/pages/rules/confirmation-ac.html b/ui/pages/measures/confirmation-ac.html
similarity index 85%
rename from ui/pages/rules/confirmation-ac.html
rename to ui/pages/measures/confirmation-ac.html
index bc8ec2fa6..8302bb2ec 100644
--- a/ui/pages/rules/confirmation-ac.html
+++ b/ui/pages/measures/confirmation-ac.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/rules/confirmation-an.html b/ui/pages/measures/confirmation-an.html
similarity index 87%
rename from ui/pages/rules/confirmation-an.html
rename to ui/pages/measures/confirmation-an.html
index 7146b7e2c..857f3eea8 100644
--- a/ui/pages/rules/confirmation-an.html
+++ b/ui/pages/measures/confirmation-an.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/rules/confirmation-pu.html b/ui/pages/measures/confirmation-pu.html
similarity index 88%
rename from ui/pages/rules/confirmation-pu.html
rename to ui/pages/measures/confirmation-pu.html
index e36ec6a57..6ef49c91a 100644
--- a/ui/pages/rules/confirmation-pu.html
+++ b/ui/pages/measures/confirmation-pu.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/rules/confirmation-va.html b/ui/pages/measures/confirmation-va.html
similarity index 88%
rename from ui/pages/rules/confirmation-va.html
rename to ui/pages/measures/confirmation-va.html
index dc0f47930..225274017 100644
--- a/ui/pages/rules/confirmation-va.html
+++ b/ui/pages/measures/confirmation-va.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/rules/createrule-ac.html b/ui/pages/measures/createrule-ac.html
similarity index 95%
rename from ui/pages/rules/createrule-ac.html
rename to ui/pages/measures/createrule-ac.html
index 970963ff8..0055e89e7 100644
--- a/ui/pages/rules/createrule-ac.html
+++ b/ui/pages/measures/createrule-ac.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
@@ -53,6 +74,7 @@ <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
             </a>
           </li>
         </ul>
+      </div>
 
         <div id="step-1" ng-show="currentStep == 1" class="formStep" >
           <label class="stepDesc">This step let you choose the single source of truth for data quality comparision with target, Apollo datasets are enabled, other platofrms are coming soon. Currently you can only select the attributes from one schema</label>
@@ -313,7 +335,7 @@ <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
                       </label>
 
                       <div class="col-md-10 col-lg-10 col-sm-10 ">
-                        <input type="text" class="form-control" ng-model="basic.name" name="ruleName" placeholder="Please input the rule name" required ng-pattern="'([0-9a-zA-Z\\_\\-])+'">
+                        <input type="text" class="form-control" ng-model="basic.name" name="ruleName" placeholder="Please input the measure name" required ng-pattern="'([0-9a-zA-Z\\_\\-])+'">
                         <span class="error text-small block " ng-if="Form.ruleName.$dirty && Form.ruleName.$error.required">Model Name is required</span>
                         <span class="error text-small block " ng-if="Form.ruleName.$dirty && Form.ruleName.$error.pattern">Only letter, number, "-" and "_" are allowed</span>
                       </div>
@@ -393,7 +415,7 @@ <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
 
                 <div style="color:#b2c831">
                   <p>
-                    <i class="fa fa-info-circle"></i> After submitted, please go to "<a class="bark-link" href="#/rules">Models</a>" to check the model status
+                    <i class="fa fa-info-circle"></i> After submitted, please go to "<a class="bark-link" href="#/measures">Models</a>" to check the model status
                   </p>
                 </div>
 
@@ -420,7 +442,7 @@ <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
                 <h4 class="modal-title">Save the model with the below information?</h4>
               </div>
               <div class="modal-body">
-                <ng-include src="'/pages/rules/confirmation-ac.html'"/>
+                <ng-include src="'/pages/measures/confirmation-ac.html'"/>
               </div>
               <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
diff --git a/ui/pages/rules/createrule-an.html b/ui/pages/measures/createrule-an.html
similarity index 95%
rename from ui/pages/rules/createrule-an.html
rename to ui/pages/measures/createrule-an.html
index 47a29b367..3af5b960c 100644
--- a/ui/pages/rules/createrule-an.html
+++ b/ui/pages/measures/createrule-an.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
@@ -255,7 +276,7 @@ <h5>
                     </label>
 
                     <div class="col-md-10 col-lg-10 col-sm-10 ">
-                      <input type="text" class="form-control" ng-model="form.basic.name" name="ruleName" placeholder="Please input the rule name" required ng-pattern="'([0-9a-zA-Z\\_\\-])+'">
+                      <input type="text" class="form-control" ng-model="form.basic.name" name="ruleName" placeholder="Please input the measure name" required ng-pattern="'([0-9a-zA-Z\\_\\-])+'">
                       <span class="error text-small block " ng-if="Form.ruleName.$dirty && Form.ruleName.$error.required">Model Name is required</span>
                       <span class="error text-small block " ng-if="Form.ruleName.$dirty && Form.ruleName.$error.pattern">Only letter, number, "-" and "_" are allowed</span>
                     </div>
@@ -365,7 +386,7 @@ <h5>
 
               <div style="color:#b2c831">
                 <p>
-                  <i class="fa fa-info-circle"></i> After submitted, please go to "<a class="bark-link" href="#/rules">Models</a>" to check the model status
+                  <i class="fa fa-info-circle"></i> After submitted, please go to "<a class="bark-link" href="#/measures">Models</a>" to check the model status
                 </p>
               </div>
 
@@ -392,7 +413,7 @@ <h5>
               <h4 class="modal-title">Save the model with the below information?</h4>
             </div>
             <div class="modal-body">
-              <ng-include src="'/pages/rules/confirmation-an.html'"/>
+              <ng-include src="'/pages/measures/confirmation-an.html'"/>
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
diff --git a/ui/pages/rules/createrule-pu.html b/ui/pages/measures/createrule-pu.html
similarity index 92%
rename from ui/pages/rules/createrule-pu.html
rename to ui/pages/measures/createrule-pu.html
index 2d767f437..893250800 100644
--- a/ui/pages/rules/createrule-pu.html
+++ b/ui/pages/measures/createrule-pu.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,7 +68,7 @@ <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
                       </label>
 
                       <div class="col-md-10 col-lg-10 col-sm-10 ">
-                        <input type="text" class="form-control" ng-model="form.basic.name" name="ruleName" placeholder="Please input the rule name" required ng-pattern="'([0-9a-zA-Z\\_\\-])+'">
+                        <input type="text" class="form-control" ng-model="form.basic.name" name="ruleName" placeholder="Please input the measure name" required ng-pattern="'([0-9a-zA-Z\\_\\-])+'">
                         <span class="error text-small block " ng-if="Form.ruleName.$dirty && Form.ruleName.$error.required">Model Name is required</span>
                         <span class="error text-small block " ng-if="Form.ruleName.$dirty && Form.ruleName.$error.pattern">Only letter, number, "-" and "_" are allowed</span>
                       </div>
@@ -192,7 +213,9 @@ <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
 
                 <div class="createrule-hint">
                   <p>
-                    <i class="fa fa-info-circle"></i> After submitted, please go to "<a class="bark-link" href='#/rules'>Models</a>" to check the model status
+                    <i class="fa fa-info-circle"></i> After submitted, please go to "<a class="bark-link" href='#/measures
+
+'>Models</a>" to check the model status
                   </p>
                 </div>
 
@@ -217,7 +240,7 @@ <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
                 <h4 class="modal-title">Save the model with the below information?</h4>
               </div>
               <div class="modal-body">
-                <ng-include src="'/pages/rules/confirmation-pu.html'"/>
+                <ng-include src="'/pages/measures/confirmation-pu.html'"/>
               </div>
               <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
diff --git a/ui/pages/rules/createrule-va.html b/ui/pages/measures/createrule-va.html
similarity index 95%
rename from ui/pages/rules/createrule-va.html
rename to ui/pages/measures/createrule-va.html
index 7a6bf01a5..c58c56333 100644
--- a/ui/pages/rules/createrule-va.html
+++ b/ui/pages/measures/createrule-va.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
@@ -186,7 +207,7 @@ <h5>Advanced Statistics</h5>
                         </div>
                       </div>
                     </div>
-                    <div class="col-md-9 col-lg-9 col-sm-9" ng-include="'/pages/rules/va-explaination.html'">
+                    <div class="col-md-9 col-lg-9 col-sm-9" ng-include="'/pages/measures/va-explaination.html'">
                       <!-- <ng-include src="'/models.html'"/> -->
                     </div>
                   </div>
@@ -224,7 +245,7 @@ <h5>Advanced Statistics</h5>
                     </label>
 
                     <div class="col-md-10 col-lg-10 col-sm-10 ">
-                      <input type="text" class="form-control" ng-model="form.basic.name" name="ruleName" placeholder="Please input the rule name" required ng-pattern="'([0-9a-zA-Z\\_\\-])+'">
+                      <input type="text" class="form-control" ng-model="form.basic.name" name="ruleName" placeholder="Please input the measure name" required ng-pattern="'([0-9a-zA-Z\\_\\-])+'">
                       <span class="error text-small block " ng-if="Form.ruleName.$dirty && Form.ruleName.$error.required">Model Name is required</span>
                       <span class="error text-small block " ng-if="Form.ruleName.$dirty && Form.ruleName.$error.pattern">Only letter, number, "-" and "_" are allowed</span>
                     </div>
@@ -362,7 +383,7 @@ <h5>Advanced Statistics</h5>
 
               <div style="color:#b2c831">
                 <p>
-                  <i class="fa fa-info-circle"></i> After submitted, please go to "<a class="bark-link" href="#/rules">Models</a>" to check the model status
+                  <i class="fa fa-info-circle"></i> After submitted, please go to "<a class="bark-link" href="#/measures">Models</a>" to check the model status
                 </p>
               </div>
 
@@ -389,7 +410,7 @@ <h5>Advanced Statistics</h5>
               <h4 class="modal-title">Save the model with the below information?</h4>
             </div>
             <div class="modal-body">
-              <ng-include src="'/pages/rules/confirmation-va.html'"/>
+              <ng-include src="'/pages/measures/confirmation-va.html'"/>
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
diff --git a/ui/pages/rules/createrule0.html b/ui/pages/measures/createrule0.html
similarity index 94%
rename from ui/pages/rules/createrule0.html
rename to ui/pages/measures/createrule0.html
index 3e14f4865..60e6b188e 100644
--- a/ui/pages/rules/createrule0.html
+++ b/ui/pages/measures/createrule0.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/rules/delete-confirm.html b/ui/pages/measures/delete-confirm.html
similarity index 81%
rename from ui/pages/rules/delete-confirm.html
rename to ui/pages/measures/delete-confirm.html
index 682b050f3..e9ea7e8a9 100644
--- a/ui/pages/rules/delete-confirm.html
+++ b/ui/pages/measures/delete-confirm.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/rules/rule.css b/ui/pages/measures/measure.css
similarity index 90%
rename from ui/pages/rules/rule.css
rename to ui/pages/measures/measure.css
index e4df21563..a3ab69ab7 100644
--- a/ui/pages/rules/rule.css
+++ b/ui/pages/measures/measure.css
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/rules/rules.html b/ui/pages/measures/measures.html
similarity index 84%
rename from ui/pages/rules/rules.html
rename to ui/pages/measures/measures.html
index cd5a9087d..bc9a9969a 100644
--- a/ui/pages/rules/rules.html
+++ b/ui/pages/measures/measures.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +35,7 @@
  -->
 <div >
     <p>
-        <a class="btn btn-primary btn-o btn-wide" href="#/createrule0"><i class="fa fa-plus"></i> Create DQ Model</a>
+        <a class="btn btn-primary btn-o btn-wide" href="#/createrule0"><i class="fa fa-plus"></i> Create Measure</a>
     </p>
 
     <div id="modelContainer">
@@ -51,7 +72,7 @@
                 <td>{{row.organization}}</td>
                 <td>
                     &nbsp;
-                    <a ng-class="" href="" ng-click="remove(row)" title="delete">
+                    <a ng-class="" href="" ng-click="remove(row)" title="delete" style="text-decoration:none">
                         <i class="fa fa-trash-o"></i>
                     </a>
                     &nbsp;
@@ -89,7 +110,7 @@
                     <h4 class="modal-title">Delete the model with the below information?</h4>
                 </div>
                 <div class="modal-body">
-                    <ng-include src="'/pages/rules/delete-confirm.html'"/>
+                    <ng-include src="'/pages/measures/delete-confirm.html'"/>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-primary" ng-click="confirmDelete()">Yes</button>
diff --git a/ui/pages/rules/va-explaination.html b/ui/pages/measures/va-explaination.html
similarity index 96%
rename from ui/pages/rules/va-explaination.html
rename to ui/pages/measures/va-explaination.html
index 113161389..cd3876703 100644
--- a/ui/pages/rules/va-explaination.html
+++ b/ui/pages/measures/va-explaination.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/rules/viewrule.html b/ui/pages/measures/viewrule.html
similarity index 92%
rename from ui/pages/rules/viewrule.html
rename to ui/pages/measures/viewrule.html
index 3e7955c57..147d631a2 100644
--- a/ui/pages/rules/viewrule.html
+++ b/ui/pages/measures/viewrule.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/metrics/dashboard.html b/ui/pages/metrics/dashboard.html
index ad58627a6..1e165e399 100644
--- a/ui/pages/metrics/dashboard.html
+++ b/ui/pages/metrics/dashboard.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 The Apache Software Foundation
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/metrics/download-sample.html b/ui/pages/metrics/download-sample.html
index ea5998bcc..1cc4809fd 100644
--- a/ui/pages/metrics/download-sample.html
+++ b/ui/pages/metrics/download-sample.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/metrics/metrics.css b/ui/pages/metrics/metrics.css
index e41cea281..df3b55efc 100644
--- a/ui/pages/metrics/metrics.css
+++ b/ui/pages/metrics/metrics.css
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/mydashboard/confirmation-subscribe.html b/ui/pages/mydashboard/confirmation-subscribe.html
index d75d1acd1..02529d698 100644
--- a/ui/pages/mydashboard/confirmation-subscribe.html
+++ b/ui/pages/mydashboard/confirmation-subscribe.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/mydashboard/mydashboard.html b/ui/pages/mydashboard/mydashboard.html
index 4d669140b..2ef848565 100644
--- a/ui/pages/mydashboard/mydashboard.html
+++ b/ui/pages/mydashboard/mydashboard.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/mydashboard/subscribemodel.html b/ui/pages/mydashboard/subscribemodel.html
index 1831d8e8e..60410da47 100644
--- a/ui/pages/mydashboard/subscribemodel.html
+++ b/ui/pages/mydashboard/subscribemodel.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/template/bigchart.css b/ui/pages/template/bigchart.css
index 755180a3b..0d34740d0 100644
--- a/ui/pages/template/bigchart.css
+++ b/ui/pages/template/bigchart.css
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/template/bigchart.html b/ui/pages/template/bigchart.html
index ab7da14cc..2b63203d4 100644
--- a/ui/pages/template/bigchart.html
+++ b/ui/pages/template/bigchart.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/pages/template/undercons.html b/ui/pages/template/undercons.html
index 349ed244f..7e2c90371 100644
--- a/ui/pages/template/undercons.html
+++ b/ui/pages/template/undercons.html
@@ -1,3 +1,24 @@
+<!--
+  #%L
+  Apache Griffin
+$Id:$
+$HeadURL:$
+  %%
+  Copyright (C) 2017 Apache
+  %%
+  Licensed 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 language governing permissions and
+limitations under the License.
+  #L%
+  -->
 <!--
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/karma.conf.js b/ui/tests/ut/karma.conf.js
index 4f8a5e1cb..d216e06e4 100644
--- a/ui/tests/ut/karma.conf.js
+++ b/ui/tests/ut/karma.conf.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/controllers/createjob-ac-ctrl.spec.js b/ui/tests/ut/specs/controllers/createjob-ac-ctrl.spec.js
new file mode 100644
index 000000000..d630561ce
--- /dev/null
+++ b/ui/tests/ut/specs/controllers/createjob-ac-ctrl.spec.js
@@ -0,0 +1,43 @@
+define(['angular', 'angularMocks', 'js/controllers/createjob-ac-ctrl'],
+  function(angular, mocks, CreateJobACCtrl) {
+    describe('Test /js/controllers/createjob-ac-ctrl.js', function(){
+      	beforeEach(function(){
+	        module('app.controllers');
+	        module('app.services');
+      	});
+    	var $scope, $rootScope, $controller, $httpBackend, $config, $location, toaster, $timeout, $route;
+
+	    beforeEach(inject(function(_$rootScope_ , _$controller_, _$httpBackend_, _$config_, _$location_, _$timeout_){
+	    	$rootScope = _$rootScope_;
+	    	$controller = _$controller_;
+	        $httpBackend = _$httpBackend_;
+	        $config = _$config_;
+	        $location = _$location_;
+	        $timeout = _$timeout_;
+	        toaster = {};
+	        $route = {};
+	    }));
+
+        beforeEach(function(){
+          	$scope =  $rootScope.$new();
+	        controller = $controller('CreateJobACCtrl', {$scope: $scope, $route: $route, toaster: toaster });
+        });
+
+        describe("if the controller of CreateJobACCtrl exists",function(){
+        	it('controller exists', function(){
+	          	expect(controller).toBeDefined();
+	        });
+        })
+
+        describe("check if createRowCollection",function(){
+
+	        it('createRowCollection', function(){
+	          	expect($scope.rowCollection).not.toEqual([]);
+	        });
+
+      	})
+
+
+    });
+  }
+)
\ No newline at end of file
diff --git a/ui/tests/ut/specs/controllers/createrule-ac-ctrl.spec.js b/ui/tests/ut/specs/controllers/createrule-ac-ctrl.spec.js
index bf34dcb02..83a9170db 100644
--- a/ui/tests/ut/specs/controllers/createrule-ac-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/createrule-ac-ctrl.spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/controllers/createrule-pu-ctrl.spec.js b/ui/tests/ut/specs/controllers/createrule-pu-ctrl.spec.js
index 9bf9af28b..d06281adc 100644
--- a/ui/tests/ut/specs/controllers/createrule-pu-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/createrule-pu-ctrl.spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/controllers/createrule-va-ctrl.spec.js b/ui/tests/ut/specs/controllers/createrule-va-ctrl.spec.js
index 990ef4e8e..12185b102 100644
--- a/ui/tests/ut/specs/controllers/createrule-va-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/createrule-va-ctrl.spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/controllers/createrule0-ctrl.spec.js b/ui/tests/ut/specs/controllers/createrule0-ctrl.spec.js
index 8df4af124..ca1c0c957 100644
--- a/ui/tests/ut/specs/controllers/createrule0-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/createrule0-ctrl.spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/controllers/health-ctrl.spec.js b/ui/tests/ut/specs/controllers/health-ctrl.spec.js
index b35e40ae7..5e5e10043 100644
--- a/ui/tests/ut/specs/controllers/health-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/health-ctrl.spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/controllers/job-ctrl.spec.js b/ui/tests/ut/specs/controllers/job-ctrl.spec.js
new file mode 100644
index 000000000..185800790
--- /dev/null
+++ b/ui/tests/ut/specs/controllers/job-ctrl.spec.js
@@ -0,0 +1,43 @@
+define(['angular', 'angularMocks', 'js/controllers/job-ctrl'],
+  function(angular, mocks, JobCtrl) {
+    describe('Test /js/controllers/job-ctrl.js', function(){
+      	beforeEach(function(){
+	        module('app.controllers');
+	        module('app.services');
+      	});
+    	var $scope, $rootScope, $controller, $httpBackend, $config, $location, toaster, $timeout, $route;
+
+	    beforeEach(inject(function(_$rootScope_ , _$controller_, _$httpBackend_, _$config_, _$location_, _$timeout_){
+	    	$rootScope = _$rootScope_;
+	    	$controller = _$controller_;
+	        $httpBackend = _$httpBackend_;
+	        $config = _$config_;
+	        $location = _$location_;
+	        $timeout = _$timeout_;
+	        toaster = {};
+	        $route = {};
+	    }));
+
+        beforeEach(function(){
+          	$scope =  $rootScope.$new();
+	        controller = $controller('JobCtrl', {$scope: $scope, $route: $route, toaster: toaster });
+        });
+
+        describe("if the controller of JobCtrl exists",function(){
+        	it('controller exists', function(){
+	          	expect(controller).toBeDefined();
+	        });
+        })
+
+        describe("check if createRowCollection",function(){
+
+	        it('createRowCollection', function(){
+	          	expect($scope.rowCollection).not.toEqual([]);
+	        });
+
+      	})
+
+
+    });
+  }
+)
\ No newline at end of file
diff --git a/ui/tests/ut/specs/controllers/metrics-ctrl.spec.js b/ui/tests/ut/specs/controllers/metrics-ctrl.spec.js
index 003610169..f584bc482 100644
--- a/ui/tests/ut/specs/controllers/metrics-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/metrics-ctrl.spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/controllers/nav-ctrl_spec.js b/ui/tests/ut/specs/controllers/nav-ctrl_spec.js
index b4549fb9f..cd71c0f5b 100644
--- a/ui/tests/ut/specs/controllers/nav-ctrl_spec.js
+++ b/ui/tests/ut/specs/controllers/nav-ctrl_spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/controllers/rule-ctrl.spec.js b/ui/tests/ut/specs/controllers/rule-ctrl.spec.js
index c5b0df8fc..d0f1c0920 100644
--- a/ui/tests/ut/specs/controllers/rule-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/rule-ctrl.spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/controllers/sidebar-ctrl_spec.js b/ui/tests/ut/specs/controllers/sidebar-ctrl_spec.js
index 5b5a9496d..5f8f5b413 100644
--- a/ui/tests/ut/specs/controllers/sidebar-ctrl_spec.js
+++ b/ui/tests/ut/specs/controllers/sidebar-ctrl_spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/controllers/viewrule-ctrl.spec.js b/ui/tests/ut/specs/controllers/viewrule-ctrl.spec.js
index 1aa3c61bd..88d90d619 100644
--- a/ui/tests/ut/specs/controllers/viewrule-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/viewrule-ctrl.spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/filters/strmap_spec.js b/ui/tests/ut/specs/filters/strmap_spec.js
index a2bbee006..f454919d2 100644
--- a/ui/tests/ut/specs/filters/strmap_spec.js
+++ b/ui/tests/ut/specs/filters/strmap_spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/filters/strshorten_spec.js b/ui/tests/ut/specs/filters/strshorten_spec.js
index e6ffa7d25..c2d512995 100644
--- a/ui/tests/ut/specs/filters/strshorten_spec.js
+++ b/ui/tests/ut/specs/filters/strshorten_spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/specs/services/services_spec.js b/ui/tests/ut/specs/services/services_spec.js
index 8709dc109..87f1ef3b7 100644
--- a/ui/tests/ut/specs/services/services_spec.js
+++ b/ui/tests/ut/specs/services/services_spec.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui/tests/ut/test-main.js b/ui/tests/ut/test-main.js
index ef3c9bb79..149c1e47d 100644
--- a/ui/tests/ut/test-main.js
+++ b/ui/tests/ut/test-main.js
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * Apache Griffin
+ * %%
+ * Copyright (C) 2017 Apache
+ * %%
+ * Licensed 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 language governing permissions and
+limitations under the License.
+ * #L%
+ */
 /*
 	Copyright (c) 2016 eBay Software Foundation.
 	Licensed under the Apache License, Version 2.0 (the "License");

From 68279f0936d24689a41a3b4e039ebbca9481e61a Mon Sep 17 00:00:00 2001
From: Chen <xiangrchen@lm-shc-16501061.corp.ebay.com>
Date: Wed, 31 May 2017 19:11:03 +0800
Subject: [PATCH 2/6] schedule instance state

---
 .../griffin/core/GriffinWebApplication.java   | 91 +++++++++++--------
 .../griffin/core/measure/DataConnector.java   | 12 ++-
 .../core/measure/MeasureController.java       |  6 ++
 .../griffin/core/measure/MeasureService.java  |  3 +
 .../core/measure/MeasureServiceImpl.java      | 16 +++-
 .../core/schedule/Repo/ScheduleStateRepo.java | 16 ++++
 .../griffin/core/schedule/ScheduleResult.java | 67 ++++++++++++++
 .../griffin/core/schedule/ScheduleState.java  | 81 +++++++++++++++++
 .../core/schedule/SchedulerController.java    | 25 ++++-
 .../griffin/core/schedule/SparkSubmitJob.java | 19 +++-
 .../src/main/resources/sparkJob.properties    |  3 +-
 11 files changed, 293 insertions(+), 46 deletions(-)
 create mode 100644 service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java
 create mode 100644 service/src/main/java/org/apache/griffin/core/schedule/ScheduleResult.java
 create mode 100644 service/src/main/java/org/apache/griffin/core/schedule/ScheduleState.java

diff --git a/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java b/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java
index b9d7eb69b..63bfd6293 100644
--- a/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java
+++ b/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java
@@ -1,62 +1,73 @@
 package org.apache.griffin.core;
 
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.griffin.core.common.SimpleCORSFilter;
+import org.apache.griffin.core.measure.DataConnector;
+import org.apache.griffin.core.measure.EvaluateRule;
+import org.apache.griffin.core.measure.Measure;
+import org.apache.griffin.core.measure.repo.DataConnectorRepo;
+import org.apache.griffin.core.measure.repo.EvaluateRuleRepo;
+import org.apache.griffin.core.measure.repo.MeasureRepo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 
+import java.util.HashMap;
+
 //import org.apache.griffin.core.measure.repo.ConnectorConfigRepo;
 
 @SpringBootApplication
-public class GriffinWebApplication/* implements CommandLineRunner*/{
+public class GriffinWebApplication implements CommandLineRunner {
     private static final Logger log = LoggerFactory.getLogger(GriffinWebApplication.class);
     public static void main(String[] args) {
         log.info("application start");
         SpringApplication.run(GriffinWebApplication.class, args);
     }
 
-//    @Autowired
-//    MeasureRepo measureRepo;
-//    @Autowired
-//    EvaluateRuleRepo evaluateRuleRepo;
-//    @Autowired
-//    DataConnectorRepo connectorRepo;
-//
-//    public void run(String... strings) throws Exception {
-//        HashMap<String,String> configMap1=new HashMap<>();
-//        configMap1.put("database","default");
-//        configMap1.put("table.name","test_data_src");
-//        HashMap<String,String> configMap2=new HashMap<>();
-//        configMap2.put("database","default");
-//        configMap2.put("table.name","test_data_tgt");
-//        String configJson1 = new ObjectMapper().writeValueAsString(configMap1);
-//        String configJson2 = new ObjectMapper().writeValueAsString(configMap2);
-//
-//        DataConnector source = new DataConnector(ConnectorType.HIVE, "1.2", configJson1);
-//        DataConnector target = new DataConnector(ConnectorType.HIVE, "1.2", configJson2);
-//
-//        String rules = "$source.uage > 100 AND $source.uid = $target.uid AND $source.uage + 12 = $target.uage + 10 + 2 AND $source.udes + 11 = $target.udes + 1 + 1";
-//
-//        EvaluateRule eRule = new EvaluateRule(1,rules);
-//
-//        Measure measure = new Measure("viewitem_hourly","bevssoj description", Measure.MearuseType.accuracy, "bullseye", source, target, eRule,"test1");
-//        measureRepo.save(measure);
-//
-//        DataConnector source2 = new DataConnector(ConnectorType.HIVE, "1.2", configJson1);
-//        DataConnector target2 = new DataConnector(ConnectorType.HIVE, "1.2", configJson2);
-//        EvaluateRule eRule2 = new EvaluateRule(1,rules);
-//        Measure measure2 = new Measure("search_hourly","test description", Measure.MearuseType.accuracy, "bullseye", source2, target2, eRule2,"test1");
-//        measureRepo.save(measure2);
-//
-//        DataConnector source3 = new DataConnector(ConnectorType.HIVE, "1.2", configJson1);
-//        DataConnector target3 = new DataConnector(ConnectorType.HIVE, "1.2", configJson2);
-//        EvaluateRule eRule3 = new EvaluateRule(1,rules);
-//        Measure measure3 = new Measure("buy_hourly","test_just_inthere description", Measure.MearuseType.accuracy, "bullseye", source3, target3, eRule3,"test1");
-//        measureRepo.save(measure3);
-//    }
+    @Autowired
+    MeasureRepo measureRepo;
+    @Autowired
+    EvaluateRuleRepo evaluateRuleRepo;
+    @Autowired
+    DataConnectorRepo connectorRepo;
+
+    public void run(String... strings) throws Exception {
+        HashMap<String,String> configMap1=new HashMap<>();
+        configMap1.put("database","default");
+        configMap1.put("table.name","test_data_src");
+        HashMap<String,String> configMap2=new HashMap<>();
+        configMap2.put("database","default");
+        configMap2.put("table.name","test_data_tgt");
+        String configJson1 = new ObjectMapper().writeValueAsString(configMap1);
+        String configJson2 = new ObjectMapper().writeValueAsString(configMap2);
+
+        DataConnector source = new DataConnector(DataConnector.ConnectorType.HIVE, "1.2", configJson1);
+        DataConnector target = new DataConnector(DataConnector.ConnectorType.HIVE, "1.2", configJson2);
+
+        String rules = "$source.uage > 100 AND $source.uid = $target.uid AND $source.uage + 12 = $target.uage + 10 + 2 AND $source.udes + 11 = $target.udes + 1 + 1";
+
+        EvaluateRule eRule = new EvaluateRule(1,rules);
+
+        Measure measure = new Measure("viewitem_hourly","bevssoj description", Measure.MearuseType.accuracy, "bullseye", source, target, eRule,"test1");
+        measureRepo.save(measure);
+
+        DataConnector source2 = new DataConnector(DataConnector.ConnectorType.HIVE, "1.2", configJson1);
+        DataConnector target2 = new DataConnector(DataConnector.ConnectorType.HIVE, "1.2", configJson2);
+        EvaluateRule eRule2 = new EvaluateRule(1,rules);
+        Measure measure2 = new Measure("search_hourly","test description", Measure.MearuseType.accuracy, "bullseye", source2, target2, eRule2,"test1");
+        measureRepo.save(measure2);
+
+        DataConnector source3 = new DataConnector(DataConnector.ConnectorType.HIVE, "1.2", configJson1);
+        DataConnector target3 = new DataConnector(DataConnector.ConnectorType.HIVE, "1.2", configJson2);
+        EvaluateRule eRule3 = new EvaluateRule(1,rules);
+        Measure measure3 = new Measure("buy_hourly","test_just_inthere description", Measure.MearuseType.accuracy, "bullseye", source3, target3, eRule3,"test1");
+        measureRepo.save(measure3);
+    }
 
     @Bean
     public SimpleCORSFilter simpleFilter() {
diff --git a/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java b/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
index 2dda4837c..bfeaa23b7 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
@@ -29,7 +29,15 @@ public enum ConnectorType {
     
     @Enumerated(EnumType.STRING)
     private ConnectorType type;
-    
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
     private String version;
 
     private String config;
@@ -55,6 +63,7 @@ public static Map<String,String> convertJonsToMap(String jsonString){
     }
 
     public Map<String,String> getConfigInMaps() {
+        if (this.configInMaps == null) this.configInMaps = convertJonsToMap(config);
         return configInMaps;
     }
 
@@ -64,6 +73,7 @@ public void setConfig(Map<String,String> configInMaps) throws JsonProcessingExce
     }
 
     public DataConnector() {
+        System.out.println();
     }
 
     public DataConnector(ConnectorType type,String version, Map<String,String> config){
diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java
index 661f72d5b..cc3f590b5 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java
@@ -7,6 +7,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 public class MeasureController {
     private static final Logger log = LoggerFactory.getLogger(MeasureController.class);
@@ -43,6 +45,10 @@ public GriffinOperationMessage updateMeasure(@RequestBody Measure measure) {
         return measureService.updateMeasure(measure);
     }
 
+    @RequestMapping("/measures/owner/{owner}")
+    public List<String> getAllMeasureNameOfOwner(@PathVariable("owner") String owner){
+        return measureService.getAllMeasureNameByOwner(owner);
+    }
 
     @RequestMapping(value = "/measures/add", method = RequestMethod.POST)
     @ResponseBody
diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureService.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureService.java
index a6d7b226a..1298fa72a 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/MeasureService.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureService.java
@@ -4,6 +4,8 @@
 import org.apache.griffin.core.util.GriffinOperationMessage;
 import org.springframework.web.bind.annotation.PathVariable;
 
+import java.util.List;
+
 public interface MeasureService {
 
     public Iterable<Measure> getAllMeasures();
@@ -20,6 +22,7 @@ public interface MeasureService {
 
     public GriffinOperationMessage updateMeasure(Measure measure);
 
+    public List<String> getAllMeasureNameByOwner(String owner);
 
     public GriffinOperationMessage createNewMeasure(Measure measure);
 }
diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
index 2821f16de..2d483c689 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
@@ -7,7 +7,11 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 public class MeasureServiceImpl implements MeasureService{
@@ -57,6 +61,16 @@ public GriffinOperationMessage createNewMeasure(@RequestBody Measure measure) {
         }
     }
 
+    public List<String> getAllMeasureNameByOwner(String owner){
+        List<String> res=new ArrayList<String>();
+        for (Measure measure:measureRepo.findAll()){
+            if(measure.getOwner().equals(owner)){
+                res.add(measure.getName());
+            }
+        }
+        return res;
+    }
+
     public GriffinOperationMessage updateMeasure(@RequestBody Measure measure) {
 
         String name=measure.getName();
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java b/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java
new file mode 100644
index 000000000..5e7efd68a
--- /dev/null
+++ b/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java
@@ -0,0 +1,16 @@
+package org.apache.griffin.core.schedule.Repo;
+
+import org.apache.griffin.core.schedule.ScheduleState;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by xiangrchen on 5/31/17.
+ */
+@Repository
+public interface ScheduleStateRepo extends CrudRepository<ScheduleState,Long>{
+    @Query("select s from ScheduleState s " +
+            "where s.groupName= ?1 and s.jobName=?2")
+    Iterable<ScheduleState> findAllByGroupNameAndJobName(String group,String name);
+}
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/ScheduleResult.java b/service/src/main/java/org/apache/griffin/core/schedule/ScheduleResult.java
new file mode 100644
index 000000000..bb34efb42
--- /dev/null
+++ b/service/src/main/java/org/apache/griffin/core/schedule/ScheduleResult.java
@@ -0,0 +1,67 @@
+package org.apache.griffin.core.schedule;
+
+import com.google.gson.JsonObject;
+
+import java.util.ArrayList;
+
+/**
+ * Created by xiangrchen on 5/31/17.
+ */
+public class ScheduleResult {
+    long id;
+    String state;
+    String appId;
+    JsonObject appInfo;
+    ArrayList<JsonObject> log;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public JsonObject getAppInfo() {
+        return appInfo;
+    }
+
+    public void setAppInfo(JsonObject appInfo) {
+        this.appInfo = appInfo;
+    }
+
+    public ArrayList<JsonObject> getLog() {
+        return log;
+    }
+
+    public void setLog(ArrayList<JsonObject> log) {
+        this.log = log;
+    }
+
+    public ScheduleResult() {
+    }
+
+    public ScheduleResult(long id, String state, String appId, JsonObject appInfo, ArrayList<JsonObject> log) {
+        this.id = id;
+        this.state = state;
+        this.appId = appId;
+        this.appInfo = appInfo;
+        this.log = log;
+    }
+}
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/ScheduleState.java b/service/src/main/java/org/apache/griffin/core/schedule/ScheduleState.java
new file mode 100644
index 000000000..7357b2b1e
--- /dev/null
+++ b/service/src/main/java/org/apache/griffin/core/schedule/ScheduleState.java
@@ -0,0 +1,81 @@
+package org.apache.griffin.core.schedule;
+
+import org.apache.griffin.core.measure.AuditableEntity;
+
+import javax.persistence.Entity;
+
+/**
+ * Created by xiangrchen on 5/31/17.
+ */
+@Entity
+public class ScheduleState extends AuditableEntity {
+
+    private static final long serialVersionUID = -4748881017029815874L;
+
+    String groupName;
+    String jobName;
+    long scheduleid;
+    String state;
+    String appId;
+    long timestamp;
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getJobName() {
+        return jobName;
+    }
+
+    public void setJobName(String jobName) {
+        this.jobName = jobName;
+    }
+
+    public long getScheduleid() {
+        return scheduleid;
+    }
+
+    public void setScheduleid(long scheduleid) {
+        this.scheduleid = scheduleid;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public ScheduleState() {
+    }
+
+    public ScheduleState(String groupName, String jobName, long scheduleid, String state, String appId, long timestamp) {
+        this.groupName = groupName;
+        this.jobName = jobName;
+        this.scheduleid = scheduleid;
+        this.state = state;
+        this.appId = appId;
+        this.timestamp = timestamp;
+    }
+}
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
index 84b1da0dc..e639845c1 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
@@ -1,5 +1,6 @@
 package org.apache.griffin.core.schedule;
 
+import org.apache.griffin.core.schedule.Repo.ScheduleStateRepo;
 import org.quartz.*;
 import org.quartz.impl.matchers.GroupMatcher;
 import org.slf4j.Logger;
@@ -27,7 +28,8 @@ public class SchedulerController {
 
     @Autowired
     private SchedulerFactoryBean factory;
-
+    @Autowired
+    private ScheduleStateRepo scheduleStateRepo;
 
     public static final String ACCURACY_BATCH_GROUP = "BA";
 
@@ -52,12 +54,24 @@ public List<Map<String, Serializable>> jobs() throws SchedulerException,
                 if (triggers.size() > 0) {
                     //always get next run
                     Date nextFireTime = triggers.get(0).getNextFireTime();
+                    Date previousFireTime=triggers.get(0).getPreviousFireTime();
+//                    triggers.get(0).getScheduleBuilder()
+
+                    Trigger.TriggerState triggerState=scheduler.getTriggerState(triggers.get(0).getKey());
 
                     map.put("jobName", jobName);
                     map.put("groupName", jobGroup);
-                    map.put("nextFireTime", nextFireTime.toString());
+                    map.put("nextFireTime", nextFireTime.getTime());
+                    map.put("previousFireTime",previousFireTime.getTime());
+                    map.put("triggerState",triggerState);
 
                     map.put("measure", (String) jd.getJobDataMap().get("measure"));
+                    map.put("sourcePat",jd.getJobDataMap().getString("sourcePat"));
+                    map.put("targetPat",jd.getJobDataMap().getString("targetPat"));
+
+                    map.put("dataStartTimestamp",Long.parseLong(jd.getJobDataMap().getString("dataStartTimestamp")));
+                    map.put("jobStartTime",jd.getJobDataMap().getString("jobStartTime"));
+                    map.put("periodTime",jd.getJobDataMap().getString("periodTime"));
                     list.add(map);
                 }
 
@@ -112,6 +126,8 @@ public Boolean addTask(@PathVariable String groupName,
                 jobDetail.getJobDataMap().put("jobStartTime", schedulerRequestBody.getJobStartTime());
                 jobDetail.getJobDataMap().put("periodTime", schedulerRequestBody.getPeriodTime());
                 jobDetail.getJobDataMap().put("lastTime", "");
+                jobDetail.getJobDataMap().put("groupName",groupName);
+                jobDetail.getJobDataMap().put("jobName",jobName);
 
                 jobStartTime = Integer.parseInt(schedulerRequestBody.getJobStartTime());
                 periodTime = Integer.parseInt(schedulerRequestBody.getPeriodTime());
@@ -151,6 +167,11 @@ public boolean deleteJob(@PathVariable String group, @PathVariable String name)
             return false;
         }
     }
+
+    @RequestMapping("/instances/groups/{group}/jobs/{name}")
+    public Iterable<ScheduleState> findInstancesOfJob(@PathVariable String group,@PathVariable String name){
+        return scheduleStateRepo.findAllByGroupNameAndJobName(group,name);
+    }
 }
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java b/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
index 9ce3de79a..426c5c718 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
@@ -3,9 +3,11 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import com.google.gson.Gson;
 import org.apache.griffin.core.measure.DataConnector;
 import org.apache.griffin.core.measure.Measure;
 import org.apache.griffin.core.measure.repo.MeasureRepo;
+import org.apache.griffin.core.schedule.Repo.ScheduleStateRepo;
 import org.quartz.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,6 +28,9 @@ public class SparkSubmitJob implements Job {
     @Autowired
     MeasureRepo measureRepo;
 
+    @Autowired
+    ScheduleStateRepo scheduleStateRepo;
+
     Properties props;
 
     String patItem;
@@ -72,6 +77,8 @@ public SparkSubmitJob() throws IOException {
     @Override
     public void execute(JobExecutionContext context) {
         JobDetail jd = context.getJobDetail();
+        String groupName=jd.getJobDataMap().getString("groupName");
+        String jobName=jd.getJobDataMap().getString("jobName");
         String measureName = jd.getJobDataMap().getString("measure");
         measure = measureRepo.findByName(measureName);
         if (measure==null) {
@@ -102,9 +109,18 @@ public void execute(JobExecutionContext context) {
         //final String uri = "http://10.9.246.187:8998/batches";
         RestTemplate restTemplate = new RestTemplate();
         setSparkJobDO();
-
+//        String result = restTemplate.postForObject(uri, sparkJobDO, String.class);
         String result = restTemplate.postForObject(uri, sparkJobDO, String.class);
         logger.info(result);
+        ScheduleResult scheduleResult=new ScheduleResult();
+        Gson gson=new Gson();
+        try {
+            scheduleResult=gson.fromJson(result,ScheduleResult.class);
+        }catch (Exception e){
+            logger.info("scheduleResult covert error!"+e);
+        }
+        ScheduleState scheduleState=new ScheduleState(groupName,jobName,scheduleResult.getId(),scheduleResult.getState(),scheduleResult.getAppId(),System.currentTimeMillis());
+        scheduleStateRepo.save(scheduleState);
         //	{"file": "/exe/griffin-measure-batch-0.0.1-SNAPSHOT.jar", "className": "org.apache.griffin.measure.batch.Application", "args": ["/benchmark/test/env.json", "/benchmark/test/config-rdm.json"], "name": "griffin-livy", "queue": "default", "numExecutors": 2, "executorCores": 4, "driverMemory": "2g", "executorMemory": "2g", "conf": {"spark.jars.packages": "com.databricks:spark-avro_2.10:2.0.1"}, "jars": ["/livy/datanucleus-api-jdo-3.2.6.jar", "/livy/datanucleus-core-3.2.10.jar", "/livy/datanucleus-rdbms-3.2.9.jar"], "files": ["/livy/hive-site.xml"]}' -H "Content-Type: application/json"
     }
 
@@ -196,6 +212,7 @@ public void setSparkJobDO() {
 
         List<String> files = new ArrayList<>();
 //        files.add(props.getProperty("sparkJob.files_1"));
+
         sparkJobDO.setFiles(files);
     }
 
diff --git a/service/src/main/resources/sparkJob.properties b/service/src/main/resources/sparkJob.properties
index b6f9932f3..eba1b702f 100644
--- a/service/src/main/resources/sparkJob.properties
+++ b/service/src/main/resources/sparkJob.properties
@@ -13,4 +13,5 @@ sparkJob.jars_1=hdfs:///livy/datanucleus-api-jdo-3.2.6.jar
 sparkJob.jars_2=hdfs:///livy/datanucleus-core-3.2.10.jar
 sparkJob.jars_3=hdfs:///livy/datanucleus-rdbms-3.2.9.jar
 sparkJob.dateAndHour=dt,hour
-sparkJob.uri=http://localhost:8998/batches
\ No newline at end of file
+#sparkJob.uri=http://localhost:8998/batches
+sparkJob.uri=http://10.9.246.187:8998/batches
\ No newline at end of file

From 097d5fb2f65d0a953818c2fb566dc5e4b3712daa Mon Sep 17 00:00:00 2001
From: Chen <xiangrchen@lm-shc-16501061.corp.ebay.com>
Date: Thu, 1 Jun 2017 10:46:47 +0800
Subject: [PATCH 3/6] add pageRequest to schedule instance

---
 .../griffin/core/schedule/Repo/ScheduleStateRepo.java  |  8 ++++++--
 .../griffin/core/schedule/SchedulerController.java     | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java b/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java
index 5e7efd68a..a04335330 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java
@@ -1,16 +1,20 @@
 package org.apache.griffin.core.schedule.Repo;
 
 import org.apache.griffin.core.schedule.ScheduleState;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * Created by xiangrchen on 5/31/17.
  */
 @Repository
 public interface ScheduleStateRepo extends CrudRepository<ScheduleState,Long>{
     @Query("select s from ScheduleState s " +
-            "where s.groupName= ?1 and s.jobName=?2")
-    Iterable<ScheduleState> findAllByGroupNameAndJobName(String group,String name);
+            "where s.groupName= ?1 and s.jobName=?2 "/*+
+            "order by s.timestamp desc"*/)
+    List<ScheduleState> findByGroupNameAndJobName(String group, String name, Pageable pageable);
 }
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
index e639845c1..417290057 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
@@ -6,6 +6,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 import org.springframework.web.bind.annotation.*;
 
@@ -168,9 +171,10 @@ public boolean deleteJob(@PathVariable String group, @PathVariable String name)
         }
     }
 
-    @RequestMapping("/instances/groups/{group}/jobs/{name}")
-    public Iterable<ScheduleState> findInstancesOfJob(@PathVariable String group,@PathVariable String name){
-        return scheduleStateRepo.findAllByGroupNameAndJobName(group,name);
+    @RequestMapping("/instances/groups/{group}/jobs/{name}/{page}/{size}")
+    public List<ScheduleState> findInstancesOfJob(@PathVariable String group,@PathVariable String name,@PathVariable int page,@PathVariable int size){
+        Pageable pageRequest=new PageRequest(page,size, Sort.Direction.DESC,"timestamp");
+        return scheduleStateRepo.findByGroupNameAndJobName(group,name,pageRequest);
     }
 }
 

From 5bb8e90c3eb487dced05a1441e92e697d8c064d6 Mon Sep 17 00:00:00 2001
From: Yang <xiaoryang@ebay.com>
Date: Thu, 1 Jun 2017 10:58:06 +0800
Subject: [PATCH 4/6] UI job

---
 .../griffin/core/GriffinWebApplication.java   | 15 ++++++++++
 .../griffin/core/common/SimpleCORSFilter.java | 28 +++++++++----------
 .../griffin/core/measure/AuditableEntity.java | 15 ++++++++++
 .../griffin/core/measure/DataConnector.java   | 15 ++++++++++
 .../griffin/core/measure/EvaluateRule.java    | 15 ++++++++++
 .../apache/griffin/core/measure/Measure.java  | 15 ++++++++++
 .../core/measure/MeasureController.java       | 15 ++++++++++
 .../griffin/core/measure/MeasureService.java  | 15 ++++++++++
 .../core/measure/MeasureServiceImpl.java      | 15 ++++++++++
 .../core/measure/repo/DataConnectorRepo.java  | 15 ++++++++++
 .../core/measure/repo/EvaluateRuleRepo.java   | 15 ++++++++++
 .../core/measure/repo/MeasureRepo.java        | 15 ++++++++++
 .../metastore/HiveMetastoreController.java    | 15 ++++++++++
 .../core/metastore/HiveMetastoreProxy.java    | 15 ++++++++++
 .../core/metastore/HiveMetastoreService.java  | 15 ++++++++++
 .../core/metastore/KafkaSchemaController.java | 15 ++++++++++
 .../core/metastore/KafkaSchemaService.java    | 15 ++++++++++
 .../griffin/core/metric/MetricController.java | 15 ++++++++++
 .../griffin/core/metric/MetricService.java    | 15 ++++++++++
 .../core/metric/MetricServiceImpl.java        | 15 ++++++++++
 .../AutowiringSpringBeanJobFactory.java       | 15 ++++++++++
 .../apache/griffin/core/schedule/Conf.java    | 15 ++++++++++
 .../core/schedule/SchedulerConfig.java        | 15 ++++++++++
 .../core/schedule/SchedulerController.java    | 15 ++++++++++
 .../core/schedule/SchedulerRequestBody.java   | 15 ++++++++++
 .../griffin/core/schedule/SparkJobDO.java     | 15 ++++++++++
 .../griffin/core/schedule/SparkSubmitJob.java | 15 ++++++++++
 .../core/service/GriffinController.java       | 15 ++++++++++
 .../apache/griffin/core/util/AvroUtil.java    | 15 ++++++++++
 .../core/util/GriffinOperationMessage.java    | 15 ++++++++++
 .../src/main/resources/application.properties |  4 +--
 .../measure/repo/MeasureControllerTest.java   | 15 ++++++++++
 .../core/measure/repo/MeasureRepoTest.java    | 15 ++++++++++
 .../HiveMetastoreControllerTest.java          | 15 ++++++++++
 .../metastore/HiveMetastoreServiceTests.java  | 15 ++++++++++
 .../metastore/KafkaSchemaControllerTest.java  | 15 ++++++++++
 .../core/metric/MetricControllerTest.java     | 15 ++++++++++
 .../core/schedule/SparkSubmitJobTest.java     | 15 ++++++++++
 .../core/service/GriffinControllerTest.java   | 15 ++++++++++
 ui/css/main.css                               | 25 +++++++++--------
 ui/css/sidebar.css                            | 28 +++++++++----------
 ui/css/treeview-check.css                     | 24 ++++++++--------
 ui/css/treeview.css                           | 24 ++++++++--------
 ui/js/controllers/bigChart-ctrl.js            | 21 +-------------
 ui/js/controllers/createrule-ac-ctrl.js       |  2 +-
 45 files changed, 624 insertions(+), 87 deletions(-)

diff --git a/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java b/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java
index b9d7eb69b..5fb055b4e 100644
--- a/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java
+++ b/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core;
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/common/SimpleCORSFilter.java b/service/src/main/java/org/apache/griffin/core/common/SimpleCORSFilter.java
index 64da4fb73..beeca2473 100644
--- a/service/src/main/java/org/apache/griffin/core/common/SimpleCORSFilter.java
+++ b/service/src/main/java/org/apache/griffin/core/common/SimpleCORSFilter.java
@@ -1,17 +1,17 @@
-/*
-   Copyright (c) 2016 eBay Software Foundation.
-   Licensed 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 language governing permissions and
-   limitations under the License.
-*/
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
 package org.apache.griffin.core.common;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
diff --git a/service/src/main/java/org/apache/griffin/core/measure/AuditableEntity.java b/service/src/main/java/org/apache/griffin/core/measure/AuditableEntity.java
index 47283c105..079c460fc 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/AuditableEntity.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/AuditableEntity.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.measure;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java b/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
index 2dda4837c..938277ed7 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.measure;
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/measure/EvaluateRule.java b/service/src/main/java/org/apache/griffin/core/measure/EvaluateRule.java
index 6565b6a0d..8428e3892 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/EvaluateRule.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/EvaluateRule.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 
 package org.apache.griffin.core.measure;
 
diff --git a/service/src/main/java/org/apache/griffin/core/measure/Measure.java b/service/src/main/java/org/apache/griffin/core/measure/Measure.java
index 3812065af..dad8caaaa 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/Measure.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/Measure.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.measure;
 
 import javax.persistence.*;
diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java
index 661f72d5b..c9b17db0e 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.measure;
 
 import org.apache.griffin.core.util.GriffinOperationMessage;
diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureService.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureService.java
index a6d7b226a..fb602cb1e 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/MeasureService.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureService.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.measure;
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
index 2821f16de..828513d5f 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.measure;
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/measure/repo/DataConnectorRepo.java b/service/src/main/java/org/apache/griffin/core/measure/repo/DataConnectorRepo.java
index fa50d0cba..fcfc46f37 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/repo/DataConnectorRepo.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/repo/DataConnectorRepo.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.measure.repo;
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/measure/repo/EvaluateRuleRepo.java b/service/src/main/java/org/apache/griffin/core/measure/repo/EvaluateRuleRepo.java
index fd659cef1..45915bd68 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/repo/EvaluateRuleRepo.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/repo/EvaluateRuleRepo.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.measure.repo;
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java b/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java
index b1b0c7f7f..5bc84a46e 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.measure.repo;
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreController.java b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreController.java
index 3b035e9d6..85a2d36ed 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreController.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreController.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metastore;
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreProxy.java b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreProxy.java
index 6454b1790..185bc2bc4 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreProxy.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreProxy.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metastore;
 
 import org.apache.hadoop.hive.conf.HiveConf;
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreService.java b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreService.java
index 856959b8e..c907b45ff 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreService.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreService.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metastore;
 
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaController.java b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaController.java
index 14915186b..f4ae18de0 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaController.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaController.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metastore;
 
 import io.confluent.kafka.schemaregistry.client.rest.entities.Config;
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaService.java b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaService.java
index 211331282..fc1e69308 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaService.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaService.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metastore;
 
 import io.confluent.kafka.schemaregistry.client.rest.entities.Config;
diff --git a/service/src/main/java/org/apache/griffin/core/metric/MetricController.java b/service/src/main/java/org/apache/griffin/core/metric/MetricController.java
index f29aa02b8..30741fb73 100644
--- a/service/src/main/java/org/apache/griffin/core/metric/MetricController.java
+++ b/service/src/main/java/org/apache/griffin/core/metric/MetricController.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metric;
 
 import org.slf4j.Logger;
diff --git a/service/src/main/java/org/apache/griffin/core/metric/MetricService.java b/service/src/main/java/org/apache/griffin/core/metric/MetricService.java
index 17a4a9fc8..02cc1dd65 100644
--- a/service/src/main/java/org/apache/griffin/core/metric/MetricService.java
+++ b/service/src/main/java/org/apache/griffin/core/metric/MetricService.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metric;
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java b/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java
index 7c103c95d..3c390a146 100644
--- a/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metric;
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/AutowiringSpringBeanJobFactory.java b/service/src/main/java/org/apache/griffin/core/schedule/AutowiringSpringBeanJobFactory.java
index 8e1038402..6da6a4579 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/AutowiringSpringBeanJobFactory.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/AutowiringSpringBeanJobFactory.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.schedule;
 
 import org.quartz.spi.TriggerFiredBundle;
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/Conf.java b/service/src/main/java/org/apache/griffin/core/schedule/Conf.java
index 4ccd6fd01..3f308926c 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/Conf.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/Conf.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.schedule;
 
 /**
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerConfig.java b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerConfig.java
index 916b10435..113225467 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerConfig.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerConfig.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.schedule;
 
 import org.quartz.spi.JobFactory;
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
index 84b1da0dc..8b1fa9318 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.schedule;
 
 import org.quartz.*;
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerRequestBody.java b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerRequestBody.java
index 354bf0840..d33472f15 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerRequestBody.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerRequestBody.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.schedule;
 
 /**
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SparkJobDO.java b/service/src/main/java/org/apache/griffin/core/schedule/SparkJobDO.java
index 65f7f4122..a06d70bd0 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SparkJobDO.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SparkJobDO.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.schedule;
 
 import java.io.Serializable;
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java b/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
index 9ce3de79a..09b760b5d 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.schedule;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/service/src/main/java/org/apache/griffin/core/service/GriffinController.java b/service/src/main/java/org/apache/griffin/core/service/GriffinController.java
index d6e441207..f7d291fc2 100644
--- a/service/src/main/java/org/apache/griffin/core/service/GriffinController.java
+++ b/service/src/main/java/org/apache/griffin/core/service/GriffinController.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.service;
 
 
diff --git a/service/src/main/java/org/apache/griffin/core/util/AvroUtil.java b/service/src/main/java/org/apache/griffin/core/util/AvroUtil.java
index fb944c5aa..3717ea717 100644
--- a/service/src/main/java/org/apache/griffin/core/util/AvroUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/AvroUtil.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.util;
 
 import org.apache.avro.Schema;
diff --git a/service/src/main/java/org/apache/griffin/core/util/GriffinOperationMessage.java b/service/src/main/java/org/apache/griffin/core/util/GriffinOperationMessage.java
index 61703b070..02759c2a2 100644
--- a/service/src/main/java/org/apache/griffin/core/util/GriffinOperationMessage.java
+++ b/service/src/main/java/org/apache/griffin/core/util/GriffinOperationMessage.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.util;
 
 
diff --git a/service/src/main/resources/application.properties b/service/src/main/resources/application.properties
index 39b643974..8c7130d79 100644
--- a/service/src/main/resources/application.properties
+++ b/service/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 spring.datasource.url= jdbc:mysql://localhost:3306/quartz?autoReconnect=true&useSSL=false
-spring.datasource.username =griffin
-spring.datasource.password =123456
+spring.datasource.username =root
+spring.datasource.password =root
 
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
diff --git a/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureControllerTest.java b/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureControllerTest.java
index 50d2432e2..b5ca9d01e 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureControllerTest.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.measure.repo;
 
 import org.apache.griffin.core.measure.*;
diff --git a/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureRepoTest.java b/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureRepoTest.java
index d2f5fc77d..ce5ab729f 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureRepoTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureRepoTest.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.measure.repo;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/service/src/test/java/org/apache/griffin/core/metastore/HiveMetastoreControllerTest.java b/service/src/test/java/org/apache/griffin/core/metastore/HiveMetastoreControllerTest.java
index 6c2534ec5..8151a3c6f 100644
--- a/service/src/test/java/org/apache/griffin/core/metastore/HiveMetastoreControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/metastore/HiveMetastoreControllerTest.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metastore;
 
 import org.junit.Before;
diff --git a/service/src/test/java/org/apache/griffin/core/metastore/HiveMetastoreServiceTests.java b/service/src/test/java/org/apache/griffin/core/metastore/HiveMetastoreServiceTests.java
index 154fd8f77..7444f098c 100644
--- a/service/src/test/java/org/apache/griffin/core/metastore/HiveMetastoreServiceTests.java
+++ b/service/src/test/java/org/apache/griffin/core/metastore/HiveMetastoreServiceTests.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metastore;
 
 import org.apache.hadoop.hive.conf.HiveConf;
diff --git a/service/src/test/java/org/apache/griffin/core/metastore/KafkaSchemaControllerTest.java b/service/src/test/java/org/apache/griffin/core/metastore/KafkaSchemaControllerTest.java
index fdc0fba0e..d50438bfd 100644
--- a/service/src/test/java/org/apache/griffin/core/metastore/KafkaSchemaControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/metastore/KafkaSchemaControllerTest.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metastore;
 
 import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaString;
diff --git a/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java b/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java
index 288b9801f..cb982c6b4 100644
--- a/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.metric;
 
 import org.junit.Before;
diff --git a/service/src/test/java/org/apache/griffin/core/schedule/SparkSubmitJobTest.java b/service/src/test/java/org/apache/griffin/core/schedule/SparkSubmitJobTest.java
index 2d5e61ac2..43e50ff05 100644
--- a/service/src/test/java/org/apache/griffin/core/schedule/SparkSubmitJobTest.java
+++ b/service/src/test/java/org/apache/griffin/core/schedule/SparkSubmitJobTest.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.schedule;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/service/src/test/java/org/apache/griffin/core/service/GriffinControllerTest.java b/service/src/test/java/org/apache/griffin/core/service/GriffinControllerTest.java
index d1a039ffe..8da2017be 100644
--- a/service/src/test/java/org/apache/griffin/core/service/GriffinControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/service/GriffinControllerTest.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package org.apache.griffin.core.service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/ui/css/main.css b/ui/css/main.css
index 745b48311..3458335ad 100644
--- a/ui/css/main.css
+++ b/ui/css/main.css
@@ -1,3 +1,5 @@
+
+
 /*!
  * BLOCKS - Responsive Dashboard Theme
  *
@@ -13,21 +15,20 @@
  * Designed and built based on Twitter Bootstrap.
  */
 
- /*
- 	Copyright (c) 2016 eBay Software Foundation.
- 	Licensed 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
+ /*-
+  * Licensed 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
+      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 language governing permissions and
- 	limitations under the License.
- */
+ 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 language governing permissions and
+ limitations under the License.
 
+  */
 /* COLOR REFERENCE
 - #1f1f1f (Background Color)
 - #3d3d3d (Dash-unit and half-unit Section)
diff --git a/ui/css/sidebar.css b/ui/css/sidebar.css
index abf44aee1..b089ca402 100644
--- a/ui/css/sidebar.css
+++ b/ui/css/sidebar.css
@@ -1,17 +1,17 @@
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
 /*side-bar start*/
 .sidebar-stat-center{
 	padding:10px 0;
diff --git a/ui/css/treeview-check.css b/ui/css/treeview-check.css
index 971b8748e..86550f9f6 100644
--- a/ui/css/treeview-check.css
+++ b/ui/css/treeview-check.css
@@ -1,17 +1,17 @@
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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
+/*-
+ * Licensed 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
+     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 language governing permissions and
-	limitations under the License.
-*/
+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 language governing permissions and
+limitations under the License.
+
+ */
 div[angular-treeviewcheck] {
   /* prevent user selection */
   -moz-user-select: -moz-none;
diff --git a/ui/css/treeview.css b/ui/css/treeview.css
index a5e4fbc81..ea138f644 100644
--- a/ui/css/treeview.css
+++ b/ui/css/treeview.css
@@ -1,17 +1,17 @@
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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
+/*-
+ * Licensed 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
+     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 language governing permissions and
-	limitations under the License.
-*/
+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 language governing permissions and
+limitations under the License.
+
+ */
 div[angular-treeview] {
   /* prevent user selection */
   -moz-user-select: -moz-none;
diff --git a/ui/js/controllers/bigChart-ctrl.js b/ui/js/controllers/bigChart-ctrl.js
index 56a506a06..398418593 100644
--- a/ui/js/controllers/bigChart-ctrl.js
+++ b/ui/js/controllers/bigChart-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,8 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+ */
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('BigChartCtrl', ['$scope', '$http', '$config', '$filter', '$timeout', '$compile', '$routeParams', '$barkChart', '$rootScope', function($scope, $http, $config, $filter, $timeout, $compile, $routeParams, $barkChart, $rootScope) {
diff --git a/ui/js/controllers/createrule-ac-ctrl.js b/ui/js/controllers/createrule-ac-ctrl.js
index f6fb91d00..b62fe543b 100644
--- a/ui/js/controllers/createrule-ac-ctrl.js
+++ b/ui/js/controllers/createrule-ac-ctrl.js
@@ -106,7 +106,7 @@ define(['./module'], function(controllers) {
 
             // $scope.schemaCollection = null;
             if (newValue) {
-                $http.get(schemaDefinitionUrl + '/table/' + newValue.name).success(function(data) {
+                $http.get(schemaDefinitionUrl+ '/' + newValue.parent[0].dbName+'/table/'+newValue.name).success(function(data) {
                 console.log(data);
                 $scope.schemaCollection = data.sd.cols;
                 console.log($scope.schemaCollection);

From d2c8d8e33db9bd43ced3f5867fb06b99d3cc5c92 Mon Sep 17 00:00:00 2001
From: Yang <xiaoryang@ebay.com>
Date: Thu, 1 Jun 2017 13:19:14 +0800
Subject: [PATCH 5/6] fix license issue

---
 .../griffin/core/schedule/ScheduleResult.java |  17 ++
 .../griffin/core/schedule/ScheduleState.java  |  16 ++
 service/src/main/resources/Init_quartz.sql    | 179 ------------------
 ui/index.html                                 |  27 +--
 ui/js/app.js                                  |  20 +-
 ui/js/bs.js                                   |  20 +-
 ui/js/controllers/createdataasset-ctrl.js     |  22 +--
 ui/js/controllers/createjob-ac-ctrl.js        |  16 ++
 ui/js/controllers/createjob0.js               |  16 ++
 ui/js/controllers/createrule-ac-ctrl.js       |  22 +--
 ui/js/controllers/createrule-an-ctrl.js       |  22 +--
 ui/js/controllers/createrule-pu-ctrl.js       |  22 +--
 ui/js/controllers/createrule-va-ctrl.js       |  22 +--
 ui/js/controllers/createrule0-ctrl.js         |  20 +-
 ui/js/controllers/dataassets-ctrl.js          |  22 +--
 ui/js/controllers/downloadSample-ctrl.js      |  22 +--
 ui/js/controllers/editdataasset-ctrl.js       |  22 +--
 ui/js/controllers/footer-ctrl.js              |  20 +-
 ui/js/controllers/health-ctrl.js              |  22 +--
 ui/js/controllers/index.js                    |  20 +-
 ui/js/controllers/job-ctrl.js                 |  16 ++
 ui/js/controllers/main-ctrl.js                |  22 +--
 ui/js/controllers/metrics-ctrl.js             |  22 +--
 ui/js/controllers/module.js                   |  20 +-
 ui/js/controllers/mydashboard-ctrl.js         |  22 +--
 ui/js/controllers/nav-ctrl.js                 |  20 +-
 ui/js/controllers/rule-ctrl.js                |  22 +--
 ui/js/controllers/sidebar-ctrl.js             |  22 +--
 ui/js/controllers/subscribemodel-ctrl.js      |  22 +--
 ui/js/controllers/viewrule-ctrl.js            |  22 +--
 ui/js/directives/bigchart.js                  |  20 +-
 ui/js/directives/index.js                     |  20 +-
 ui/js/directives/module.js                    |  20 +-
 ui/js/directives/treeview.js                  |   8 +-
 ui/js/filters/index.js                        |  20 +-
 ui/js/filters/module.js                       |  20 +-
 ui/js/filters/strmap.js                       |  20 +-
 ui/js/filters/strshorten.js                   |  20 +-
 ui/js/main.js                                 |  21 +-
 ui/js/routes.js                               |  22 +--
 ui/js/services/bark-chart.js                  |  20 +-
 ui/js/services/index.js                       |  20 +-
 ui/js/services/module.js                      |  20 +-
 ui/js/services/services.js                    |  21 +-
 ui/login/login.js                             |  29 +--
 .../dataassets/confirmation-dataasset.html    |  27 +--
 .../confirmation-delete-dataasset.html        |  26 +--
 ui/pages/dataassets/createdataasset.html      |  24 +--
 ui/pages/dataassets/dataassets.html           |  24 +--
 ui/pages/dataassets/editdataasset.html        |  26 +--
 ui/pages/health/health.html                   |  24 +--
 ui/pages/jobs/confirmation-ac.html            |  16 ++
 ui/pages/jobs/createjob-ac.html               |  16 ++
 ui/pages/jobs/createjob0.html                 |  16 ++
 ui/pages/jobs/delete-confirm.html             |  16 ++
 ui/pages/jobs/job.css                         |   0
 ui/pages/jobs/jobs.html                       |  16 ++
 ui/pages/measures/confirmation-ac.html        |  26 +--
 ui/pages/measures/confirmation-an.html        |  26 +--
 ui/pages/measures/confirmation-pu.html        |  26 +--
 ui/pages/measures/confirmation-va.html        |  26 +--
 ui/pages/measures/createrule-ac.html          |  26 +--
 ui/pages/measures/createrule-an.html          |  26 +--
 ui/pages/measures/createrule-pu.html          |  26 +--
 ui/pages/measures/createrule-va.html          |  26 +--
 ui/pages/measures/createrule0.html            |  26 +--
 ui/pages/measures/delete-confirm.html         |  26 +--
 ui/pages/measures/measure.css                 |  46 ++---
 ui/pages/measures/measures.html               |  24 +--
 ui/pages/measures/va-explaination.html        |  24 +--
 ui/pages/measures/viewrule.html               |  26 +--
 ui/pages/metrics/dashboard.html               |  24 +--
 ui/pages/metrics/download-sample.html         |  24 +--
 ui/pages/metrics/metrics.css                  |  39 ++--
 .../mydashboard/confirmation-subscribe.html   |  26 +--
 ui/pages/mydashboard/mydashboard.html         |  24 +--
 ui/pages/mydashboard/subscribemodel.html      |  24 +--
 ui/pages/template/bigchart.css                |  37 +---
 ui/pages/template/bigchart.html               |  24 +--
 ui/pages/template/undercons.html              |  24 +--
 ui/sidebar.html                               |  23 +--
 ui/src/main/java/jar/App.java                 |  15 ++
 ui/src/test/java/jar/AppTest.java             |  15 ++
 ui/tests/ut/karma.conf.js                     |  21 +-
 .../controllers/createjob-ac-ctrl.spec.js     |  15 ++
 .../controllers/createrule-ac-ctrl.spec.js    |  21 +-
 .../controllers/createrule-pu-ctrl.spec.js    |  21 +-
 .../controllers/createrule-va-ctrl.spec.js    |  21 +-
 .../controllers/createrule0-ctrl.spec.js      |  19 --
 .../ut/specs/controllers/health-ctrl.spec.js  |  19 --
 .../ut/specs/controllers/job-ctrl.spec.js     |  15 ++
 .../ut/specs/controllers/metrics-ctrl.spec.js |  19 --
 .../ut/specs/controllers/nav-ctrl_spec.js     |  19 --
 .../ut/specs/controllers/rule-ctrl.spec.js    |  19 --
 .../ut/specs/controllers/sidebar-ctrl_spec.js |  19 --
 .../specs/controllers/viewrule-ctrl.spec.js   |  19 --
 ui/tests/ut/specs/filters/strmap_spec.js      |  21 +-
 ui/tests/ut/specs/filters/strshorten_spec.js  |  19 --
 ui/tests/ut/specs/services/services_spec.js   |  19 --
 ui/tests/ut/test-main.js                      |  19 --
 100 files changed, 425 insertions(+), 1890 deletions(-)
 delete mode 100644 ui/pages/jobs/job.css

diff --git a/service/src/main/java/org/apache/griffin/core/schedule/ScheduleResult.java b/service/src/main/java/org/apache/griffin/core/schedule/ScheduleResult.java
index bb34efb42..d8622d6d3 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/ScheduleResult.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/ScheduleResult.java
@@ -1,3 +1,20 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
+
+
 package org.apache.griffin.core.schedule;
 
 import com.google.gson.JsonObject;
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/ScheduleState.java b/service/src/main/java/org/apache/griffin/core/schedule/ScheduleState.java
index 7357b2b1e..8279882ea 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/ScheduleState.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/ScheduleState.java
@@ -1,3 +1,19 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
+
 package org.apache.griffin.core.schedule;
 
 import org.apache.griffin.core.measure.AuditableEntity;
diff --git a/service/src/main/resources/Init_quartz.sql b/service/src/main/resources/Init_quartz.sql
index 6f3ee48a5..e69de29bb 100644
--- a/service/src/main/resources/Init_quartz.sql
+++ b/service/src/main/resources/Init_quartz.sql
@@ -1,179 +0,0 @@
-#
-# In your Quartz properties file, you'll need to set
-# org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-#
-#
-# By: Ron Cordell - roncordell
-#  I didn't see this anywhere, so I thought I'd post it here. This is the script from Quartz to create the tables in a MySQL database, modified to use INNODB instead of MYISAM.
-
-DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
-DROP TABLE IF EXISTS QRTZ_LOCKS;
-DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
-DROP TABLE IF EXISTS QRTZ_CALENDARS;
-
-CREATE TABLE QRTZ_JOB_DETAILS(
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  JOB_NAME VARCHAR(200) NOT NULL,
-  JOB_GROUP VARCHAR(200) NOT NULL,
-  DESCRIPTION VARCHAR(250) NULL,
-  JOB_CLASS_NAME VARCHAR(250) NOT NULL,
-  IS_DURABLE VARCHAR(1) NOT NULL,
-  IS_NONCONCURRENT VARCHAR(1) NOT NULL,
-  IS_UPDATE_DATA VARCHAR(1) NOT NULL,
-  REQUESTS_RECOVERY VARCHAR(1) NOT NULL,
-  JOB_DATA BLOB NULL,
-  PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP))
-  ENGINE=InnoDB;
-
-CREATE TABLE QRTZ_TRIGGERS (
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  TRIGGER_NAME VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP VARCHAR(200) NOT NULL,
-  JOB_NAME VARCHAR(200) NOT NULL,
-  JOB_GROUP VARCHAR(200) NOT NULL,
-  DESCRIPTION VARCHAR(250) NULL,
-  NEXT_FIRE_TIME BIGINT(13) NULL,
-  PREV_FIRE_TIME BIGINT(13) NULL,
-  PRIORITY INTEGER NULL,
-  TRIGGER_STATE VARCHAR(16) NOT NULL,
-  TRIGGER_TYPE VARCHAR(8) NOT NULL,
-  START_TIME BIGINT(13) NOT NULL,
-  END_TIME BIGINT(13) NULL,
-  CALENDAR_NAME VARCHAR(200) NULL,
-  MISFIRE_INSTR SMALLINT(2) NULL,
-  JOB_DATA BLOB NULL,
-  PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
-  FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
-  REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP))
-  ENGINE=InnoDB;
-
-CREATE TABLE QRTZ_SIMPLE_TRIGGERS (
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  TRIGGER_NAME VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP VARCHAR(200) NOT NULL,
-  REPEAT_COUNT BIGINT(7) NOT NULL,
-  REPEAT_INTERVAL BIGINT(12) NOT NULL,
-  TIMES_TRIGGERED BIGINT(10) NOT NULL,
-  PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
-  FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
-  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
-  ENGINE=InnoDB;
-
-CREATE TABLE QRTZ_CRON_TRIGGERS (
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  TRIGGER_NAME VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP VARCHAR(200) NOT NULL,
-  CRON_EXPRESSION VARCHAR(120) NOT NULL,
-  TIME_ZONE_ID VARCHAR(80),
-  PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
-  FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
-  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
-  ENGINE=InnoDB;
-
-CREATE TABLE QRTZ_SIMPROP_TRIGGERS
-(
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  TRIGGER_NAME VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP VARCHAR(200) NOT NULL,
-  STR_PROP_1 VARCHAR(512) NULL,
-  STR_PROP_2 VARCHAR(512) NULL,
-  STR_PROP_3 VARCHAR(512) NULL,
-  INT_PROP_1 INT NULL,
-  INT_PROP_2 INT NULL,
-  LONG_PROP_1 BIGINT NULL,
-  LONG_PROP_2 BIGINT NULL,
-  DEC_PROP_1 NUMERIC(13,4) NULL,
-  DEC_PROP_2 NUMERIC(13,4) NULL,
-  BOOL_PROP_1 VARCHAR(1) NULL,
-  BOOL_PROP_2 VARCHAR(1) NULL,
-  PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
-  FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
-  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
-  ENGINE=InnoDB;
-
-CREATE TABLE QRTZ_BLOB_TRIGGERS (
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  TRIGGER_NAME VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP VARCHAR(200) NOT NULL,
-  BLOB_DATA BLOB NULL,
-  PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
-  INDEX (SCHED_NAME,TRIGGER_NAME, TRIGGER_GROUP),
-  FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
-  REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
-  ENGINE=InnoDB;
-
-CREATE TABLE QRTZ_CALENDARS (
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  CALENDAR_NAME VARCHAR(200) NOT NULL,
-  CALENDAR BLOB NOT NULL,
-  PRIMARY KEY (SCHED_NAME,CALENDAR_NAME))
-  ENGINE=InnoDB;
-
-CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS (
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  TRIGGER_GROUP VARCHAR(200) NOT NULL,
-  PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP))
-  ENGINE=InnoDB;
-
-CREATE TABLE QRTZ_FIRED_TRIGGERS (
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  ENTRY_ID VARCHAR(95) NOT NULL,
-  TRIGGER_NAME VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP VARCHAR(200) NOT NULL,
-  INSTANCE_NAME VARCHAR(200) NOT NULL,
-  FIRED_TIME BIGINT(13) NOT NULL,
-  SCHED_TIME BIGINT(13) NOT NULL,
-  PRIORITY INTEGER NOT NULL,
-  STATE VARCHAR(16) NOT NULL,
-  JOB_NAME VARCHAR(200) NULL,
-  JOB_GROUP VARCHAR(200) NULL,
-  IS_NONCONCURRENT VARCHAR(1) NULL,
-  REQUESTS_RECOVERY VARCHAR(1) NULL,
-  PRIMARY KEY (SCHED_NAME,ENTRY_ID))
-  ENGINE=InnoDB;
-
-CREATE TABLE QRTZ_SCHEDULER_STATE (
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  INSTANCE_NAME VARCHAR(200) NOT NULL,
-  LAST_CHECKIN_TIME BIGINT(13) NOT NULL,
-  CHECKIN_INTERVAL BIGINT(13) NOT NULL,
-  PRIMARY KEY (SCHED_NAME,INSTANCE_NAME))
-  ENGINE=InnoDB;
-
-CREATE TABLE QRTZ_LOCKS (
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  LOCK_NAME VARCHAR(40) NOT NULL,
-  PRIMARY KEY (SCHED_NAME,LOCK_NAME))
-  ENGINE=InnoDB;
-
-CREATE INDEX IDX_QRTZ_J_REQ_RECOVERY ON QRTZ_JOB_DETAILS(SCHED_NAME,REQUESTS_RECOVERY);
-CREATE INDEX IDX_QRTZ_J_GRP ON QRTZ_JOB_DETAILS(SCHED_NAME,JOB_GROUP);
-
-CREATE INDEX IDX_QRTZ_T_J ON QRTZ_TRIGGERS(SCHED_NAME,JOB_NAME,JOB_GROUP);
-CREATE INDEX IDX_QRTZ_T_JG ON QRTZ_TRIGGERS(SCHED_NAME,JOB_GROUP);
-CREATE INDEX IDX_QRTZ_T_C ON QRTZ_TRIGGERS(SCHED_NAME,CALENDAR_NAME);
-CREATE INDEX IDX_QRTZ_T_G ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_GROUP);
-CREATE INDEX IDX_QRTZ_T_STATE ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_STATE);
-CREATE INDEX IDX_QRTZ_T_N_STATE ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_STATE);
-CREATE INDEX IDX_QRTZ_T_N_G_STATE ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_GROUP,TRIGGER_STATE);
-CREATE INDEX IDX_QRTZ_T_NEXT_FIRE_TIME ON QRTZ_TRIGGERS(SCHED_NAME,NEXT_FIRE_TIME);
-CREATE INDEX IDX_QRTZ_T_NFT_ST ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_STATE,NEXT_FIRE_TIME);
-CREATE INDEX IDX_QRTZ_T_NFT_MISFIRE ON QRTZ_TRIGGERS(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME);
-CREATE INDEX IDX_QRTZ_T_NFT_ST_MISFIRE ON QRTZ_TRIGGERS(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_STATE);
-CREATE INDEX IDX_QRTZ_T_NFT_ST_MISFIRE_GRP ON QRTZ_TRIGGERS(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_GROUP,TRIGGER_STATE);
-
-CREATE INDEX IDX_QRTZ_FT_TRIG_INST_NAME ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,INSTANCE_NAME);
-CREATE INDEX IDX_QRTZ_FT_INST_JOB_REQ_RCVRY ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,INSTANCE_NAME,REQUESTS_RECOVERY);
-CREATE INDEX IDX_QRTZ_FT_J_G ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,JOB_NAME,JOB_GROUP);
-CREATE INDEX IDX_QRTZ_FT_JG ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,JOB_GROUP);
-CREATE INDEX IDX_QRTZ_FT_T_G ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
-CREATE INDEX IDX_QRTZ_FT_TG ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,TRIGGER_GROUP);
-
-commit;
diff --git a/ui/index.html b/ui/index.html
index 6f79eb11b..ef45f0786 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -1,17 +1,18 @@
 <!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+  Licensed 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 language governing permissions and
+limitations under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en">
 
diff --git a/ui/js/app.js b/ui/js/app.js
index 03452f4f3..dae485710 100644
--- a/ui/js/app.js
+++ b/ui/js/app.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define([
     'angular',
     './controllers/index',
diff --git a/ui/js/bs.js b/ui/js/bs.js
index 0cd866e33..f2fdf7f2d 100644
--- a/ui/js/bs.js
+++ b/ui/js/bs.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define([
     'require',
     'jquery',
diff --git a/ui/js/controllers/createdataasset-ctrl.js b/ui/js/controllers/createdataasset-ctrl.js
index 1fa2a17f1..a92a8448d 100644
--- a/ui/js/controllers/createdataasset-ctrl.js
+++ b/ui/js/controllers/createdataasset-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function (controllers) {
     'use strict';
     controllers.controller('CreateDataAssetCtrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route', '$filter', function ($scope, $http, $config, $location, toaster, $timeout, $route, $filter) {
diff --git a/ui/js/controllers/createjob-ac-ctrl.js b/ui/js/controllers/createjob-ac-ctrl.js
index 428fcc4ea..a5e9620a4 100644
--- a/ui/js/controllers/createjob-ac-ctrl.js
+++ b/ui/js/controllers/createjob-ac-ctrl.js
@@ -1,3 +1,19 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
+
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('CreateJobACCtrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route', '$filter', function($scope, $http, $config, $location, toaster, $timeout, $route, $filter) {
diff --git a/ui/js/controllers/createjob0.js b/ui/js/controllers/createjob0.js
index a63f07414..7b3db39b4 100644
--- a/ui/js/controllers/createjob0.js
+++ b/ui/js/controllers/createjob0.js
@@ -1,3 +1,19 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
+
 define(['./module'], function (controllers) {
     'use strict';
     controllers.controller('CreateJob0Ctrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route',  function ($scope, $http, $config, $location, toaster, $timeout, $route) {
diff --git a/ui/js/controllers/createrule-ac-ctrl.js b/ui/js/controllers/createrule-ac-ctrl.js
index b62fe543b..79b918f5d 100644
--- a/ui/js/controllers/createrule-ac-ctrl.js
+++ b/ui/js/controllers/createrule-ac-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('CreateRuleACCtrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route', '$filter', function($scope, $http, $config, $location, toaster, $timeout, $route, $filter) {
diff --git a/ui/js/controllers/createrule-an-ctrl.js b/ui/js/controllers/createrule-an-ctrl.js
index 925f0f1d6..59282b619 100644
--- a/ui/js/controllers/createrule-an-ctrl.js
+++ b/ui/js/controllers/createrule-an-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('CreateRuleANCtrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route', '$filter', function($scope, $http, $config, $location, toaster, $timeout, $route, $filter) {
diff --git a/ui/js/controllers/createrule-pu-ctrl.js b/ui/js/controllers/createrule-pu-ctrl.js
index cc8a5e524..5d217d671 100644
--- a/ui/js/controllers/createrule-pu-ctrl.js
+++ b/ui/js/controllers/createrule-pu-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('CreateRulePUCtrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route', '$filter', function($scope, $http, $config, $location, toaster, $timeout, $route, $filter) {
diff --git a/ui/js/controllers/createrule-va-ctrl.js b/ui/js/controllers/createrule-va-ctrl.js
index 20cb7291a..16a30e32c 100644
--- a/ui/js/controllers/createrule-va-ctrl.js
+++ b/ui/js/controllers/createrule-va-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('CreateRuleVACtrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route', '$filter', function($scope, $http, $config, $location, toaster, $timeout, $route, $filter) {
diff --git a/ui/js/controllers/createrule0-ctrl.js b/ui/js/controllers/createrule0-ctrl.js
index be40e809e..8a954b332 100644
--- a/ui/js/controllers/createrule0-ctrl.js
+++ b/ui/js/controllers/createrule0-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define(['./module'], function (controllers) {
     'use strict';
     controllers.controller('CreateRule0Ctrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route',  function ($scope, $http, $config, $location, toaster, $timeout, $route) {
diff --git a/ui/js/controllers/dataassets-ctrl.js b/ui/js/controllers/dataassets-ctrl.js
index 897662878..d33fd36c1 100644
--- a/ui/js/controllers/dataassets-ctrl.js
+++ b/ui/js/controllers/dataassets-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function (controllers) {
     'use strict';
     controllers.controller('DataAssetsCtrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route', '$filter', function ($scope, $http, $config, $location, toaster, $timeout, $route, $filter) {
diff --git a/ui/js/controllers/downloadSample-ctrl.js b/ui/js/controllers/downloadSample-ctrl.js
index 1799673fb..290693fe3 100644
--- a/ui/js/controllers/downloadSample-ctrl.js
+++ b/ui/js/controllers/downloadSample-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('DownloadSampleCtrl', ['$scope', '$http', '$config', '$filter', '$timeout', '$compile', '$routeParams', '$barkChart', '$rootScope', function($scope, $http, $config, $filter, $timeout, $compile, $routeParams, $barkChart, $rootScope) {
diff --git a/ui/js/controllers/editdataasset-ctrl.js b/ui/js/controllers/editdataasset-ctrl.js
index 1c6ea9713..858d07fd3 100644
--- a/ui/js/controllers/editdataasset-ctrl.js
+++ b/ui/js/controllers/editdataasset-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function (controllers) {
     'use strict';
     controllers.controller('EditDataAssetCtrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route', '$routeParams', '$filter', function ($scope, $http, $config, $location, toaster, $timeout, $route, $routeParams, $filter) {
diff --git a/ui/js/controllers/footer-ctrl.js b/ui/js/controllers/footer-ctrl.js
index 923141c38..2788e9819 100644
--- a/ui/js/controllers/footer-ctrl.js
+++ b/ui/js/controllers/footer-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define(['./module'], function (controllers) {
     'use strict';
     controllers.controller('FooterCtrl', ['$scope', '$http', '$config', '$location', '$cookies', '$interval', function ($scope, $http, $config, $location, $cookies, $interval) {
diff --git a/ui/js/controllers/health-ctrl.js b/ui/js/controllers/health-ctrl.js
index 85e2c4c0b..fe3c90e20 100644
--- a/ui/js/controllers/health-ctrl.js
+++ b/ui/js/controllers/health-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-    Copyright (c) 2016 eBay Software Foundation.
-    Licensed 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 language governing permissions and
-    limitations under the License.
-*/
+
 define(['./module'], function (controllers) {
     'use strict';
     controllers.controller('HealthCtrl', ['$scope', '$http', '$config', '$location','$timeout', '$route', '$barkChart', '$rootScope', function ($scope, $http, $config, $location, $timeout, $route, $barkChart, $rootScope) {
diff --git a/ui/js/controllers/index.js b/ui/js/controllers/index.js
index 8d6083eb6..84de409b0 100644
--- a/ui/js/controllers/index.js
+++ b/ui/js/controllers/index.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 
 define([
     './nav-ctrl',
diff --git a/ui/js/controllers/job-ctrl.js b/ui/js/controllers/job-ctrl.js
index 8ac03a64a..d739fb89e 100644
--- a/ui/js/controllers/job-ctrl.js
+++ b/ui/js/controllers/job-ctrl.js
@@ -1,3 +1,19 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
+
 define(['./module'], function (controllers) {
     'use strict';
     controllers.controller('JobCtrl', ['$scope', '$http', '$config', '$location', '$timeout', '$route', 'toaster', '$filter', function ($scope, $http, $config, $location, $timeout, $route, toaster, $filter) {
diff --git a/ui/js/controllers/main-ctrl.js b/ui/js/controllers/main-ctrl.js
index 95dcf1050..f7ca72a15 100644
--- a/ui/js/controllers/main-ctrl.js
+++ b/ui/js/controllers/main-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('MainCtrl', ['$scope', '$http', '$config', '$location', '$routeParams', '$timeout', '$compile', '$route', '$barkChart', '$rootScope', function($scope, $http, $config, $location, $routeParams, $timeout, $compile, $route, $barkChart, $rootScope) {
diff --git a/ui/js/controllers/metrics-ctrl.js b/ui/js/controllers/metrics-ctrl.js
index 1c4e5acd7..463735825 100644
--- a/ui/js/controllers/metrics-ctrl.js
+++ b/ui/js/controllers/metrics-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-  Copyright (c) 2016 eBay Software Foundation.
-  Licensed 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 language governing permissions and
-  limitations under the License.
-*/
+
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('MetricsCtrl', ['$scope', '$http', '$config', '$location', '$routeParams', '$timeout', '$compile', '$route', '$barkChart', '$rootScope',function($scope, $http, $config, $location, $routeParams, $timeout, $compile, $route, $barkChart, $rootScope) {
diff --git a/ui/js/controllers/module.js b/ui/js/controllers/module.js
index 2673b29e6..fbd571a81 100644
--- a/ui/js/controllers/module.js
+++ b/ui/js/controllers/module.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define(['angular'], function (ng) {
     'use strict';
     return ng.module('app.controllers', []);
diff --git a/ui/js/controllers/mydashboard-ctrl.js b/ui/js/controllers/mydashboard-ctrl.js
index 606f9f838..b258f3f07 100644
--- a/ui/js/controllers/mydashboard-ctrl.js
+++ b/ui/js/controllers/mydashboard-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('MyDashboardCtrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route', '$filter', '$compile', '$barkChart', '$rootScope', function($scope, $http, $config, $location, toaster, $timeout, $route, $filter, $compile, $barkChart, $rootScope) {
diff --git a/ui/js/controllers/nav-ctrl.js b/ui/js/controllers/nav-ctrl.js
index a3aabd2ec..1ccac1809 100644
--- a/ui/js/controllers/nav-ctrl.js
+++ b/ui/js/controllers/nav-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define(['./module'], function (controllers) {
     'use strict';
     controllers.controller('NavCtrl', ['$scope', '$http', '$config', '$location', '$cookies', '$rootScope', '$timeout', function ($scope, $http, $config, $location, $cookies, $rootScope, $timeout) {
diff --git a/ui/js/controllers/rule-ctrl.js b/ui/js/controllers/rule-ctrl.js
index 8d73ea139..2f4085520 100644
--- a/ui/js/controllers/rule-ctrl.js
+++ b/ui/js/controllers/rule-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function (controllers) {
     'use strict';
     controllers.controller('RuleCtrl', ['$scope', '$http', '$config', '$location', '$timeout', '$route', 'toaster', '$filter', function ($scope, $http, $config, $location, $timeout, $route, toaster, $filter) {
diff --git a/ui/js/controllers/sidebar-ctrl.js b/ui/js/controllers/sidebar-ctrl.js
index c613274e1..e048ed3b8 100644
--- a/ui/js/controllers/sidebar-ctrl.js
+++ b/ui/js/controllers/sidebar-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-  Copyright (c) 2016 eBay Software Foundation.
-  Licensed 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 language governing permissions and
-  limitations under the License.
-*/
+
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('SideBarCtrl', ['$scope', '$http', '$config', '$filter', '$timeout', '$compile', '$routeParams', '$barkChart', '$rootScope', function($scope, $http, $config, $filter, $timeout, $compile, $routeParams, $barkChart, $rootScope) {
diff --git a/ui/js/controllers/subscribemodel-ctrl.js b/ui/js/controllers/subscribemodel-ctrl.js
index b645ebcd8..1a3a001c9 100644
--- a/ui/js/controllers/subscribemodel-ctrl.js
+++ b/ui/js/controllers/subscribemodel-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function(controllers) {
     'use strict';
     controllers.controller('SubscribeModelCtrl', ['$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$route', '$filter', function($scope, $http, $config, $location, toaster, $timeout, $route, $filter) {
diff --git a/ui/js/controllers/viewrule-ctrl.js b/ui/js/controllers/viewrule-ctrl.js
index 2b66a7d84..42d2e017d 100644
--- a/ui/js/controllers/viewrule-ctrl.js
+++ b/ui/js/controllers/viewrule-ctrl.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./module'], function (controllers) {
     'use strict';
     controllers.controller('ViewRuleCtrl', ['$filter', '$scope', '$http', '$config', '$location', 'toaster', '$timeout', '$routeParams', '$barkChart', '$route',  function ($filter, $scope, $http, $config, $location, toaster, $timeout, $routeParams, $barkChart, $route) {
diff --git a/ui/js/directives/bigchart.js b/ui/js/directives/bigchart.js
index be5015303..4fccaf9c3 100644
--- a/ui/js/directives/bigchart.js
+++ b/ui/js/directives/bigchart.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define(['./module'], function (directives) {
     'use strict';
     directives.directive( 'bigChart', ['$compile', '$timeout', function( $compile, $timeout ) {
diff --git a/ui/js/directives/index.js b/ui/js/directives/index.js
index 915c0310f..94e8fe6cb 100644
--- a/ui/js/directives/index.js
+++ b/ui/js/directives/index.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,20 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define(['./treeview', './bigchart'], function () {});
diff --git a/ui/js/directives/module.js b/ui/js/directives/module.js
index 16f2c409c..f5ac32b4c 100644
--- a/ui/js/directives/module.js
+++ b/ui/js/directives/module.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
+
 define(['angular'], function (ng) {
     'use strict';
     return ng.module('app.directives', []);
diff --git a/ui/js/directives/treeview.js b/ui/js/directives/treeview.js
index 0d2a618e8..1d0977017 100644
--- a/ui/js/directives/treeview.js
+++ b/ui/js/directives/treeview.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,8 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
+
 /*
   The MIT License (MIT)
 
diff --git a/ui/js/filters/index.js b/ui/js/filters/index.js
index 1f6f96ef1..3789392b6 100644
--- a/ui/js/filters/index.js
+++ b/ui/js/filters/index.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,20 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define([ './strshorten', './strmap'], function () {});
diff --git a/ui/js/filters/module.js b/ui/js/filters/module.js
index 9a731885a..c505ecc2e 100644
--- a/ui/js/filters/module.js
+++ b/ui/js/filters/module.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define(['angular'], function (ng) {
     'use strict';
     return ng.module('app.filters', []).config(
diff --git a/ui/js/filters/strmap.js b/ui/js/filters/strmap.js
index f5d77db5e..94190a545 100644
--- a/ui/js/filters/strmap.js
+++ b/ui/js/filters/strmap.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define(['./module'], function (filters) {
     'use strict';
     var constants = {
diff --git a/ui/js/filters/strshorten.js b/ui/js/filters/strshorten.js
index c5436e872..4bdb4b1eb 100644
--- a/ui/js/filters/strshorten.js
+++ b/ui/js/filters/strshorten.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define(['./module'], function (filters) {
     'use strict';
 
diff --git a/ui/js/main.js b/ui/js/main.js
index e16787618..a58015e41 100644
--- a/ui/js/main.js
+++ b/ui/js/main.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,8 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+ */
 
 //Reference: https://www.startersquad.com/blog/angularjs-requirejs/
 
diff --git a/ui/js/routes.js b/ui/js/routes.js
index 7843a4b98..943196e77 100644
--- a/ui/js/routes.js
+++ b/ui/js/routes.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
+
  */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+
 define(['./app'], function(app) {
     'use strict';
 
diff --git a/ui/js/services/bark-chart.js b/ui/js/services/bark-chart.js
index 19acbb285..85cc7aec5 100644
--- a/ui/js/services/bark-chart.js
+++ b/ui/js/services/bark-chart.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-  Copyright (c) 2016 eBay Software Foundation.
-  Licensed 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 language governing permissions and
-  limitations under the License.
-*/
 define(['./module'], function (services) {
   services.factory('$barkChart', function(){
 
diff --git a/ui/js/services/index.js b/ui/js/services/index.js
index 35b61c20e..df98854b5 100644
--- a/ui/js/services/index.js
+++ b/ui/js/services/index.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,20 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
 define(['./services', './bark-chart'], function () {});
diff --git a/ui/js/services/module.js b/ui/js/services/module.js
index 317ce3308..3e1f38a08 100644
--- a/ui/js/services/module.js
+++ b/ui/js/services/module.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,22 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
+
 define(['angular'], function (ng) {
     'use strict';
     return ng.module('app.services', []);
diff --git a/ui/js/services/services.js b/ui/js/services/services.js
index 7118a0a20..22ed7904e 100644
--- a/ui/js/services/services.js
+++ b/ui/js/services/services.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 The Apache Software Foundation
- * %%
  * Licensed 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
@@ -15,23 +10,9 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-  Copyright (c) 2016 eBay Software Foundation.
-  Licensed 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 language governing permissions and
-  limitations under the License.
-*/
 define(['./module'], function (services) {
     'use strict';
     //version
diff --git a/ui/login/login.js b/ui/login/login.js
index 11e54867c..5435ca5a0 100644
--- a/ui/login/login.js
+++ b/ui/login/login.js
@@ -1,17 +1,18 @@
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
-*/
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 
 $(document).ready(function() {
     $('input:eq(1)').keyup(function(evt){
diff --git a/ui/pages/dataassets/confirmation-dataasset.html b/ui/pages/dataassets/confirmation-dataasset.html
index b5c60a2d8..1d019dcd6 100644
--- a/ui/pages/dataassets/confirmation-dataasset.html
+++ b/ui/pages/dataassets/confirmation-dataasset.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,9 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
+
 <div class="container-fluid" id="viewruleContent" style="overflow:auto;">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Basic information</h5>
diff --git a/ui/pages/dataassets/confirmation-delete-dataasset.html b/ui/pages/dataassets/confirmation-delete-dataasset.html
index 969b47711..fd52ba8bf 100644
--- a/ui/pages/dataassets/confirmation-delete-dataasset.html
+++ b/ui/pages/dataassets/confirmation-delete-dataasset.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid" id="viewruleContent" style="overflow:auto;">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Basic information</h5>
diff --git a/ui/pages/dataassets/createdataasset.html b/ui/pages/dataassets/createdataasset.html
index 8f9870034..df5d3c0f4 100644
--- a/ui/pages/dataassets/createdataasset.html
+++ b/ui/pages/dataassets/createdataasset.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+-->
 <div class="container-fluid">
   <div class="row pageTitle">
     <h5 class="over-title margin-bottom-15">Register Data Asset</h5>
diff --git a/ui/pages/dataassets/dataassets.html b/ui/pages/dataassets/dataassets.html
index 491b8ba8f..79a3df26a 100644
--- a/ui/pages/dataassets/dataassets.html
+++ b/ui/pages/dataassets/dataassets.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+-->
 <div  class="bs-component" >
 	<p>
 		<!--<a class="btn btn-primary btn-o btn-wide" href="#/createdataasset"><i class="fa fa-plus"></i> Register Data Asset</a>-->
diff --git a/ui/pages/dataassets/editdataasset.html b/ui/pages/dataassets/editdataasset.html
index 9db6c2023..724eb9400 100644
--- a/ui/pages/dataassets/editdataasset.html
+++ b/ui/pages/dataassets/editdataasset.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Edit Data Asset</h5>
diff --git a/ui/pages/health/health.html b/ui/pages/health/health.html
index 664780c4e..3a72a11a0 100644
--- a/ui/pages/health/health.html
+++ b/ui/pages/health/health.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+-->
 <div class="bs-component">
   <ul class="nav nav-tabs ">
     <li class="active">
diff --git a/ui/pages/jobs/confirmation-ac.html b/ui/pages/jobs/confirmation-ac.html
index 329c0f9e3..b25435937 100644
--- a/ui/pages/jobs/confirmation-ac.html
+++ b/ui/pages/jobs/confirmation-ac.html
@@ -1,3 +1,19 @@
+<!--
+
+  Licensed 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 language governing permissions and
+limitations under the License.
+
+-->
+
 <div class="container-fluid" id="viewJobContent" style="overflow:auto;">
     <div class="row">
         <h5 class="over-title margin-bottom-15">Basic information</h5>
diff --git a/ui/pages/jobs/createjob-ac.html b/ui/pages/jobs/createjob-ac.html
index 78d865301..43242f543 100644
--- a/ui/pages/jobs/createjob-ac.html
+++ b/ui/pages/jobs/createjob-ac.html
@@ -1,3 +1,19 @@
+<!--
+
+  Licensed 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 language governing permissions and
+limitations under the License.
+
+-->
+
 <div class="container-fluid">
     <div class="row">
         <h5 class="over-title margin-bottom-15">Create Job</h5>
diff --git a/ui/pages/jobs/createjob0.html b/ui/pages/jobs/createjob0.html
index 566549bdf..ae5d510e4 100644
--- a/ui/pages/jobs/createjob0.html
+++ b/ui/pages/jobs/createjob0.html
@@ -1,3 +1,19 @@
+<!--
+
+  Licensed 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 language governing permissions and
+limitations under the License.
+
+-->
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/ui/pages/jobs/delete-confirm.html b/ui/pages/jobs/delete-confirm.html
index 8b09b4c9a..81d00da7a 100644
--- a/ui/pages/jobs/delete-confirm.html
+++ b/ui/pages/jobs/delete-confirm.html
@@ -1,3 +1,19 @@
+<!--
+
+  Licensed 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 language governing permissions and
+limitations under the License.
+
+-->
+
 <div class="container-fluid" id="deleteContent" style="overflow:auto;">
     <div class="row">
         <h5 class="over-title margin-bottom-15">Basic information</h5>
diff --git a/ui/pages/jobs/job.css b/ui/pages/jobs/job.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/pages/jobs/jobs.html b/ui/pages/jobs/jobs.html
index c26c55c02..cd2d68bec 100644
--- a/ui/pages/jobs/jobs.html
+++ b/ui/pages/jobs/jobs.html
@@ -1,3 +1,19 @@
+<!--
+
+  Licensed 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 language governing permissions and
+limitations under the License.
+
+-->
+
 <div >
     <p>
         <a class="btn btn-primary btn-o btn-wide" href="#/createjob-ac"><i class="fa fa-plus"></i> Create Job</a>
diff --git a/ui/pages/measures/confirmation-ac.html b/ui/pages/measures/confirmation-ac.html
index 8302bb2ec..7684604ca 100644
--- a/ui/pages/measures/confirmation-ac.html
+++ b/ui/pages/measures/confirmation-ac.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid" id="viewruleContent" style="overflow:auto;">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Basic information</h5>
diff --git a/ui/pages/measures/confirmation-an.html b/ui/pages/measures/confirmation-an.html
index 857f3eea8..98429fc9d 100644
--- a/ui/pages/measures/confirmation-an.html
+++ b/ui/pages/measures/confirmation-an.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid" id="viewruleContent" style="overflow:auto;">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Basic information</h5>
diff --git a/ui/pages/measures/confirmation-pu.html b/ui/pages/measures/confirmation-pu.html
index 6ef49c91a..17762cd46 100644
--- a/ui/pages/measures/confirmation-pu.html
+++ b/ui/pages/measures/confirmation-pu.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid" id="viewruleContent" style="overflow:auto;">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Basic information</h5>
diff --git a/ui/pages/measures/confirmation-va.html b/ui/pages/measures/confirmation-va.html
index 225274017..f700e64b0 100644
--- a/ui/pages/measures/confirmation-va.html
+++ b/ui/pages/measures/confirmation-va.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid" id="viewruleContent" style="overflow:auto;">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Basic information</h5>
diff --git a/ui/pages/measures/createrule-ac.html b/ui/pages/measures/createrule-ac.html
index 0055e89e7..1e278b692 100644
--- a/ui/pages/measures/createrule-ac.html
+++ b/ui/pages/measures/createrule-ac.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
diff --git a/ui/pages/measures/createrule-an.html b/ui/pages/measures/createrule-an.html
index 3af5b960c..dec4fda2c 100644
--- a/ui/pages/measures/createrule-an.html
+++ b/ui/pages/measures/createrule-an.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
diff --git a/ui/pages/measures/createrule-pu.html b/ui/pages/measures/createrule-pu.html
index 893250800..17ad15a6b 100644
--- a/ui/pages/measures/createrule-pu.html
+++ b/ui/pages/measures/createrule-pu.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
diff --git a/ui/pages/measures/createrule-va.html b/ui/pages/measures/createrule-va.html
index c58c56333..4bf1c9513 100644
--- a/ui/pages/measures/createrule-va.html
+++ b/ui/pages/measures/createrule-va.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
diff --git a/ui/pages/measures/createrule0.html b/ui/pages/measures/createrule0.html
index 60e6b188e..7d759c043 100644
--- a/ui/pages/measures/createrule0.html
+++ b/ui/pages/measures/createrule0.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid" id="main" >
   <div class="row">
     <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
diff --git a/ui/pages/measures/delete-confirm.html b/ui/pages/measures/delete-confirm.html
index e9ea7e8a9..6db3b0d6b 100644
--- a/ui/pages/measures/delete-confirm.html
+++ b/ui/pages/measures/delete-confirm.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid" id="deleteContent" style="overflow:auto;">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Basic information</h5>
diff --git a/ui/pages/measures/measure.css b/ui/pages/measures/measure.css
index a3ab69ab7..81844ac91 100644
--- a/ui/pages/measures/measure.css
+++ b/ui/pages/measures/measure.css
@@ -1,36 +1,18 @@
-/*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
- * Licensed 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 language governing permissions and
-limitations under the License.
- * #L%
- */
 /*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- */
+      Licensed 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 language governing permissions and
+    limitations under the License.
+
+
+*/
 .pagination > li > a{
   cursor:pointer;
 }
diff --git a/ui/pages/measures/measures.html b/ui/pages/measures/measures.html
index bc9a9969a..64c999a24 100644
--- a/ui/pages/measures/measures.html
+++ b/ui/pages/measures/measures.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+-->
 <div >
     <p>
         <a class="btn btn-primary btn-o btn-wide" href="#/createrule0"><i class="fa fa-plus"></i> Create Measure</a>
diff --git a/ui/pages/measures/va-explaination.html b/ui/pages/measures/va-explaination.html
index cd3876703..918e15f41 100644
--- a/ui/pages/measures/va-explaination.html
+++ b/ui/pages/measures/va-explaination.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+-->
 <!-- Simple Statistics -->
 	<!-- Null Count -->
 <div class="container-fluid" ng-show="form.vaType==2">
diff --git a/ui/pages/measures/viewrule.html b/ui/pages/measures/viewrule.html
index 147d631a2..859295904 100644
--- a/ui/pages/measures/viewrule.html
+++ b/ui/pages/measures/viewrule.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid" id="viewruleContent">
     <div class="row">
         <h5 class="over-title margin-bottom-15">View Model</h5>
diff --git a/ui/pages/metrics/dashboard.html b/ui/pages/metrics/dashboard.html
index 1e165e399..55dcd99a9 100644
--- a/ui/pages/metrics/dashboard.html
+++ b/ui/pages/metrics/dashboard.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 The Apache Software Foundation
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+-->
 <div id="dashboard" class="bs-component" >
 	<div  class="container-fluid">
 		<div class="row col-lg-12" style="margin-top: 15px;">
diff --git a/ui/pages/metrics/download-sample.html b/ui/pages/metrics/download-sample.html
index 1cc4809fd..a438182c3 100644
--- a/ui/pages/metrics/download-sample.html
+++ b/ui/pages/metrics/download-sample.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+-->
 <div class="container-fluid" id="viewsample-content" style="overflow:auto;">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Download sample</h5>
diff --git a/ui/pages/metrics/metrics.css b/ui/pages/metrics/metrics.css
index df3b55efc..8bd5adda6 100644
--- a/ui/pages/metrics/metrics.css
+++ b/ui/pages/metrics/metrics.css
@@ -1,36 +1,19 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
- * Licensed 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
+   Licensed 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
 
-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 language governing permissions and
-limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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
 
-	    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 language governing permissions and
+ limitations under the License.
+
+*/
 
-	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 language governing permissions and
-	limitations under the License.
- */
 .thumb-chart:hover{
     transform: scale(1.05, 1.05);
     box-shadow:  0 1px 2px 2px #ccc;
diff --git a/ui/pages/mydashboard/confirmation-subscribe.html b/ui/pages/mydashboard/confirmation-subscribe.html
index 02529d698..47c276eb3 100644
--- a/ui/pages/mydashboard/confirmation-subscribe.html
+++ b/ui/pages/mydashboard/confirmation-subscribe.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+
+-->
 <div class="container-fluid" id="viewruleContent" style="overflow:auto;">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Basic information</h5>
diff --git a/ui/pages/mydashboard/mydashboard.html b/ui/pages/mydashboard/mydashboard.html
index 2ef848565..14488ccc7 100644
--- a/ui/pages/mydashboard/mydashboard.html
+++ b/ui/pages/mydashboard/mydashboard.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+-->
 <div id="mydashboard" class="bs-component" >
 	<div  class="container-fluid">
 		<div class="row col-lg-12" style="margin-top: 15px;">
diff --git a/ui/pages/mydashboard/subscribemodel.html b/ui/pages/mydashboard/subscribemodel.html
index 60410da47..c4841bb42 100644
--- a/ui/pages/mydashboard/subscribemodel.html
+++ b/ui/pages/mydashboard/subscribemodel.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+-->
 <div class="container-fluid">
   <div class="row">
     <h5 class="over-title margin-bottom-15">Subscribe Models</h5>
diff --git a/ui/pages/template/bigchart.css b/ui/pages/template/bigchart.css
index 0d34740d0..b87939d39 100644
--- a/ui/pages/template/bigchart.css
+++ b/ui/pages/template/bigchart.css
@@ -1,36 +1,19 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
- * Licensed 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
+   Licensed 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
 
-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 language governing permissions and
-limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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
 
-	    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 language governing permissions and
+ limitations under the License.
 
-	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 language governing permissions and
-	limitations under the License.
  */
+
 .big-chart-container{
   z-index:1040;
   display:block;
diff --git a/ui/pages/template/bigchart.html b/ui/pages/template/bigchart.html
index 2b63203d4..34859f7df 100644
--- a/ui/pages/template/bigchart.html
+++ b/ui/pages/template/bigchart.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+-->
 <!-- <div id="bigChartShow" style="display: none;"> -->
 	
 <div id="bigChartContainer"  class="big-chart-container" style="display:none;">
diff --git a/ui/pages/template/undercons.html b/ui/pages/template/undercons.html
index 7e2c90371..e855a67f3 100644
--- a/ui/pages/template/undercons.html
+++ b/ui/pages/template/undercons.html
@@ -1,11 +1,5 @@
 <!--
-  #%L
-  Apache Griffin
-$Id:$
-$HeadURL:$
-  %%
-  Copyright (C) 2017 Apache
-  %%
+
   Licensed 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
@@ -17,22 +11,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  #L%
-  -->
-<!--
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
- -->
+-->
 <div style="height:400px;line-height:400px;text-align:center;width:100%;font-size:48px">
 	<img src="/img/construction.gif" style="max-height:120px;"/>
 	Under construction! Coming soon!
diff --git a/ui/sidebar.html b/ui/sidebar.html
index 189a81cc3..4b4f01146 100644
--- a/ui/sidebar.html
+++ b/ui/sidebar.html
@@ -1,17 +1,18 @@
 <!--
-    Copyright (c) 2016 eBay Software Foundation.
-    Licensed 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
+  Licensed 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
 
-    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 language governing permissions and
-    limitations under the License.
- -->
+     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 language governing permissions and
+limitations under the License.
+
+-->
 
 <div id="rightbar" ng-controller="SideBarCtrl" class="" style="background-color:#262626;">
 
diff --git a/ui/src/main/java/jar/App.java b/ui/src/main/java/jar/App.java
index 9772ca478..4e434a7cc 100644
--- a/ui/src/main/java/jar/App.java
+++ b/ui/src/main/java/jar/App.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package jar;
 
 /**
diff --git a/ui/src/test/java/jar/AppTest.java b/ui/src/test/java/jar/AppTest.java
index 4f2fe9498..7bfbb4f5d 100644
--- a/ui/src/test/java/jar/AppTest.java
+++ b/ui/src/test/java/jar/AppTest.java
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 package jar;
 
 import junit.framework.Test;
diff --git a/ui/tests/ut/karma.conf.js b/ui/tests/ut/karma.conf.js
index d216e06e4..2c8065527 100644
--- a/ui/tests/ut/karma.conf.js
+++ b/ui/tests/ut/karma.conf.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
+
  */
 // Karma configuration
 // Generated on Thu Apr 07 2016 15:02:00 GMT+0800 (China Standard Time)
diff --git a/ui/tests/ut/specs/controllers/createjob-ac-ctrl.spec.js b/ui/tests/ut/specs/controllers/createjob-ac-ctrl.spec.js
index d630561ce..bd729d7a3 100644
--- a/ui/tests/ut/specs/controllers/createjob-ac-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/createjob-ac-ctrl.spec.js
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 define(['angular', 'angularMocks', 'js/controllers/createjob-ac-ctrl'],
   function(angular, mocks, CreateJobACCtrl) {
     describe('Test /js/controllers/createjob-ac-ctrl.js', function(){
diff --git a/ui/tests/ut/specs/controllers/createrule-ac-ctrl.spec.js b/ui/tests/ut/specs/controllers/createrule-ac-ctrl.spec.js
index 83a9170db..17e61b302 100644
--- a/ui/tests/ut/specs/controllers/createrule-ac-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/createrule-ac-ctrl.spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
+
  */
 define(['angular', 'angularMocks', 'js/controllers/createrule-ac-ctrl'],
   function(angular, mocks, CreateRuleACCtrl) {
diff --git a/ui/tests/ut/specs/controllers/createrule-pu-ctrl.spec.js b/ui/tests/ut/specs/controllers/createrule-pu-ctrl.spec.js
index d06281adc..fce2a271c 100644
--- a/ui/tests/ut/specs/controllers/createrule-pu-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/createrule-pu-ctrl.spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
+
  */
 define(['angular', 'angularMocks', 'js/controllers/createrule-pu-ctrl'],
   function(angular, mocks, CreateRulePUCtrl) {
diff --git a/ui/tests/ut/specs/controllers/createrule-va-ctrl.spec.js b/ui/tests/ut/specs/controllers/createrule-va-ctrl.spec.js
index 12185b102..aa4a8e122 100644
--- a/ui/tests/ut/specs/controllers/createrule-va-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/createrule-va-ctrl.spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
+
  */
 define(['angular', 'angularMocks', 'js/controllers/createrule-va-ctrl'],
   function(angular, mocks, CreateRuleVACtrl) {
diff --git a/ui/tests/ut/specs/controllers/createrule0-ctrl.spec.js b/ui/tests/ut/specs/controllers/createrule0-ctrl.spec.js
index ca1c0c957..189a35432 100644
--- a/ui/tests/ut/specs/controllers/createrule0-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/createrule0-ctrl.spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
 define(['angular', 'angularMocks', 'js/controllers/createrule0-ctrl'],
   function(angular, mocks, CreateRule0Ctrl) {
diff --git a/ui/tests/ut/specs/controllers/health-ctrl.spec.js b/ui/tests/ut/specs/controllers/health-ctrl.spec.js
index 5e5e10043..12da7fb2f 100644
--- a/ui/tests/ut/specs/controllers/health-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/health-ctrl.spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
 define(['require', 'angular', 'angularMocks', 'js/controllers/health-ctrl', 'echarts'],
   function(require, angular, mocks, HealthCtrl) {
diff --git a/ui/tests/ut/specs/controllers/job-ctrl.spec.js b/ui/tests/ut/specs/controllers/job-ctrl.spec.js
index 185800790..53810aeca 100644
--- a/ui/tests/ut/specs/controllers/job-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/job-ctrl.spec.js
@@ -1,3 +1,18 @@
+/*-
+ * Licensed 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 language governing permissions and
+limitations under the License.
+
+ */
+
 define(['angular', 'angularMocks', 'js/controllers/job-ctrl'],
   function(angular, mocks, JobCtrl) {
     describe('Test /js/controllers/job-ctrl.js', function(){
diff --git a/ui/tests/ut/specs/controllers/metrics-ctrl.spec.js b/ui/tests/ut/specs/controllers/metrics-ctrl.spec.js
index f584bc482..00e921c74 100644
--- a/ui/tests/ut/specs/controllers/metrics-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/metrics-ctrl.spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
 define(['angular', 'angularMocks', 'js/controllers/metrics-ctrl'],
   function(angular, mocks, MetricsCtrl) {
diff --git a/ui/tests/ut/specs/controllers/nav-ctrl_spec.js b/ui/tests/ut/specs/controllers/nav-ctrl_spec.js
index cd71c0f5b..9cfebf1ca 100644
--- a/ui/tests/ut/specs/controllers/nav-ctrl_spec.js
+++ b/ui/tests/ut/specs/controllers/nav-ctrl_spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
 define(['angular', 'angularMocks', 'js/controllers/nav-ctrl'],
   function(angular, mocks, navCtrl) {
diff --git a/ui/tests/ut/specs/controllers/rule-ctrl.spec.js b/ui/tests/ut/specs/controllers/rule-ctrl.spec.js
index d0f1c0920..aa4654e65 100644
--- a/ui/tests/ut/specs/controllers/rule-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/rule-ctrl.spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
 define(['angular', 'angularMocks', 'js/controllers/rule-ctrl'],
   function(angular, mocks, RuleCtrl) {
diff --git a/ui/tests/ut/specs/controllers/sidebar-ctrl_spec.js b/ui/tests/ut/specs/controllers/sidebar-ctrl_spec.js
index 5f8f5b413..5502d6f37 100644
--- a/ui/tests/ut/specs/controllers/sidebar-ctrl_spec.js
+++ b/ui/tests/ut/specs/controllers/sidebar-ctrl_spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
 define(['angular', 'angularMocks', 'js/controllers/sidebar-ctrl'],
   function(angular, mocks, sidebarCtrl) {
diff --git a/ui/tests/ut/specs/controllers/viewrule-ctrl.spec.js b/ui/tests/ut/specs/controllers/viewrule-ctrl.spec.js
index 88d90d619..dd97413ff 100644
--- a/ui/tests/ut/specs/controllers/viewrule-ctrl.spec.js
+++ b/ui/tests/ut/specs/controllers/viewrule-ctrl.spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
 define(['angular', 'angularMocks', 'js/controllers/viewrule-ctrl'],
   function(angular, mocks, ViewRuleCtrl) {
diff --git a/ui/tests/ut/specs/filters/strmap_spec.js b/ui/tests/ut/specs/filters/strmap_spec.js
index f454919d2..3ae6ce09d 100644
--- a/ui/tests/ut/specs/filters/strmap_spec.js
+++ b/ui/tests/ut/specs/filters/strmap_spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
+
  */
 define(['angular', 'angularMocks', 'js/filters/strmap'],
   function(angular, mocks, filter) {
diff --git a/ui/tests/ut/specs/filters/strshorten_spec.js b/ui/tests/ut/specs/filters/strshorten_spec.js
index c2d512995..e4aa47231 100644
--- a/ui/tests/ut/specs/filters/strshorten_spec.js
+++ b/ui/tests/ut/specs/filters/strshorten_spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
 define(['angular', 'angularMocks', 'js/filters/strshorten'],
   function(angular, mocks, filter) {
diff --git a/ui/tests/ut/specs/services/services_spec.js b/ui/tests/ut/specs/services/services_spec.js
index 87f1ef3b7..e9b5df7aa 100644
--- a/ui/tests/ut/specs/services/services_spec.js
+++ b/ui/tests/ut/specs/services/services_spec.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
 define(['angular', 'angularMocks', 'js/services/services'],
   function(angular, mocks, filter) {
diff --git a/ui/tests/ut/test-main.js b/ui/tests/ut/test-main.js
index 149c1e47d..d6a332946 100644
--- a/ui/tests/ut/test-main.js
+++ b/ui/tests/ut/test-main.js
@@ -1,9 +1,4 @@
 /*-
- * #%L
- * Apache Griffin
- * %%
- * Copyright (C) 2017 Apache
- * %%
  * Licensed 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
@@ -15,21 +10,7 @@ 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 language governing permissions and
 limitations under the License.
- * #L%
- */
-/*
-	Copyright (c) 2016 eBay Software Foundation.
-	Licensed 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 language governing permissions and
-	limitations under the License.
  */
 //for demo purpose
 var allTestFiles = [];

From 091d92f6c3ebc9a072b5a00950362d37c2096a1b Mon Sep 17 00:00:00 2001
From: Yang <xiaoryang@ebay.com>
Date: Thu, 1 Jun 2017 14:14:01 +0800
Subject: [PATCH 6/6] fix some bugs

---
 .../src/main/resources/application.properties |   4 +-
 ui/js/services/services.js                    |   4 +-
 ui/pages/jobs/jobs.html                       |   8 +
 ui/pages/measures/createrule0.html            | 386 +++++++++---------
 ui/pages/measures/measure.css                 |   3 +-
 ui/pages/mydashboard/mydashboard.html         |   2 +-
 ui/pages/mydashboard/subscribemodel.html      |   2 +-
 7 files changed, 211 insertions(+), 198 deletions(-)

diff --git a/service/src/main/resources/application.properties b/service/src/main/resources/application.properties
index 8c7130d79..39b643974 100644
--- a/service/src/main/resources/application.properties
+++ b/service/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 spring.datasource.url= jdbc:mysql://localhost:3306/quartz?autoReconnect=true&useSSL=false
-spring.datasource.username =root
-spring.datasource.password =root
+spring.datasource.username =griffin
+spring.datasource.password =123456
 
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
diff --git a/ui/js/services/services.js b/ui/js/services/services.js
index 22ed7904e..709630172 100644
--- a/ui/js/services/services.js
+++ b/ui/js/services/services.js
@@ -22,8 +22,8 @@ define(['./module'], function (services) {
 
 
 //    var BACKEND_SERVER = 'http://10.149.247.156:38080';
-      var BACKEND_SERVER = 'http://localhost:8080';
-//      var BACKEND_SERVER = '';
+//      var BACKEND_SERVER = 'http://localhost:8080';
+      var BACKEND_SERVER = '';
       var API_ROOT_PATH = '/api/v1';
 
 //      var ES_SERVER = 'http://10.149.247.156:59200';
diff --git a/ui/pages/jobs/jobs.html b/ui/pages/jobs/jobs.html
index cd2d68bec..4f5b6ba0e 100644
--- a/ui/pages/jobs/jobs.html
+++ b/ui/pages/jobs/jobs.html
@@ -26,7 +26,11 @@
                 <th st-ratio="15">Job Name</th>
                 <th st-ratio="15">Source Partition</th>
                 <th st-ratio="15">Target Partition</th>
+                <th st-ratio="15">Previous Fire Time</th>
+
                 <th st-ratio="20">Next Fire Time</th>
+                <th st-ratio="15">Trigger State</th>
+
                 <th st-ratio="5">Interval</th>
                 <th st-ratio="5">Action</th>
             </tr>
@@ -39,7 +43,11 @@
                 <td>{{row.jobName}}</a></td>
                 <td>{{row.sourcePat}}</a></td>
                 <td>{{row.targetPat|strmap:'modeltype'}}</td>
+                <td>{{(row.previousFireTime | date: 'short':'-0700') || 'N/A' }}</td>
+
                 <td>{{(row.nextFireTime | date: 'short':'-0700') || 'N/A' }}</td>
+                <td>{{row.triggerState}}</td>
+
                 <td>{{row.periodTime}}</td>
                 <td>
                     &nbsp;
diff --git a/ui/pages/measures/createrule0.html b/ui/pages/measures/createrule0.html
index 7d759c043..f88402880 100644
--- a/ui/pages/measures/createrule0.html
+++ b/ui/pages/measures/createrule0.html
@@ -32,221 +32,225 @@ <h5 class="over-title margin-bottom-15">Create DQ Model</h5>
           <label class="label-definition">Definition: Measured by how the values agree with an identified source of truth</label>
 
           <ul style="border-radius:0; background: none">
-              <li >
-                <a href="" class="selected" >
-                  <div class="stepNumber">
-                    1
-                  </div>
-                  <span class="stepDesc text-small"> Choose Source </span>
-                </a>
-              </li>
-              <li>
-                <a href=""  >
-                  <div class="stepNumber">
-                    2
-                  </div>
-                  <span class="stepDesc text-small"> Choose Target </span>
-                </a>
-              </li>
-              <li >
-                <a href=""  >
-                  <div class="stepNumber">
-                    3
-                  </div>
-                  <span class="stepDesc text-small"> Mapping Source and Target </span>
-                </a>
-              </li>
-              <li>
-                <a href="" >
-                  <div class="stepNumber">
-                    4
-                  </div>
-                  <span class="stepDesc text-small"> Configuration </span>
-                </a>
-              </li>
-
-            </ul>
-            <div>
-
-              <ol>
-                <li>Select the source dataset and fields which will be used for comparision</li>
-                <li>Select the target dataset and fields which will be used for comparision</li>
-                <li>Mapping the target fields with source</li>
-                <li>Set basic configuration for your model (name, system, threshold, etc.)</li>
-              </ol>
-            </div>
+            <li >
+              <a href="" class="selected" >
+                <div class="stepNumber">
+                  1
+                </div>
+                <span class="stepDesc text-small"> Choose Source </span>
+              </a>
+            </li>
+            <li>
+              <a href=""  >
+                <div class="stepNumber">
+                  2
+                </div>
+                <span class="stepDesc text-small"> Choose Target </span>
+              </a>
+            </li>
+            <li >
+              <a href=""  >
+                <div class="stepNumber">
+                  3
+                </div>
+                <span class="stepDesc text-small"> Mapping Source and Target </span>
+              </a>
+            </li>
+            <li>
+              <a href="" >
+                <div class="stepNumber">
+                  4
+                </div>
+                <span class="stepDesc text-small"> Configuration </span>
+              </a>
+            </li>
+
+          </ul>
+          <div>
+
+            <ol>
+              <li>Select the source dataset and fields which will be used for comparision</li>
+              <li>Select the target dataset and fields which will be used for comparision</li>
+              <li>Mapping the target fields with source</li>
+              <li>Set basic configuration for your model (name, system, threshold, etc.)</li>
+            </ol>
+          </div>
 
 
-          </div>
-          <div class="panel-footer stepDesc">
-            <label>Example:</label> suppose source table A has 1000 records and target table B only has 999 records pefectly matched with A for selected fields, then
-            Accuracy Rate(%) = 999/1000 * 100% = 99.9%
-          </div>
-        </section>
-      </div>
-      <div class="col-lg-6 col-md-6 col-sm-6 ruletypes">
-        <section id="panel-2"  class="panel panel-primary"  ng-click="click('va')">
-          <div class="panel-heading">
-            <span style="font-size:20px">Data Profiling</span>
-            <span class="pull-right" style="font-size:20px">
+        </div>
+        <div class="panel-footer stepDesc">
+          <label>Example:</label> suppose source table A has 1000 records and target table B only has 999 records pefectly matched with A for selected fields, then
+          Accuracy Rate(%) = 999/1000 * 100% = 99.9%
+        </div>
+      </section>
+    </div>
+    <div class="col-lg-6 col-md-6 col-sm-6 ruletypes" style="opacity:0.6">
+      <section id="panel-2"  class="panel panel-primary"  style="cursor:default;">
+        <!--ng-click="click('va')" -->
+        <div class="panel-heading">
+          <span style="font-size:20px">Data Profiling</span>
+          <span class="pull-right" style="font-size:20px">
                   <span class="fa fa-arrow-circle-right"></span>
             </span>
+        </div>
+        <div class="swMain panel-body" >
+
+          <label class="label-definition">Definition: Data profiling is the process of examining the data available in an existing data set and collecting statistics and information about that data</label>
+
+          <ul style="border-radius:0; background: none">
+            <li >
+              <a href="" class="done" style="cursor:default">
+                <div class="stepNumber">
+                  1
+                </div>
+                <span class="stepDesc text-small"> Choose Target </span>
+              </a>
+            </li>
+            <li>
+              <a href="" class="selected" style="cursor:default" >
+                <div class="stepNumber">
+                  2
+                </div>
+                <span class="stepDesc text-small">Define/Select Models </span>
+              </a>
+            </li>
+            <li >
+              <a href="" style="cursor:default" >
+                <div class="stepNumber">
+                  3
+                </div>
+                <span class="stepDesc text-small"> Configuration </span>
+              </a>
+            </li>
+
+
+          </ul>
+          <div>
+
+            <ol>
+              <li>Select the target dataset and fields which want to be checked</li>
+              <li>Define your syntax check logic which will be applied on the selected fields</li>
+              <li>Set basic configuration for your model(name, system, threshold, etc.)</li>
+            </ol>
+
+
           </div>
-          <div class="swMain panel-body" >
-
-            <label class="label-definition">Definition: Data profiling is the process of examining the data available in an existing data set and collecting statistics and information about that data</label>
-
-            <ul style="border-radius:0; background: none">
-                <li >
-                  <a href="" class="done" style="cursor:default">
-                    <div class="stepNumber">
-                      1
-                    </div>
-                    <span class="stepDesc text-small"> Choose Target </span>
-                  </a>
-                </li>
-                <li>
-                  <a href="" class="selected" style="cursor:default" >
-                    <div class="stepNumber">
-                      2
-                    </div>
-                    <span class="stepDesc text-small">Define/Select Models </span>
-                  </a>
-                </li>
-                <li >
-                  <a href="" style="cursor:default" >
-                    <div class="stepNumber">
-                      3
-                    </div>
-                    <span class="stepDesc text-small"> Configuration </span>
-                  </a>
-                </li>
-
-
-              </ul>
-              <div>
-
-                <ol>
-                  <li>Select the target dataset and fields which want to be checked</li>
-                  <li>Define your syntax check logic which will be applied on the selected fields</li>
-                  <li>Set basic configuration for your model(name, system, threshold, etc.)</li>
-                </ol>
-
-
-              </div>
-
-
-            </div>
-            <div class="panel-footer stepDesc">
-
-              <label>Example:</label> Check the data range(minimum, maximum) within a set of allowable values
-            </div>
-          </section>
-      </div>
-
-    </div><!--//row-->
-
-    <div class="row">
-        <div class="col-lg-6 col-md-6 col-sm-6 ruletypes">
-          <section id="panel-3" class="panel panel-yellow" ng-click="click('an')">
-            <div class="panel-heading">
-              <span style="font-size:20px">Anomaly Detection</span>
-              <span class="pull-right" style="font-size:20px">
+
+
+        </div>
+        <div class="panel-footer stepDesc">
+
+          <label>Example:</label> Check the data range(minimum, maximum) within a set of allowable values
+        </div>
+      </section>
+    </div>
+
+  </div><!--//row-->
+
+  <div class="row">
+    <div class="col-lg-6 col-md-6 col-sm-6 ruletypes" style="opacity:0.6;">
+      <section id="panel-3" class="panel panel-yellow"  style="cursor:default;">
+        <!--ng-click="click('an')"-->
+        <div class="panel-heading">
+          <span style="font-size:20px">Anomaly Detection</span>
+          <span class="pull-right" style="font-size:20px">
                     <span class="fa fa-arrow-circle-right"></span>
               </span>
-            </div>
-            <div class="swMain panel-body" >
-
-              <label class="label-definition">Definition: Identification of items, events or observations which do not conform to an expected pattern or other items in a dataset</label>
-
-              <ul style="border-radius:0; background: none">
-                  <li >
-                    <a href="" class="done" style="cursor:default">
-                      <div class="stepNumber">
-                        1
-                      </div>
-                      <span class="stepDesc text-small"> Choose Target </span>
-                    </a>
-                  </li>
-                  <li>
-                    <a href="" class="selected" style="cursor:default" >
-                      <div class="stepNumber">
-                        2
-                      </div>
-                      <span class="stepDesc text-small">Define/Select Models </span>
-                    </a>
-                  </li>
-                  <li >
-                    <a href="" style="cursor:default" >
-                      <div class="stepNumber">
-                        3
-                      </div>
-                      <span class="stepDesc text-small"> Configuration </span>
-                    </a>
-                  </li>
-
-
-                </ul>
-                <div>
-
-                  <ol>
-                    <li>Select the target dataset and fields which want to be checked</li>
-                    <li>Select the pre-defined anomaly detection methods which will be applied on the selected fields</li>
-                    <li>Set basic configuration for your model(name, system, threshold, etc.)</li>
-                  </ol>
+        </div>
+        <div class="swMain panel-body" >
+
+          <label class="label-definition">Definition: Identification of items, events or observations which do not conform to an expected pattern or other items in a dataset</label>
+
+          <ul style="border-radius:0; background: none">
+            <li >
+              <a href="" class="done" style="cursor:default">
+                <div class="stepNumber">
+                  1
+                </div>
+                <span class="stepDesc text-small"> Choose Target </span>
+              </a>
+            </li>
+            <li>
+              <a href="" class="selected" style="cursor:default" >
+                <div class="stepNumber">
+                  2
                 </div>
-              </div>
-              <div class="panel-footer stepDesc">
-                <label>Example1:</label> Check the total row count changed day over day (or hour over hour) on one Dataset
-                <label>Example2:</label> Check the values of all records in Column A should be matched with one expression pattern (first 3 character is 'abc') in one Dataset
-              </div>
-            </section>
+                <span class="stepDesc text-small">Define/Select Models </span>
+              </a>
+            </li>
+            <li >
+              <a href="" style="cursor:default" >
+                <div class="stepNumber">
+                  3
+                </div>
+                <span class="stepDesc text-small"> Configuration </span>
+              </a>
+            </li>
+
+
+          </ul>
+          <div>
+
+            <ol>
+              <li>Select the target dataset and fields which want to be checked</li>
+              <li>Select the pre-defined anomaly detection methods which will be applied on the selected fields</li>
+              <li>Set basic configuration for your model(name, system, threshold, etc.)</li>
+            </ol>
+          </div>
         </div>
+        <div class="panel-footer stepDesc">
+          <label>Example1:</label> Check the total row count changed day over day (or hour over hour) on one Dataset
+          <label>Example2:</label> Check the values of all records in Column A should be matched with one expression pattern (first 3 character is 'abc') in one Dataset
+        </div>
+      </section>
+    </div>
 
-        <div class="col-lg-6 col-md-6 col-sm-6 ruletypes">
-          <section id="panel-4" class="panel panel-green" ng-click="click('pu')">
-            <div class="panel-heading">
-              <span style="font-size:20px">Publish DQ Metrics Directly</span>
-              <span class="pull-right" style="font-size:20px">
+    <div class="col-lg-6 col-md-6 col-sm-6 ruletypes" style="opacity:0.6;">
+      <section id="panel-4" class="panel panel-green" style="cursor:default;">
+        <!--ng-click="click('pu')"-->
+        <div class="panel-heading">
+          <span style="font-size:20px">Publish DQ Metrics Directly</span>
+          <span class="pull-right" style="font-size:20px">
                     <span class="fa fa-arrow-circle-right"></span>
               </span>
-            </div>
-            <div class="swMain panel-body" >
+        </div>
+        <div class="swMain panel-body" >
 
-              <label class="label-definition">Definition: This is used to publish DQ results which already calculated offline by customers</label>
+          <label class="label-definition">Definition: This is used to publish DQ results which already calculated offline by customers</label>
 
-              <ul style="border-radius:0; background: none">
-                  <li >
-                    <a href="" style="cursor:default" class="onlyone selected">
-                      <div class="stepNumber">
-                        1
-                      </div>
-                      <span class="stepDesc text-small"> Configuration </span>
-                    </a>
-                  </li>
+          <ul style="border-radius:0; background: none">
+            <li >
+              <a href="" style="cursor:default" class="onlyone selected">
+                <div class="stepNumber">
+                  1
+                </div>
+                <span class="stepDesc text-small"> Configuration </span>
+              </a>
+            </li>
 
 
 
 
-                </ul>
-                <div>
+          </ul>
+          <div>
 
-                  <ol>
-                    <li>Set basic configuration for your model(name, system, threshold, etc.)</li>
-                  </ol>
-                </div>
-              </div>
-              <div class="panel-footer stepDesc">
-                <label>Example:</label> This example shows how to publish viewitem accuracy result with RESTful service
-<pre style="background-color:transparent;color:inherit;border:none;overflow:hidden;margin:0 0;padding:0 0">Method: POST
+            <ol>
+              <li>Set basic configuration for your model(name, system, threshold, etc.)</li>
+            </ol>
+          </div>
+        </div>
+        <div class="panel-footer stepDesc">
+          <label>Example:</label> This example shows how to publish viewitem accuracy result with RESTful service
+          <pre style="background-color:transparent;color:inherit;border:none;overflow:hidden;margin:0 0;padding:0 0">Method: POST
 Endpoint: {{publishURL}}
 Body:{"metricName": "viewitem_accuracy", "timestamp": 1463373496583, "value": "99.9"}</pre>
-              </div>
-            </section>
         </div>
+      </section>
+    </div>
 
-      </div><!--//row-->
+  </div><!--//row-->
 
 
 
 </div>
+
diff --git a/ui/pages/measures/measure.css b/ui/pages/measures/measure.css
index 81844ac91..989dc781f 100644
--- a/ui/pages/measures/measure.css
+++ b/ui/pages/measures/measure.css
@@ -303,7 +303,8 @@ fieldset legend{
   cursor:pointer
 }
 
-.ruletypes>.panel:hover{
+/*.ruletypes>.panel:hover{*/
+#panel-1:hover{
   box-shadow:         3px 3px 5px 6px #ccc;  /* Opera 10.5, IE 9, Firefox 4+, Chrome 6+, iOS 5 */
   -webkit-box-shadow: 3px 3px 5px 6px #ccc;  /* Safari 3-4, iOS 4.0.2 - 4.2, Android 2.3+ */
   -moz-box-shadow:    3px 3px 5px 6px #ccc;  /* Firefox 3.5 - 3.6 */
diff --git a/ui/pages/mydashboard/mydashboard.html b/ui/pages/mydashboard/mydashboard.html
index 14488ccc7..42f1f7d56 100644
--- a/ui/pages/mydashboard/mydashboard.html
+++ b/ui/pages/mydashboard/mydashboard.html
@@ -16,7 +16,7 @@
 <div id="mydashboard" class="bs-component" >
 	<div  class="container-fluid">
 		<div class="row col-lg-12" style="margin-top: 15px;">
-	        <a class="btn btn-primary btn-o btn-wide" href="#/subscribemodel"><i class="fa fa-plus"></i> Subscribe Models</a>
+	        <!--<a class="btn btn-primary btn-o btn-wide" href="#/subscribemodel"><i class="fa fa-plus"></i> Subscribe Models</a>-->
 	    </div>
 	  	<div ng-repeat="outerItems in dashboard">
 	  		<div class="row" >
diff --git a/ui/pages/mydashboard/subscribemodel.html b/ui/pages/mydashboard/subscribemodel.html
index c4841bb42..5c8e9e6b5 100644
--- a/ui/pages/mydashboard/subscribemodel.html
+++ b/ui/pages/mydashboard/subscribemodel.html
@@ -15,7 +15,7 @@
 -->
 <div class="container-fluid">
   <div class="row">
-    <h5 class="over-title margin-bottom-15">Subscribe Models</h5>
+    <!--<h5 class="over-title margin-bottom-15">Subscribe Models</h5>-->
   </div><!--//row-->
   <div class="row">
     <form name="Form" id="form" novalidate>