You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ha...@apache.org on 2016/12/30 08:27:53 UTC

[01/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Repository: eagle
Updated Branches:
  refs/heads/master ab50e62ac -> 8b3729f97


http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/srv/authorizationSrv.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/srv/authorizationSrv.js b/eagle-webservice/src/main/webapp/_app/public/js/srv/authorizationSrv.js
deleted file mode 100644
index dad9f6d..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/srv/authorizationSrv.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var serviceModule = angular.module('eagle.service');
-	serviceModule.service('Authorization', function ($rootScope, $http, $wrapState, $q) {
-		$http.defaults.withCredentials = true;
-
-		var _promise;
-		var _path = "";
-
-		var content = {
-			isLogin: true,	// Status mark. Work for UI status check, changed when eagle api return 403 authorization failure.
-			needLogin: function () {
-				console.log("[Authorization] Need Login!");
-				if(content.isLogin) {
-					_path = _path || $wrapState.path();
-					content.isLogin = false;
-					console.log("[Authorization] Call need login. Redirect...");
-					$wrapState.go("login", 99);
-				} else {
-					console.log("[Authorization] Already login state...");
-				}
-			},
-			login: function (username, password) {
-				var _hash = btoa(username + ':' + password);
-				return $http({
-					url: app.getURL('userProfile'),
-					method: "GET",
-					headers: {
-						'Authorization': "Basic " + _hash
-					}
-				}).then(function () {
-					content.isLogin = true;
-					return true;
-				}, function () {
-					return false;
-				});
-			},
-			logout: function () {
-				$http({
-					url: app.getURL('logout'),
-					method: "GET"
-				});
-			},
-			path: function (path) {
-				if (typeof path === "string") {
-					_path = path;
-				} else if (path === true) {
-					$wrapState.path(_path || "");
-					_path = "";
-				}
-			}
-		};
-
-		content.userProfile = {};
-		content.isRole = function (role) {
-			if (!content.userProfile.roles) return null;
-
-			return content.userProfile.roles[role] === true;
-		};
-
-		content.reload = function () {
-			_promise = $http({
-				url: app.getURL('userProfile'),
-				method: "GET"
-			}).then(function (data) {
-				content.userProfile = data.data;
-
-				// Role
-				content.userProfile.roles = {};
-				$.each(content.userProfile.authorities, function (i, role) {
-					content.userProfile.roles[role.authority] = true;
-				});
-
-				return content;
-			}, function(data) {
-				if(data.status === 403) {
-					content.needLogin();
-				}
-			});
-			return _promise;
-		};
-
-		content._promise = function () {
-			if (!_promise) {
-				content.reload();
-			}
-			return _promise;
-		};
-
-		content.rolePromise = function(role, rejectState) {
-			var _deferred = $q.defer();
-			var _oriPromise = content._promise();
-			_oriPromise.then(function() {
-				if(content.isRole(role)) {
-					_deferred.resolve(content);
-				} else if(content.isLogin) {
-					_deferred.resolve(content);
-					console.log("[Authorization] go landing...");
-					$wrapState.go(rejectState || "landing");
-				} else {
-					_deferred.reject(content);
-				}
-
-				return content;
-			});
-
-			return _deferred.promise;
-		};
-
-		// Call web service to keep session
-		setInterval(function() {
-			if(!content.isLogin) return;
-
-			$http.get(app.getURL('userProfile')).then(null, function (response) {
-				if(response.status === 403) {
-					console.log("[Session] Out of date...", response);
-					content.needLogin();
-				}
-			});
-		}, 1000 * 60 * 5);
-
-		return content;
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/srv/entitiesSrv.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/srv/entitiesSrv.js b/eagle-webservice/src/main/webapp/_app/public/js/srv/entitiesSrv.js
deleted file mode 100644
index b725054..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/srv/entitiesSrv.js
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var serviceModule = angular.module('eagle.service');
-	serviceModule.service('Entities', function($http, $q, $rootScope, $location, Authorization) {
-		var pkg;
-
-		// Query
-		function _query(name, kvs) {
-			kvs = kvs || {};
-			var _list = [];
-			var _condition = kvs._condition || {};
-			var _additionalCondition = _condition.additionalCondition || {};
-			var _startTime, _endTime;
-			var _startTimeStr, _endTimeStr;
-
-			// Initial
-			// > Condition
-			delete kvs._condition;
-			if(_condition) {
-				kvs.condition = _condition.condition;
-			}
-
-			// > Values
-			if(!kvs.values) {
-				kvs.values = "*";
-			} else if($.isArray(kvs.values)) {
-				kvs.values = $.map(kvs.values, function(field) {
-					return (field[0] === "@" ? '' : '@') + field;
-				}).join(",");
-			}
-
-			var _url = app.getURL(name, kvs);
-
-			// Fill special parameters
-			// > Query by time duration
-			if(_additionalCondition._duration) {
-				_endTime = app.time.now();
-				_startTime = _endTime.clone().subtract(_additionalCondition._duration, "ms");
-
-				// Debug usage. Extend more time duration for end time
-				if(_additionalCondition.__ETD) {
-					_endTime.add(_additionalCondition.__ETD, "ms");
-				}
-
-				_additionalCondition._startTime = _startTime;
-				_additionalCondition._endTime = _endTime;
-
-				_startTimeStr = _startTime.format("YYYY-MM-DD HH:mm:ss");
-				_endTimeStr = _endTime.clone().add(1, "s").format("YYYY-MM-DD HH:mm:ss");
-
-				_url += "&startTime=" + _startTimeStr + "&endTime=" + _endTimeStr;
-			} else if(_additionalCondition._startTime && _additionalCondition._endTime) {
-				_startTimeStr = _additionalCondition._startTime.format("YYYY-MM-DD HH:mm:ss");
-				_endTimeStr = _additionalCondition._endTime.clone().add(1, "s").format("YYYY-MM-DD HH:mm:ss");
-
-				_url += "&startTime=" + _startTimeStr + "&endTime=" + _endTimeStr;
-			}
-
-			// > Query contains metric name
-			if(_additionalCondition._metricName) {
-				_url += "&metricName=" + _additionalCondition._metricName;
-			}
-
-			// > Customize page size
-			if(_additionalCondition._pageSize) {
-				_url = _url.replace(/pageSize=\d+/, "pageSize=" + _additionalCondition._pageSize);
-			}
-
-			// AJAX
-			var canceler = $q.defer();
-			_list._promise = $http.get(_url, {timeout: canceler.promise}).then(function(status) {
-				_list.push.apply(_list, status.data.obj);
-				return _list;
-			});
-			_list._promise.abort = function() {
-				canceler.resolve();
-			};
-
-			_list._promise.then(function() {}, function(data) {
-				if(data.status === 403) {
-					Authorization.needLogin();
-				}
-			});
-
-			return _list;
-		}
-		function _post(url, entities) {
-			var _list = [];
-			_list._promise = $http({
-				method: 'POST',
-				url: url,
-				headers: {
-					"Content-Type": "application/json"
-				},
-				data: entities
-			}).success(function(data) {
-				_list.push.apply(_list, data.obj);
-			});
-			return _list;
-		}
-		function _delete(url) {
-			var _list = [];
-			_list._promise = $http({
-				method: 'DELETE',
-				url: url,
-				headers: {
-					"Content-Type": "application/json"
-				}
-			}).success(function(data) {
-				_list.push.apply(_list, data.obj);
-			});
-			return _list;
-		}
-		function _get(url) {
-			var _list = [];
-			_list._promise = $http({
-				method: 'GET',
-				url: url,
-				headers: {
-					"Content-Type": "text/plain"
-				}
-			}).success(function(data) {
-				// console.log(data);
-				_list.push.apply(_list, data.obj);
-			});
-			return _list;
-		}
-		function ParseCondition(condition) {
-			var _this = this;
-			_this.condition = "";
-			_this.additionalCondition = {};
-
-			if(typeof condition === "string") {
-				_this.condition = condition;
-			} else {
-				_this.condition = $.map(condition, function(value, key) {
-					if(!key.match(/^_/)) {
-						if(value === undefined || value === null) {
-							return '@' + key + '=~".*"';
-						} else {
-							return '@' + key + '="' + value + '"';
-						}
-					} else {
-						_this.additionalCondition[key] = value;
-						return null;
-					}
-				}).join(" AND ");
-			}
-			return _this;
-		}
-
-		pkg = {
-			_query: _query,
-			_post: _post,
-
-			maprfsNameToID: function(serviceName, value, site) {
-				//var _url = "../rest/maprIDResolver/fNameResolver?fName="+name;
-				var _url = app.getMapRNameResolverURL(serviceName, value, site);
-				return _get(_url);
-			},
-
-			updateEntity: function(serviceName, entities, config) {
-				var _url;
-				config = config || {};
-				if(!$.isArray(entities)) entities = [entities];
-
-				// Post clone entities
-				var _entities = $.map(entities, function(entity) {
-					var _entity = {};
-
-					// Clone variables
-					$.each(entity, function(key) {
-						// Skip inner variables
-						if(!key.match(/^__/)) {
-							_entity[key] = entity[key];
-						}
-					});
-
-					// Add timestamp
-					if(config.timestamp !== false) {
-						if(config.createTime !== false && !_entity.createdTime) {
-							_entity.createdTime = new moment().valueOf();
-						}
-						if(config.lastModifiedDate !== false) {
-							_entity.lastModifiedDate = new moment().valueOf();
-						}
-					}
-
-					return _entity;
-				});
-
-				// Check for url hook
-				if(config.hook) {
-					_url = app.getUpdateURL(serviceName) || app.packageURL(serviceName);
-				} else {
-					_url = app.getURL("updateEntity", {serviceName: serviceName});
-				}
-
-				return _post(_url, _entities);
-			},
-
-			deleteEntity: function(serviceName, entities) {
-				if (!$.isArray(entities)) entities = [entities];
-
-				var _entities = $.map(entities, function (entity) {
-					return typeof entity === "object" ? entity.encodedRowkey : entity;
-				});
-				return _post(app.getURL("deleteEntity", {serviceName: serviceName}), _entities);
-			},
-			deleteEntities: function(serviceName, condition) {
-				return _delete(app.getURL("deleteEntities", {serviceName: serviceName, condition: new ParseCondition(condition).condition}));
-			},
-			delete: function(serviceName, kvs) {
-				var _deleteURL = app.getDeleteURL(serviceName);
-				return _delete(common.template(_deleteURL, kvs));
-			},
-
-			queryEntity: function(serviceName, encodedRowkey) {
-				return _query("queryEntity", {serviceName: serviceName, encodedRowkey: encodedRowkey});
-			},
-			queryEntities: function(serviceName, condition, fields) {
-				return _query("queryEntities", {serviceName: serviceName, _condition: new ParseCondition(condition), values: fields});
-			},
-			queryGroup: function(serviceName, condition, groupBy, fields) {
-				return _query("queryGroup", {serviceName: serviceName, _condition: new ParseCondition(condition), groupBy: groupBy, values: fields});
-			},
-			querySeries: function(serviceName, condition, groupBy, fields, intervalmin) {
-				var _cond = new ParseCondition(condition);
-				var _list = _query("querySeries", {serviceName: serviceName, _condition: _cond, groupBy: groupBy, values: fields, intervalmin: intervalmin});
-				_list._promise.then(function() {
-					if(_list.length === 0) {
-						_list._empty = true;
-						_list._convert = true;
-
-						for(var i = 0; i <= (_cond.additionalCondition._endTime.valueOf() - _cond.additionalCondition._startTime.valueOf()) / (1000 * 60 * intervalmin); i += 1) {
-							_list.push(0);
-						}
-					} else if(_list.length === 1) {
-						_list._convert = true;
-						var _unit = _list.pop();
-						_list.push.apply(_list, _unit.value[0]);
-					}
-
-					if(_list._convert) {
-						var _current = _cond.additionalCondition._startTime.clone();
-						$.each(_list, function(i, value) {
-							_list[i] = {
-								x: _current.valueOf(),
-								y: value
-							};
-							_current.add(intervalmin, "m");
-						});
-					}
-				});
-				return _list;
-			},
-
-			query: function(path, params) {
-				var _list = [];
-				_list._promise = $http({
-					method: 'GET',
-					url: app.getURL("query") + path,
-					params: params
-				}).success(function(data) {
-					_list.push.apply(_list, data.obj);
-				});
-				return _list;
-			},
-
-			dialog: function(data, callback) {
-				if(data.success === false || (data.exception || "").trim()) {
-					return $.dialog({
-						title: "OPS",
-						content: $("<pre>").html(data.exception)
-					}, callback);
-				}
-				return false;
-			}
-		};
-		return pkg;
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/srv/main.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/srv/main.js b/eagle-webservice/src/main/webapp/_app/public/js/srv/main.js
deleted file mode 100644
index 4f5a72a..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/srv/main.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var eagleSrv = angular.module('eagle.service', []);
-
-	eagleSrv.provider('ServiceError', function() {
-		var errorContainer = {
-			list: [],
-			newError: function(err) {
-				err._read = false;
-				errorContainer.list.unshift(err);
-			},
-			showError: function(err) {
-				err._read = true;
-				$.dialog({
-					size: "large",
-					title: err.title,
-					content: $("<pre>").html(err.description)
-				});
-			},
-			clearAll: function() {
-				errorContainer.list = [];
-			}
-		};
-
-		Object.defineProperty(errorContainer, 'hasUnread', {
-			get: function() {
-				return !!common.array.find(false, errorContainer.list, "_read");
-			}
-		});
-
-		this.$get = function() {
-			return errorContainer;
-		};
-	});
-
-	eagleSrv.config(function ($httpProvider, ServiceErrorProvider) {
-		$httpProvider.interceptors.push(function ($q, $timeout) {
-			return {
-				response: function (response) {
-					var data = response.data;
-					if(data.exception) {
-						console.log(response);
-						ServiceErrorProvider.$get().newError({
-							title: "Http Request Error",
-							description: "URL:\n" + response.config.url + "\n\nParams:\n" + JSON.stringify(response.config.params, null, "\t") + "\n\nException:\n" + data.exception
-						});
-					}
-					return response;
-				}
-			};
-		});
-	});
-})();

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/srv/pageSrv.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/srv/pageSrv.js b/eagle-webservice/src/main/webapp/_app/public/js/srv/pageSrv.js
deleted file mode 100644
index e59d8a3..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/srv/pageSrv.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var serviceModule = angular.module('eagle.service');
-
-	// ===========================================================
-	// =                         Service                         =
-	// ===========================================================
-	// Feature page
-	serviceModule.service('PageConfig', function() {
-		var _tmplConfig = {
-			pageTitle: "",
-			pageSubTitle: "",
-
-			hideSite: false,
-			lockSite: false,
-			hideApplication: false,
-			hideSidebar: false,
-			hideUser: false,
-
-			// Current page navigation path
-			navPath: [],
-
-			navConfig: {}
-		};
-
-		var PageConfig = {};
-
-		// Reset
-		PageConfig.reset = function() {
-			$.extend(PageConfig, _tmplConfig);
-			PageConfig.navPath = [];
-		};
-		PageConfig.reset();
-
-		// Create navigation path
-		PageConfig.addNavPath = function(title, path) {
-			PageConfig.navPath.push({
-				title: title,
-				path: path
-			});
-			return PageConfig;
-		};
-
-		return PageConfig;
-	});
-
-	// Feature page
-	serviceModule.service('FeaturePageConfig', function(Application) {
-		var config = {
-			// Feature mapping pages
-			_navItemMapping: {}
-		};
-
-		// Register feature controller
-		config.addNavItem = function(feature, item) {
-			var _navItemList = config._navItemMapping[feature] = config._navItemMapping[feature] || [];
-			_navItemList.push(item);
-		};
-
-		// Page list
-		Object.defineProperty(config, "pageList", {
-			get: function() {
-				var _app = Application.current();
-				var _list = [];
-
-				if(_app && _app.features) {
-					$.each(_app.features, function(i, featureName) {
-						_list = _list.concat(config._navItemMapping[featureName] || []);
-					});
-				}
-
-				return _list;
-			}
-		});
-
-		return config;
-	});
-
-	// Configuration page
-	serviceModule.service('ConfigPageConfig', function(Application) {
-		var _originPageList = [
-			{icon: "server", title: "Sites", url: "#/config/site"},
-			{icon: "cubes", title: "Applications", url: "#/config/application"},
-			{icon: "leaf", title: "Features", url: "#/config/feature"}
-		];
-
-		var config = {
-			_navItemMapping: {}
-		};
-
-		// Register feature controller
-		config.addNavItem = function(feature, item) {
-			var _navItemList = config._navItemMapping[feature] = config._navItemMapping[feature] || [];
-			_navItemList.push(item);
-		};
-
-		// Page list
-		Object.defineProperty(config, "pageList", {
-			get: function() {
-				var _list = _originPageList;
-
-				$.each(Application.featureList, function(i, feature) {
-					_list = _list.concat(config._navItemMapping[feature.tags.feature] || []);
-				});
-
-				return _list;
-			}
-		});
-
-		return config;
-	});
-})();

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/srv/siteSrv.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/srv/siteSrv.js b/eagle-webservice/src/main/webapp/_app/public/js/srv/siteSrv.js
deleted file mode 100644
index fce64c0..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/srv/siteSrv.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var serviceModule = angular.module('eagle.service');
-	serviceModule.service('Site', function($rootScope, $wrapState, $location, $q, Entities, Application) {
-		var _currentSite;
-		var Site = {};
-		var _promise;
-
-		Site.list = [];
-		Site.list.set = {};
-
-		Site.current = function(site) {
-			if(site) {
-				var _prev = _currentSite;
-				_currentSite = site;
-
-				// Keep current site and reload page
-				if(!_prev || _prev.tags.site !== _currentSite.tags.site) {
-					if(sessionStorage) {
-						sessionStorage.setItem("site", _currentSite.tags.site);
-					}
-
-					if(!$wrapState.current.abstract && $wrapState.current.name !== "login") {
-						console.log("[Site]", "Switch. Reload.");
-						$wrapState.reload();
-					}
-				}
-			}
-			return _currentSite;
-		};
-		Site.find = function(siteName) {
-			return common.array.find(siteName, Site.list, "tags.site");
-		};
-		Site.url = function(site, url) {
-			console.warn("[Site] Site.url is a deprecated function.");
-			if(arguments.length == 1) {
-				url = site;
-			} else {
-				Site.current(site);
-			}
-			$wrapState.url(url);
-
-			if ($rootScope.$$phase != '$apply' && $rootScope.$$phase != '$digest') {
-				$rootScope.$apply();
-			}
-		};
-
-		Site.currentSiteApplication = function() {
-			var _app = Application.current();
-			if(!_app) return null;
-
-			return _currentSite.applicationList.set[_app.tags.application];
-		};
-
-		Site.reload = function() {
-			var _applicationList;
-
-			if(Site.list && Site.list._promise) Site.list._promise.abort();
-
-			Site.list = Entities.queryEntities("SiteDescService", '');
-			Site.list.set = {};
-			_applicationList = Entities.queryEntities("SiteApplicationService", '');
-
-			_promise = $q.all([Site.list._promise, _applicationList._promise, Application._promise()]).then(function() {
-				// Fill site set
-				$.each(Site.list, function(i, site) {
-					var _list = [];
-					var _appGrp = {};
-					var _appGrpList = [];
-					_list.set = {};
-					Site.list.set[site.tags.site] = site;
-
-					// Find application
-					_list.find = function(applicationName) {
-						return common.array.find(applicationName, _list, "tags.application");
-					};
-
-					// Define properties
-					Object.defineProperties(site, {
-						applicationList: {
-							get: function() {
-								return _list;
-							}
-						},
-						applicationGroup: {
-							get: function() {
-								return _appGrp;
-							}
-						},
-						applicationGroupList: {
-							get: function() {
-								return _appGrpList;
-							}
-						}
-					});
-				});
-
-				// Fill site application mapping
-				$.each(_applicationList, function(i, siteApplication) {
-					var _site = Site.list.set[siteApplication.tags.site];
-					var _application = Application.find(siteApplication.tags.application);
-					var _appGroup, _configObj;
-
-					if(!_site) {
-						console.warn("[Site] Application not match site:", siteApplication.tags.site, "-", siteApplication.tags.application);
-					} else if(!_application) {
-						console.warn("[Site] Application not found:", siteApplication.tags.site, "-", siteApplication.tags.application);
-					} else {
-						_configObj = common.properties.parse(siteApplication.config, {});
-						Object.defineProperties(siteApplication, {
-							application: {
-								get: function () {
-									return _application;
-								}
-							},
-							configObj: {
-								get: function () {
-									return _configObj;
-								}
-							}
-						});
-
-						_site.applicationList.push(siteApplication);
-						_site.applicationList.set[siteApplication.tags.application] = siteApplication;
-
-						_appGroup = _site.applicationGroup[_application.group] = _site.applicationGroup[_application.group] || [];
-						_appGroup.push(_application);
-					}
-				});
-
-				// Fill site application group attributes
-				$.each(Site.list, function(i, site) {
-					$.each(site.applicationGroup, function(grpName, grpList) {
-						var grp = {
-							name: grpName,
-							list: grpList,
-							enabledList: $.grep(grpList, function(application) {return site.applicationList.set[application.tags.application].enabled;}),
-							disabledList: $.grep(grpList, function(application) {return !site.applicationList.set[application.tags.application].enabled;})
-						};
-
-						site.applicationGroupList.push(grp);
-					});
-
-					site.applicationGroupList.sort(function(a, b) {
-						if(a.name === b.name) return 0;
-						if(a.name === "Others") return 1;
-						if(b.name === "Others") return -1;
-						return a.name < b.name ? -1 : 1;
-					});
-				});
-
-				// Set current site
-				if(sessionStorage && Site.find(sessionStorage.getItem("site"))) {
-					Site.current(Site.find(sessionStorage.getItem("site")));
-				} else {
-					Site.current(Site.list[0]);
-				}
-
-				return Site;
-			});
-
-			return _promise;
-		};
-
-		Site._promise = function() {
-			if(!_promise) {
-				Site.reload();
-			}
-			return _promise;
-		};
-
-		return Site;
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/srv/uiSrv.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/srv/uiSrv.js b/eagle-webservice/src/main/webapp/_app/public/js/srv/uiSrv.js
deleted file mode 100644
index 9955fac..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/srv/uiSrv.js
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	/**
-	 * Check function to check fields pass or not
-	 * @callback checkFieldFunction
-	 * @param {{}} entity
-	 * @return {string}
-     */
-
-	var serviceModule = angular.module('eagle.service');
-
-	// ===========================================================
-	// =                         Service                         =
-	// ===========================================================
-	// Feature page
-	serviceModule.service('UI', function($rootScope, $q, $compile) {
-		var UI = {};
-
-		function _bindShortcut($dialog) {
-			$dialog.on("keydown", function (event) {
-				if(event.which === 13) {
-					if(!$(":focus").is("textarea")) {
-						$dialog.find(".confirmBtn:enabled").click();
-					}
-				}
-			});
-		}
-
-		function _fieldDialog(create, name, entity, fieldList, checkFunc) {
-			var _deferred, $mdl, $scope;
-
-			_deferred = $q.defer();
-			$scope = $rootScope.$new(true);
-			$scope.name = name;
-			$scope.entity = entity;
-			$scope.fieldList = fieldList;
-			$scope.checkFunc = checkFunc;
-			$scope.lock = false;
-			$scope.create = create;
-
-			$scope.config = typeof name === "object" ? name : {};
-
-			// Modal
-			$mdl = $(TMPL_FIELDS).appendTo('body');
-			$compile($mdl)($scope);
-			$mdl.modal();
-
-			$mdl.on("hide.bs.modal", function() {
-				_deferred.reject();
-			});
-			$mdl.on("hidden.bs.modal", function() {
-				_deferred.resolve({
-					entity: entity
-				});
-				$mdl.remove();
-			});
-
-			// Function
-			$scope.getFieldDescription = function (field) {
-				if(typeof field.description === "function") {
-					return field.description($scope.entity);
-				}
-				return field.description || ((field.name || field.field) + '...');
-			};
-
-			$scope.emptyFieldList = function() {
-				return $.map(fieldList, function(field) {
-					if(!field.optional && !entity[field.field]) {
-						return field.field;
-					}
-				});
-			};
-
-			$scope.confirm = function() {
-				$scope.lock = true;
-				_deferred.notify({
-					entity: entity,
-					closeFunc: function() {
-						$mdl.modal('hide');
-					},
-					unlock: function() {
-						$scope.lock = false;
-					}
-				});
-			};
-
-			_bindShortcut($mdl);
-
-			return _deferred.promise;
-		}
-
-		/***
-		 * Create a creation confirm modal.
-		 * @param name			Name title
-		 * @param entity		bind entity
-		 * @param fieldList	Array. Format: {name, field, type(optional: select, blob), rows(optional: number), description(optional), optional(optional), readonly(optional), valueList(optional)}
-		 * @param checkFunc	Check logic function. Return string will prevent access
-		 */
-		UI.createConfirm = function(name, entity, fieldList, checkFunc) {
-			return _fieldDialog(true, name, entity, fieldList, checkFunc);
-		};
-
-		/***
-		 * Create a update confirm modal.
-		 * @param name			Name title
-		 * @param entity		bind entity
-		 * @param fieldList	Array. Format: {name, field, type(optional: select, blob), rows(optional: number), description(optional), optional(optional), readonly(optional), valueList(optional)}
-		 * @param checkFunc	Check logic function. Return string will prevent access
-		 */
-		UI.updateConfirm = function(name, entity, fieldList, checkFunc) {
-			return _fieldDialog(false, name, entity, fieldList, checkFunc);
-		};
-
-		/***
-		 * Create a customize field confirm modal.
-		 * @param {object} config					- Configuration object
-		 * @param {string=} config.title				- Title of dialog box
-		 * @param {string=} config.size				- "large". Set dialog size
-		 * @param {boolean=} config.confirm			- Display or not confirm button
-		 * @param {string=} config.confirmDesc		- Confirm button display description
-		 * @param {object} entity					- bind entity
-		 * @param {{name:string, field:string,type:('select'|'blob'),rows:number,description:string,optional:boolean,readonly:boolean,valueList:Array}[]} fieldList - Display fields
-		 * @param {checkFieldFunction=} checkFunc	- Check logic function. Return string will prevent access
-		 */
-		UI.fieldConfirm = function(config, entity, fieldList, checkFunc) {
-			return _fieldDialog("field", config, entity, fieldList, checkFunc);
-		};
-
-		UI.deleteConfirm = function(name) {
-			var _deferred, $mdl, $scope;
-
-			_deferred = $q.defer();
-			$scope = $rootScope.$new(true);
-			$scope.name = name;
-			$scope.lock = false;
-
-			// Modal
-			$mdl = $(TMPL_DELETE).appendTo('body');
-			$compile($mdl)($scope);
-			$mdl.modal();
-
-			$mdl.on("hide.bs.modal", function() {
-				_deferred.reject();
-			});
-			$mdl.on("hidden.bs.modal", function() {
-				_deferred.resolve({
-					name: name
-				});
-				$mdl.remove();
-			});
-
-			// Function
-			$scope.delete = function() {
-				$scope.lock = true;
-				_deferred.notify({
-					name: name,
-					closeFunc: function() {
-						$mdl.modal('hide');
-					},
-					unlock: function() {
-						$scope.lock = false;
-					}
-				});
-			};
-
-			return _deferred.promise;
-		};
-
-		return UI;
-	});
-
-	// ===========================================================
-	// =                         Template                        =
-	// ===========================================================
-	var TMPL_FIELDS =
-		'<div class="modal fade" tabindex="-1" role="dialog">' +
-			'<div class="modal-dialog" ng-class="{\'modal-lg\': config.size === \'large\'}" role="document">' +
-				'<div class="modal-content">' +
-					'<div class="modal-header">' +
-						'<button type="button" class="close" data-dismiss="modal" aria-label="Close">' +
-							'<span aria-hidden="true">&times;</span>' +
-						'</button>' +
-						'<h4 class="modal-title">{{config.title || (create ? "New" : "Update") + " " + name}}</h4>' +
-					'</div>' +
-					'<div class="modal-body">' +
-						'<div class="form-group" ng-repeat="field in fieldList" ng-switch="field.type">' +
-							'<label for="featureName">' +
-								'<span ng-if="!field.optional">*</span> ' +
-								'{{field.name || field.field}}' +
-							'</label>' +
-							'<textarea class="form-control" placeholder="{{getFieldDescription(field)}}" ng-model="entity[field.field]" rows="{{ field.rows || 10 }}" ng-readonly="field.readonly" ng-disabled="lock" ng-switch-when="blob"></textarea>' +
-							'<select class="form-control" ng-model="entity[field.field]" ng-init="entity[field.field] = entity[field.field] || field.valueList[0]" ng-switch-when="select">' +
-								'<option ng-repeat="value in field.valueList">{{value}}</option>' +
-							'</select>' +
-							'<input type="text" class="form-control" placeholder="{{getFieldDescription(field)}}" ng-model="entity[field.field]" ng-readonly="field.readonly" ng-disabled="lock" ng-switch-default>' +
-						'</div>' +
-					'</div>' +
-					'<div class="modal-footer">' +
-						'<p class="pull-left text-danger">{{checkFunc(entity)}}</p>' +
-						'<button type="button" class="btn btn-default" data-dismiss="modal" ng-disabled="lock">Close</button>' +
-						'<button type="button" class="btn btn-primary confirmBtn" ng-click="confirm()" ng-disabled="checkFunc(entity) || emptyFieldList().length || lock" ng-if="config.confirm !== false">' +
-							'{{config.confirmDesc || (create ? "Create" : "Update")}}' +
-						'</button>' +
-					'</div>' +
-				'</div>' +
-			'</div>' +
-		'</div>';
-
-	var TMPL_DELETE =
-		'<div class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">' +
-			'<div class="modal-dialog">' +
-				'<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 Confirm</h4></div>' +
-						'<div class="modal-body">' +
-							'<span class="text-red fa fa-exclamation-triangle pull-left" style="font-size: 50px;"></span>' +
-							'<p>You are <strong class="text-red">DELETING</strong> \'{{name}}\'!</p>' +
-							'<p>Proceed to delete?</p>' +
-						'</div>' +
-						'<div class="modal-footer">' +
-							'<button type="button" class="btn btn-danger" ng-click="delete()" ng-disabled="lock">Delete</button>' +
-							'<button type="button" class="btn btn-default" data-dismiss="modal" ng-disabled="lock">Cancel</button>' +
-						'</div>' +
-				'</div>' +
-			'</div>' +
-		'</div>';
-})();

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/srv/wrapStateSrv.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/srv/wrapStateSrv.js b/eagle-webservice/src/main/webapp/_app/public/js/srv/wrapStateSrv.js
deleted file mode 100644
index 57872b2..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/srv/wrapStateSrv.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var serviceModule = angular.module('eagle.service');
-	serviceModule.service('$wrapState', function($state, $location, $stateParams) {
-		var $wrapState = {};
-		var _targetState = null;
-		var _targetPriority = 0;
-
-		// Go
-		$wrapState.go = function(state, param, priority) {
-			setTimeout(function() {
-				_targetState = null;
-				_targetPriority = 0;
-			});
-
-			if(typeof param !== "object") {
-				param = {};
-				priority = param;
-			}
-
-			priority = priority === true ? 1 : (priority || 0);
-			if(_targetPriority > priority) {
-				console.log("[Wrap State] Go - low priority:", state, "(Skip)");
-				return false;
-			}
-
-			if(_targetState !== state || priority) {
-				if($state.current && $state.current.name === state && angular.equals($state.params, param)) {
-					console.log($state);
-					console.log("[Wrap State] Go reload.");
-					$state.reload();
-				} else {
-					console.log("[Wrap State] Go:", state, param, priority);
-					$state.go(state, param);
-				}
-				_targetState = state;
-				_targetPriority = priority;
-				return true;
-			} else {
-				console.log("[Wrap State] Go:", state, "(Ignored)");
-			}
-			return false;
-		};
-
-		// Reload
-		$wrapState.reload = function() {
-			console.log("[Wrap State] Do reload.");
-			$state.reload();
-		};
-
-		// Path
-		$wrapState.path = function(path) {
-			if(path !== undefined) {
-				console.log("[Wrap State][Deprecated] Switch path:", path);
-			}
-			return $location.path(path);
-		};
-
-		// URL
-		$wrapState.url = function(url) {
-			if(url !== undefined) console.log("[Wrap State] Switch url:", url);
-			return $location.url(url);
-		};
-
-		Object.defineProperties($wrapState, {
-			// Origin $state
-			origin: {
-				get: function() {
-					return $state;
-				}
-			},
-
-			// Current
-			current: {
-				get: function() {
-					return $state.current;
-				}
-			},
-
-			// Parameter
-			param: {
-				get: function() {
-					return $.extend({}, $location.search(), $stateParams);
-				}
-			}
-		});
-
-		return $wrapState;
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/ui-build.sh
----------------------------------------------------------------------
diff --git a/eagle-webservice/ui-build.sh b/eagle-webservice/ui-build.sh
deleted file mode 100644
index 4ca13eb..0000000
--- a/eagle-webservice/ui-build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-echo "=============== Web APP Building Start ==============="
-echo "Environment Check..."
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c5be08d..da4470f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache</groupId>
@@ -25,14 +24,14 @@
     </parent>
     <groupId>org.apache.eagle</groupId>
     <artifactId>eagle-parent</artifactId>
-    <version>0.5.0-incubating-SNAPSHOT</version>
+    <version>0.5.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Eagle::Parent</name>
-    <url>https://eagle.incubator.apache.org</url>
+    <url>https://eagle.apache.org</url>
     <inceptionYear>2015</inceptionYear>
     <description>
-        Apache Eagle is an open source monitoring solution to instantly identify access to sensitive data, recognize
-        attacks, malicious activities in Hadoop and take actions in real time.
+        Apache� Eagle\u2122 is an open source analytics solution for identifying security and performance issues
+        instantly on big data platforms e.g. Apache Hadoop, Apache Spark, NoSQL etc.
     </description>
     <organization>
         <name>Apache Software Foundation</name>
@@ -46,9 +45,9 @@
         </license>
     </licenses>
     <scm>
-        <connection>scm:git:git@github.com:apache/incubator-eagle.git</connection>
-        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-eagle.git</developerConnection>
-        <url>scm:git:git@github.com:apache/incubator-eagle.git</url>
+        <connection>scm:git:git@github.com:apache/eagle.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/eagle.git</developerConnection>
+        <url>scm:git:git@github.com:apache/eagle.git</url>
         <tag>HEAD</tag>
     </scm>
     <issueManagement>
@@ -61,23 +60,23 @@
     <mailingLists>
         <mailingList>
             <name>Dev Mailing List</name>
-            <post>dev@eagle.incubator.apache.org</post>
-            <subscribe>dev-subscribe@eagle.incubator.apache.org</subscribe>
-            <unsubscribe>dev-unsubscribe@eagle.incubator.apache.org</unsubscribe>
+            <post>dev@eagle.apache.org</post>
+            <subscribe>dev-subscribe@eagle.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@eagle.apache.org</unsubscribe>
             <archive>http://mail-archives.apache.org/mod_mbox/eagle-dev/</archive>
         </mailingList>
         <mailingList>
             <name>User Mailing List</name>
-            <post>user@eagle.incubator.apache.org</post>
-            <subscribe>user-subscribe@eagle.incubator.apache.org</subscribe>
-            <unsubscribe>user-unsubscribe@eagle.incubator.apache.org</unsubscribe>
+            <post>user@eagle.apache.org</post>
+            <subscribe>user-subscribe@eagle.apache.org</subscribe>
+            <unsubscribe>user-unsubscribe@eagle.apache.org</unsubscribe>
             <archive>http://mail-archives.apache.org/mod_mbox/eagle-user/</archive>
         </mailingList>
         <mailingList>
             <name>Commits Mailing List</name>
-            <post>commits@eagle.incubator.apache.org</post>
-            <subscribe>commits-subscribe@eagle.incubator.apache.org</subscribe>
-            <unsubscribe>commits-unsubscribe@eagle.incubator.apache.org</unsubscribe>
+            <post>commits@eagle.apache.org</post>
+            <subscribe>commits-subscribe@eagle.apache.org</subscribe>
+            <unsubscribe>commits-unsubscribe@eagle.apache.org</unsubscribe>
             <archive>http://mail-archives.apache.org/mod_mbox/eagle-commits/</archive>
         </mailingList>
     </mailingLists>
@@ -87,42 +86,42 @@
             <name>Edward Zhang</name>
             <email>yonzhang2012@apache.org</email>
             <organization>Apache Software Foundation</organization>
-            <organizationUrl>https://eagle.incubator.apache.org</organizationUrl>
+            <organizationUrl>https://eagle.apache.org</organizationUrl>
         </developer>
         <developer>
             <id>hao</id>
             <name>Hao Chen</name>
             <email>hao@apache.org</email>
             <organization>Apache Software Foundation</organization>
-            <organizationUrl>https://eagle.incubator.apache.org</organizationUrl>
+            <organizationUrl>https://eagle.apache.org</organizationUrl>
         </developer>
         <developer>
             <id>libsun</id>
             <name>Libin Sun</name>
             <email>libsun@apache.org</email>
             <organization>Apache Software Foundation</organization>
-            <organizationUrl>https://eagle.incubator.apache.org</organizationUrl>
+            <organizationUrl>https://eagle.apache.org</organizationUrl>
         </developer>
         <developer>
             <id>jilin</id>
             <name>Jilin Jiang</name>
             <email>jilin@apache.org</email>
             <organization>Apache Software Foundation</organization>
-            <organizationUrl>https://eagle.incubator.apache.org</organizationUrl>
+            <organizationUrl>https://eagle.apache.org</organizationUrl>
         </developer>
         <developer>
             <id>qingwzhao</id>
             <name>Qingwen Zhao</name>
             <email>qingwzhao@apache.org</email>
             <organization>Apache Software Foundation</organization>
-            <organizationUrl>https://eagle.incubator.apache.org</organizationUrl>
+            <organizationUrl>https://eagle.apache.org</organizationUrl>
         </developer>
         <developer>
             <id>cgupta</id>
             <name>Chaitali Gupta</name>
             <email>cgupta@apache.org</email>
             <organization>Apache Software Foundation</organization>
-            <organizationUrl>https://eagle.incubator.apache.org</organizationUrl>
+            <organizationUrl>https://eagle.apache.org</organizationUrl>
         </developer>
     </developers>
     <modules>


[14/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
[MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Migrate `0.5.0-incubating-SNAPSHOT` to `0.5.0-SNAPSHOT` as Eagle graduated from incubator and becomes TLP

Author: Hao Chen <ha...@apache.org>

Closes #757 from haoch/UpdateVersion.


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

Branch: refs/heads/master
Commit: 8b3729f97f73901ad5fa70a79ff7b6a8a19f0659
Parents: ab50e62
Author: Hao Chen <ha...@apache.org>
Authored: Fri Dec 30 16:27:31 2016 +0800
Committer: Hao Chen <ha...@apache.org>
Committed: Fri Dec 30 16:27:31 2016 +0800

----------------------------------------------------------------------
 LICENSE                                         |    2 +-
 NOTICE                                          |    4 +-
 eagle-assembly/pom.xml                          |  129 -
 eagle-assembly/src/assembly/eagle-bin.xml       |  249 -
 eagle-assembly/src/main/README.md               |   99 -
 eagle-assembly/src/main/bin/eagle-ambari.sh     |   20 -
 eagle-assembly/src/main/bin/eagle-check-env.sh  |   43 -
 eagle-assembly/src/main/bin/eagle-env.sh        |   51 -
 eagle-assembly/src/main/bin/eagle-policy.sh     |  168 -
 eagle-assembly/src/main/bin/eagle-run-class.sh  |  115 -
 eagle-assembly/src/main/bin/eagle-service.sh    |  126 -
 .../src/main/bin/eagle-topology-init.sh         |  214 -
 eagle-assembly/src/main/bin/eagle-topology.sh   |  195 -
 .../src/main/bin/eagle-userprofile-scheduler.sh |  226 -
 .../src/main/bin/eagle-userprofile-training.sh  |  163 -
 .../src/main/bin/hadoop-metric-monitor.sh       |   50 -
 .../bin/hdfs-securitylog-metadata-create.sh     |   40 -
 eagle-assembly/src/main/bin/kafka-producer.sh   |   21 -
 .../src/main/bin/kafka-server-start.sh          |   51 -
 .../src/main/bin/kafka-server-status.sh         |   24 -
 .../src/main/bin/kafka-server-stop.sh           |   23 -
 .../src/main/bin/kafka-stream-monitor.sh        |   53 -
 eagle-assembly/src/main/bin/kafka-topics.sh     |   17 -
 eagle-assembly/src/main/bin/pipeline-runner.sh  |   52 -
 .../src/main/bin/zookeeper-server-start.sh      |   50 -
 .../src/main/bin/zookeeper-server-status.sh     |   24 -
 .../src/main/bin/zookeeper-server-stop.sh       |   24 -
 .../src/main/conf/eagle-scheduler.conf          |   42 -
 eagle-assembly/src/main/conf/eagle-service.conf |   30 -
 .../src/main/conf/kafka-server.properties       |  115 -
 eagle-assembly/src/main/conf/ldap.properties    |   23 -
 eagle-assembly/src/main/conf/log4j.properties   |   30 -
 eagle-assembly/src/main/conf/pipeline.conf      |   40 -
 .../main/conf/sandbox-hadoopjmx-pipeline.conf   |   49 -
 .../main/conf/sandbox-hadoopjmx-topology.conf   |   69 -
 .../sandbox-hbaseSecurityLog-application.conf   |   66 -
 .../conf/sandbox-hdfsAuditLog-application.conf  |   66 -
 .../sandbox-hdfsSecurityLog-application.conf    |   66 -
 .../conf/sandbox-hiveQueryLog-application.conf  |   63 -
 .../conf/sandbox-userprofile-scheduler.conf     |   66 -
 .../main/conf/sandbox-userprofile-topology.conf |   64 -
 .../src/main/conf/tools-log4j.properties        |   19 -
 .../src/main/conf/zookeeper-server.properties   |   20 -
 eagle-assembly/src/main/docs/kafka.rb           |  191 -
 .../src/main/docs/logstash-kafka-conf.md        |  207 -
 .../src/main/examples/eagle-sandbox-starter.sh  |  136 -
 .../examples/hadoop-metric-policy-create.sh     |   45 -
 .../examples/hadoop-metric-sandbox-starter.sh   |  125 -
 .../src/main/examples/sample-policy-create.sh   |   31 -
 .../sample-sensitivity-resource-create.sh       |   32 -
 .../src/main/lib/jdbc/eagle-jdbc-mysql.sql      |  331 --
 eagle-assembly/src/main/lib/share/.placeholder  |   14 -
 eagle-assembly/src/main/lib/tomcat/LICENSE      | 1050 ----
 eagle-assembly/src/main/lib/tomcat/NOTICE       |   36 -
 .../src/main/lib/tomcat/RELEASE-NOTES           |  230 -
 eagle-assembly/src/main/lib/tomcat/RUNNING.txt  |  478 --
 .../src/main/lib/tomcat/bin/bootstrap.jar       |  Bin 28052 -> 0 bytes
 .../src/main/lib/tomcat/bin/catalina.sh         |  551 ---
 .../src/main/lib/tomcat/bin/commons-daemon.jar  |  Bin 24283 -> 0 bytes
 .../src/main/lib/tomcat/bin/configtest.sh       |   60 -
 .../src/main/lib/tomcat/bin/daemon.sh           |  252 -
 .../src/main/lib/tomcat/bin/digest.sh           |   60 -
 .../src/main/lib/tomcat/bin/setclasspath.sh     |   94 -
 .../src/main/lib/tomcat/bin/shutdown.sh         |   60 -
 .../src/main/lib/tomcat/bin/startup.sh          |   60 -
 .../src/main/lib/tomcat/bin/tomcat-juli.jar     |  Bin 38222 -> 0 bytes
 .../src/main/lib/tomcat/bin/tool-wrapper.sh     |  139 -
 .../src/main/lib/tomcat/bin/version.sh          |   60 -
 .../src/main/lib/tomcat/conf/catalina.policy    |  248 -
 .../main/lib/tomcat/conf/catalina.properties    |  133 -
 .../src/main/lib/tomcat/conf/context.xml        |   35 -
 .../src/main/lib/tomcat/conf/logging.properties |   64 -
 .../src/main/lib/tomcat/conf/server.xml         |  144 -
 .../src/main/lib/tomcat/conf/tomcat-users.xml   |   36 -
 eagle-assembly/src/main/lib/tomcat/conf/web.xml | 4614 ------------------
 .../src/main/lib/tomcat/lib/.keepempty          |   14 -
 .../src/main/lib/topology/.placeholder          |   14 -
 .../src/main/lib/userprofile/.placeholder       |   14 -
 .../eagle-alert-parent/eagle-alert-app/pom.xml  |    5 +-
 ...e.alert.app.AlertUnitTopologyAppProvider.xml |    1 -
 .../eagle-alert-service/pom.xml                 |    5 +-
 .../eagle-alert/alert-assembly/pom.xml          |    5 +-
 .../eagle-alert/alert-common/pom.xml            |    5 +-
 .../eagle-alert/alert-coordinator/pom.xml       |    5 +-
 .../eagle-alert/alert-devtools/pom.xml          |    5 +-
 .../eagle-alert/alert-engine/pom.xml            |    5 +-
 .../alert-metadata-service/pom.xml              |    5 +-
 .../alert-metadata/pom.xml                      |    5 +-
 .../eagle-alert/alert-metadata-parent/pom.xml   |    5 +-
 .../eagle-alert/alert-service/pom.xml           |   11 +-
 .../eagle-alert-parent/eagle-alert/pom.xml      |    5 +-
 eagle-core/eagle-alert-parent/pom.xml           |    2 +-
 eagle-core/eagle-app/eagle-app-base/pom.xml     |    6 +-
 .../config/ApplicationProviderDescConfig.java   |    3 +-
 .../app/ApplicationProviderServiceTest.java     |    3 +
 ....eagle.app.TestStormApplication$Provider.xml |    1 -
 ...he.eagle.app.TestWebApplication$Provider.xml |    3 +-
 eagle-core/eagle-app/eagle-app-utils/pom.xml    |    6 +-
 eagle-core/eagle-app/pom.xml                    |    5 +-
 eagle-core/eagle-common/pom.xml                 |   12 +-
 .../org/apache/eagle/common/Version.java        |    6 +-
 .../org/apache/eagle/common/DateTimeUtil.java   |    8 +
 eagle-core/eagle-data-process/pom.xml           |    5 +-
 .../eagle-embed/eagle-embed-hbase/pom.xml       |    5 +-
 .../eagle-embed/eagle-embed-server/pom.xml      |    5 +-
 eagle-core/eagle-embed/pom.xml                  |    5 +-
 .../eagle-metadata/eagle-metadata-base/pom.xml  |    6 +-
 .../metadata/model/ApplicationDependency.java   |    4 +-
 .../eagle-metadata/eagle-metadata-jdbc/pom.xml  |    6 +-
 ...tore.jdbc.TestStaticApplication$Provider.xml |    1 -
 .../eagle-metadata/eagle-metadata-mongo/pom.xml |    6 +-
 eagle-core/eagle-metadata/pom.xml               |    6 +-
 eagle-core/eagle-metric/pom.xml                 |    5 +-
 eagle-core/eagle-query/eagle-antlr/pom.xml      |    5 +-
 eagle-core/eagle-query/eagle-audit-base/pom.xml |    5 +-
 .../eagle-query/eagle-client-base/pom.xml       |    5 +-
 .../eagle-query/eagle-entity-base/pom.xml       |    5 +-
 eagle-core/eagle-query/eagle-query-base/pom.xml |    5 +-
 .../eagle-query/eagle-service-base/pom.xml      |    5 +-
 .../eagle-query/eagle-storage-base/pom.xml      |    5 +-
 .../eagle-query/eagle-storage-hbase/pom.xml     |    5 +-
 .../eagle-query/eagle-storage-jdbc/pom.xml      |    5 +-
 eagle-core/eagle-query/pom.xml                  |    5 +-
 eagle-core/pom.xml                              |    5 +-
 eagle-examples/eagle-app-example/pom.xml        |    6 +-
 ...e.app.example.ExampleApplicationProvider.xml |    1 -
 eagle-examples/pom.xml                          |    5 +-
 eagle-external/eagle-docker/LICENSE             |    6 +-
 eagle-external/eagle-kafka/pom.xml              |    5 +-
 eagle-external/eagle-log4jkafka/pom.xml         |    5 +-
 eagle-external/pom.xml                          |    5 +-
 eagle-gc/pom.xml                                |    5 +-
 ...apache.eagle.gc.GCLogApplicationProvider.xml |    1 -
 eagle-hadoop-metric/pom.xml                     |    5 +-
 ...le.metric.HadoopMetricMonitorAppProdiver.xml |    1 -
 eagle-jpm/eagle-hadoop-queue/pom.xml            |    6 +-
 ...doop.queue.HadoopQueueRunningAppProvider.xml |    1 -
 eagle-jpm/eagle-jpm-aggregation/pom.xml         |    6 +-
 ...gregation.AggregationApplicationProvider.xml |    1 -
 eagle-jpm/eagle-jpm-entity/pom.xml              |    5 +-
 eagle-jpm/eagle-jpm-mr-history/pom.xml          |    6 +-
 ....history.MRHistoryJobApplicationProvider.xml |    1 -
 eagle-jpm/eagle-jpm-mr-running/pom.xml          |    6 +-
 ....running.MRRunningJobApplicationProvider.xml |    1 -
 eagle-jpm/eagle-jpm-service/pom.xml             |    6 +-
 eagle-jpm/eagle-jpm-spark-history/pom.xml       |    6 +-
 ...spark.history.SparkHistoryJobAppProvider.xml |    1 -
 eagle-jpm/eagle-jpm-spark-running/pom.xml       |    6 +-
 ...spark.running.SparkRunningJobAppProvider.xml |    1 -
 eagle-jpm/eagle-jpm-util/pom.xml                |    6 +-
 eagle-jpm/eagle-jpm-web/pom.xml                 |    6 +-
 ....eagle.app.jpm.JPMWebApplicationProvider.xml |    1 -
 eagle-jpm/pom.xml                               |    5 +-
 eagle-security/eagle-metric-collection/pom.xml  |    2 +-
 eagle-security/eagle-security-common/pom.xml    |    2 +-
 .../eagle-security-hbase-auditlog/pom.xml       |    5 +-
 ....security.hbase.HBaseAuditLogAppProvider.xml |    1 -
 eagle-security/eagle-security-hbase-web/pom.xml |    5 +-
 .../eagle-security-hdfs-auditlog/pom.xml        |    2 +-
 ...ecurity.auditlog.HdfsAuditLogAppProvider.xml |    1 -
 .../eagle-security-hdfs-authlog/pom.xml         |    5 +-
 eagle-security/eagle-security-hdfs-web/pom.xml  |    5 +-
 eagle-security/eagle-security-hive-web/pom.xml  |    5 +-
 eagle-security/eagle-security-hive/pom.xml      |    2 +-
 ....auditlog.HiveQueryMonitoringAppProvider.xml |    1 -
 .../eagle-security-maprfs-auditlog/pom.xml      |    5 +-
 ...urity.auditlog.MapRFSAuditLogAppProvider.xml |    3 +-
 .../eagle-security-maprfs-web/pom.xml           |    5 +-
 .../eagle-security-oozie-auditlog/pom.xml       |    5 +-
 ...ity.oozie.parse.OozieAuditLogAppProvider.xml |    1 -
 eagle-security/eagle-security-oozie-web/pom.xml |    5 +-
 eagle-security/pom.xml                          |    5 +-
 eagle-server-assembly/pom.xml                   |    6 +-
 eagle-server/pom.xml                            |   18 +-
 eagle-topology-assembly/pom.xml                 |    5 +-
 eagle-topology-check/eagle-topology-app/pom.xml |    6 +-
 ....eagle.topology.TopologyCheckAppProvider.xml |    1 -
 .../eagle-topology-entity/pom.xml               |    6 +-
 eagle-topology-check/pom.xml                    |    6 +-
 eagle-webservice/.gitignore                     |    5 -
 .../WebContent/META-INF/MANIFEST.MF             |    3 -
 eagle-webservice/pom.xml                        |  419 --
 .../security/auth/AuthenticationResource.java   |   54 -
 .../security/auth/AuthenticationResult.java     |   47 -
 .../security/auth/AuthoritiesPopulator.java     |   62 -
 .../security/auth/LogoutSuccessHandlerImpl.java |   47 -
 .../service/security/auth/MonitorResource.java  |   44 -
 .../service/security/auth/package-info.java     |   23 -
 .../profile/ApplicationSchedulerListener.java   |   63 -
 .../profile/EagleServiceProfileInitializer.java |   44 -
 .../pwdgen/BasicAuthenticationEncoder.java      |   26 -
 .../pwdgen/PasswordEncoderGenerator.java        |   28 -
 .../src/main/resources/application-derby.conf   |   28 -
 .../src/main/resources/application-hbase.conf   |   23 -
 .../src/main/resources/application-mysql.conf   |   26 -
 .../src/main/resources/application.conf         |   58 -
 .../src/main/resources/applicationContext.xml   |   43 -
 .../src/main/resources/eagle-scheduler.conf     |   42 -
 .../src/main/resources/eagleSecurity.xml        |   90 -
 .../src/main/resources/hbase-default.xml        |  935 ----
 .../src/main/resources/ldap.properties          |   23 -
 .../src/main/resources/log4j.properties         |   26 -
 .../src/main/webapp/META-INF/MANIFEST.MF        |    3 -
 .../src/main/webapp/META-INF/context.xml        |    3 -
 .../src/main/webapp/WEB-INF/web.xml             |  115 -
 .../src/main/webapp/_app/index.html             |  281 --
 .../_app/partials/config/application.html       |  124 -
 .../webapp/_app/partials/config/feature.html    |   85 -
 .../main/webapp/_app/partials/config/site.html  |  115 -
 .../src/main/webapp/_app/partials/landing.html  |   30 -
 .../src/main/webapp/_app/partials/login.html    |   54 -
 .../main/webapp/_app/public/css/animation.css   |   46 -
 .../src/main/webapp/_app/public/css/main.css    |  805 ---
 .../public/feature/classification/controller.js |  358 --
 .../classification/page/sensitivity.html        |   40 -
 .../classification/page/sensitivity/folder.html |  110 -
 .../classification/page/sensitivity/job.html    |   92 -
 .../classification/page/sensitivity/table.html  |  150 -
 .../_app/public/feature/common/controller.js    | 1224 -----
 .../public/feature/common/page/alertDetail.html |   67 -
 .../public/feature/common/page/alertList.html   |   67 -
 .../feature/common/page/policyDetail.html       |  173 -
 .../public/feature/common/page/policyEdit.html  |  346 --
 .../public/feature/common/page/policyList.html  |   84 -
 .../_app/public/feature/metadata/controller.js  |   66 -
 .../feature/metadata/page/streamList.html       |   84 -
 .../_app/public/feature/metrics/controller.js   |  571 ---
 .../public/feature/metrics/page/dashboard.html  |  250 -
 .../_app/public/feature/topology/controller.js  |  257 -
 .../feature/topology/page/management.html       |   52 -
 .../feature/topology/page/monitoring.html       |  151 -
 .../public/feature/userProfile/controller.js    |  268 -
 .../public/feature/userProfile/page/detail.html |   87 -
 .../public/feature/userProfile/page/list.html   |  138 -
 .../main/webapp/_app/public/images/favicon.png  |  Bin 4209 -> 0 bytes
 .../webapp/_app/public/images/favicon_white.png |  Bin 1621 -> 0 bytes
 .../main/webapp/_app/public/js/app.config.js    |  126 -
 .../src/main/webapp/_app/public/js/app.js       |  499 --
 .../src/main/webapp/_app/public/js/app.time.js  |   70 -
 .../src/main/webapp/_app/public/js/app.ui.js    |   76 -
 .../src/main/webapp/_app/public/js/common.js    |  304 --
 .../_app/public/js/components/charts/line3d.js  |  348 --
 .../webapp/_app/public/js/components/file.js    |   50 -
 .../webapp/_app/public/js/components/main.js    |   19 -
 .../webapp/_app/public/js/components/nvd3.js    |  418 --
 .../_app/public/js/components/sortTable.js      |  113 -
 .../_app/public/js/components/sortable.js       |  166 -
 .../webapp/_app/public/js/components/tabs.js    |  247 -
 .../_app/public/js/ctrl/authController.js       |   91 -
 .../public/js/ctrl/configurationController.js   |  377 --
 .../src/main/webapp/_app/public/js/ctrl/main.js |   42 -
 .../webapp/_app/public/js/srv/applicationSrv.js |  170 -
 .../_app/public/js/srv/authorizationSrv.js      |  143 -
 .../webapp/_app/public/js/srv/entitiesSrv.js    |  301 --
 .../src/main/webapp/_app/public/js/srv/main.js  |   72 -
 .../main/webapp/_app/public/js/srv/pageSrv.js   |  131 -
 .../main/webapp/_app/public/js/srv/siteSrv.js   |  193 -
 .../src/main/webapp/_app/public/js/srv/uiSrv.js |  247 -
 .../webapp/_app/public/js/srv/wrapStateSrv.js   |  109 -
 eagle-webservice/ui-build.sh                    |   19 -
 pom.xml                                         |   47 +-
 261 files changed, 205 insertions(+), 25707 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index a32cd9a..39aac98 100755
--- a/LICENSE
+++ b/LICENSE
@@ -201,7 +201,7 @@
    limitations under the License.
 
 ==============================================================================
-Apache Eagle (incubating) Subcomponents:
+Apache Eagle Subcomponents:
 
 The Apache Eagle project contains subcomponents with separate copyright
 notices and license terms. Your use of the source code for the these

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 0f11b69..a0510f1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
-Apache Eagle (incubating)
-Copyright 2015-2016 The Apache Software Foundation
+Apache Eagle
+Copyright 2015-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-assembly/pom.xml b/eagle-assembly/pom.xml
deleted file mode 100644
index 2849ccd..0000000
--- a/eagle-assembly/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>eagle-parent</artifactId>
-        <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>eagle-assembly</artifactId>
-    <dependencies>
-        <!-- tomcat -->
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-jdbc</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-coyote</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-dbcp</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina-ha</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina-ant</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-jasper</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina-ws</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina-jmx-remote</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>eagle-topology-assembly</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>4.0</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptor>src/assembly/eagle-bin.xml</descriptor>
-                    <finalName>eagle-${project.version}</finalName>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <tarLongFileMode>posix</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/assembly/eagle-bin.xml
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/assembly/eagle-bin.xml b/eagle-assembly/src/assembly/eagle-bin.xml
deleted file mode 100644
index dcb62f1..0000000
--- a/eagle-assembly/src/assembly/eagle-bin.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>bin</id>
-    <formats>
-        <format>dir</format>
-        <format>tar.gz</format>
-    </formats>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src/main/lib/data</directory>
-            <outputDirectory>lib/data</outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/bin</directory>
-            <outputDirectory>bin/</outputDirectory>
-            <includes>
-                <include>*.sh</include>
-            </includes>
-            <fileMode>0755</fileMode>
-            <directoryMode>0755</directoryMode>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/bin</directory>
-            <outputDirectory>bin/</outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/conf</directory>
-            <outputDirectory>conf/</outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/../eagle-external/hadoop_jmx_collector</directory>
-            <outputDirectory>tools/hadoop_jmx_collector/</outputDirectory>
-            <includes>
-                <include>**</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/examples</directory>
-            <outputDirectory>examples/</outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-            <excludes>
-                <exclude>*.sh</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/examples</directory>
-            <outputDirectory>examples/</outputDirectory>
-            <includes>
-                <include>*.sh</include>
-            </includes>
-            <fileMode>0755</fileMode>
-            <directoryMode>0755</directoryMode>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main</directory>
-            <outputDirectory>.</outputDirectory>
-            <includes>
-                <include>README.md</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/docs</directory>
-            <outputDirectory>docs/</outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/lib/tomcat/bin</directory>
-            <outputDirectory>lib/tomcat/bin</outputDirectory>
-            <includes>
-                <include>*.sh</include>
-            </includes>
-            <fileMode>0755</fileMode>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/lib/tomcat/bin</directory>
-            <outputDirectory>lib/tomcat/bin</outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/lib/tomcat/conf</directory>
-            <outputDirectory>lib/tomcat/conf</outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-
-        <!-- /lib/logj4kafka -->
-        <fileSet>
-            <directory>${project.basedir}/../eagle-external/eagle-log4jkafka/target/eagle-log4jkafka-build</directory>
-            <outputDirectory>lib/log4jkafka</outputDirectory>
-            <includes>
-                <include>**</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/../eagle-external/eagle-log4jkafka/target/classes/conf</directory>
-            <outputDirectory>lib/log4jkafka/conf</outputDirectory>
-            <includes>
-                <include>**</include>
-            </includes>
-        </fileSet>
-
-        <!-- start of [lib/share] -->
-        <fileSet>
-            <directory>${project.basedir}/../eagle-external/eagle-log4jkafka/target/eagle-log4jkafka-build/lib
-            </directory>
-            <outputDirectory>lib/share</outputDirectory>
-            <includes>
-                <include>**</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/../eagle-external/eagle-kafka/target</directory>
-            <outputDirectory>lib/share</outputDirectory>
-            <includes>
-                <include>eagle-kafka-*.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/lib</directory>
-            <outputDirectory>lib/tomcat/lib</outputDirectory>
-            <includes>
-                <include>tomcat*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/../eagle-webservice/target/eagle-service</directory>
-            <outputDirectory>lib/tomcat/webapps/eagle-service</outputDirectory>
-            <excludes>
-                <exclude>WEB-INF/classes/config.properties</exclude>
-                <exclude>WEB-INF/lib/servlet-api-*.jar</exclude>
-                <exclude>WEB-INF/lib/jsp-api-*.jar</exclude>
-                <!--<exclude>WEB-INF/lib/storm-*.jar</exclude> -->
-                <!--<exclude>WEB-INF/lib/kafka_*.jar</exclude> -->
-                <exclude>WEB-INF/lib/slf4j-log4j12-*.jar</exclude>
-                <exclude>WEB-INF/lib/*-tests.jar</exclude>
-                <exclude>WEB-INF/lib/hadoop-mapreduce-*.jar</exclude>
-                <exclude>WEB-INF/lib/hadoop-minicluster-*.jar</exclude>
-                <exclude>WEB-INF/lib/hadoop-yarn-*.jar</exclude>
-            </excludes>
-            <includes>
-                <include>**</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>${project.basedir}/../eagle-topology-assembly/target</directory>
-            <outputDirectory>lib/topology</outputDirectory>
-            <includes>
-                <include>eagle-topology-*-assembly.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/../eagle-security/eagle-security-userprofile/training/target</directory>
-            <outputDirectory>lib/userprofile</outputDirectory>
-            <includes>
-                <include>eagle-security-userprofile-training-*-assembly.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/lib/userprofile/data</directory>
-            <outputDirectory>lib/userprofile/data</outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>${project.basedir}/../eagle-security/eagle-security-userprofile/training/target/lib</directory>
-            <outputDirectory>lib/share</outputDirectory>
-            <includes>
-                <include>akka-*</include>
-                <include>scala-library-*</include>
-                <include>slf4j-*.jar</include>
-                <include>log4j-*.jar</include>
-                <include>commons-math3-*.jar</include>
-            </includes>
-            <excludes>
-                <exclude>slf4j-log4j12-*.jar</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/target/lib</directory>
-            <outputDirectory>lib/storm</outputDirectory>
-            <includes>
-                <include>storm-core-*.jar</include>
-                <include>asm-*.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/../eagle-external/eagle-ambari</directory>
-            <outputDirectory>lib/ambari</outputDirectory>
-            <includes>
-                <include>**</include>
-            </includes>
-        </fileSet>
-        <!-- copy hadoop metric configuration to assembly -->
-        <fileSet>
-            <directory>${project.basedir}/../eagle-hadoop-metric/src/main/resources</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>hadoop-metric-init.sh</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/README.md
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/README.md b/eagle-assembly/src/main/README.md
deleted file mode 100644
index d9ee25f..0000000
--- a/eagle-assembly/src/main/README.md
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--
-{% comment %}
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-{% endcomment %}
--->
-
-Eagle User Guide
-========================
-
-Prerequisites
--------------
-* Hadoop
-* HBase
-* Storm
-* Spark
-* Kafka
-
-Eagle requires you to have access on Hadoop CLI, where you have full permissions to HDFS, Storm, HBase and Kafka. To make things easier, we strongly recommend you to start Eagle on a hadoop sandbox such as http://hortonworks.com/products/hortonworks-sandbox/
-
-
-Build
------
-
-* Download the latest version of Eagle source code.
-
-		git clone git@github.xyz.com:eagle/eagle.git
-
-
-* Build the source code, and a tar.gz package will be generated under eagle-assembly/target.
-
-		mvn clean compile install -DskipTests
-
-Installation
------------
-* Copy this package onto the sandbox.
-
-		scp -P 2222 eagle/eagle-assembly/target/eagle-0.1.0-bin.tar.gz root@127.0.0.1:/usr/hdp/current/.
-
-* Run Eagle patch installation at the first time, and restart HDFS namenode.
-
-		bin/eagle-patch-install.sh
-
-
-* Start Storm, HBase, and Kafka via Ambari Web UI. Make sure the user has the privilege to run Storm, HBase, and Kafka cmd in shell, and with full permissions to access HBase, such as creating tables. Check the installation & running status of the required services.
-
-		bin/eagle-check-env.sh
-
-
-* Create necessary HBase tables for Eagle.
-
-		bin/eagle-service-init.sh
-
-
-* Start Eagle service.
-
-		bin/eagle-service.sh start
-		
-
-* Create Kafka topics and topology metadata for Eagle.
-
-		bin/eagle-topology-init.sh
-
-
-* Start Eagle topology, which will submit the topology to Storm via the Storm CLI tools. You can check it with storm UI.
-
-		bin/eagle-topology.sh [--jar <jarName>] [--main <mainClass>] [--topology <topologyName>] start
-
-
-Now you can let Eagle to monitor by creating your own policy!
-
-
-Sandbox Starter
----------------
-
-* startup Eagle service & topology
-
-		examples/eagle-sandbox-starter.sh
-		
-* check eagle UI <http://127.0.0.1:9099/eagle-service>
-
-  * If you get a 404 Error when trying to access the UI, add port 9099 to "Settings->Network->Advanced->Port Forwarding" in VirtualBox. (See step 4 in "Setup Hadoop Environment" section in <https://eagle.incubator.apache.org/docs/quick-start.html>)
-
-* Take the following actions which will violate and obey the sample policy.
-     * Violation Action: hdfs dfs -ls unknown
-     * Violation Action: hdfs dfs -touchz /tmp/private
-     * Obey Action: hdfs dfs -cat /tmp/private

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/eagle-ambari.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-ambari.sh b/eagle-assembly/src/main/bin/eagle-ambari.sh
deleted file mode 100755
index 6504cff..0000000
--- a/eagle-assembly/src/main/bin/eagle-ambari.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/eagle-env.sh
-
-$(dirname $0)/../lib/ambari/bin/eagle-ambari.sh $@
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/eagle-check-env.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-check-env.sh b/eagle-assembly/src/main/bin/eagle-check-env.sh
deleted file mode 100755
index bbcae4b..0000000
--- a/eagle-assembly/src/main/bin/eagle-check-env.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-################################################################
-#                    Check Installation                        #
-################################################################
-
-echo "Checking required service installation ..."
-if [ -z "$(command -v hbase version)" ]
-then
-	echo 'please make sure the user has the privilege to run HBase shell'
-	exit 1
-fi
-
-if [ -z "$(command -v storm version)" ]
-then
-	echo 'please make sure the user has the privilege to run storm'
-	exit 1
-fi
-
-if [ -z "$(command -v hadoop version)" ]
-then
-	echo 'please make sure the user has the privilege to run hadoop shell'
-	exit 1
-fi
-
-echo "Hbase & Storm & Hadoop are installed!"
-
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/eagle-env.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-env.sh b/eagle-assembly/src/main/bin/eagle-env.sh
deleted file mode 100755
index 2e01dcd..0000000
--- a/eagle-assembly/src/main/bin/eagle-env.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# set EAGLE_HOME
-export EAGLE_HOME=$(dirname $0)/..
-
-# The java implementation to use. please use jdk 1.7 or later
-# export JAVA_HOME=${JAVA_HOME}
-# export JAVA_HOME=/usr/java/jdk1.7.0_80/
-
-# nimbus.host, default is localhost
-export EAGLE_NIMBUS_HOST=localhost
-
-# EAGLE_SERVICE_HOST, default is `hostname -f`
-export EAGLE_SERVICE_HOST=localhost
-
-# EAGLE_SERVICE_PORT, default is 9099
-export EAGLE_SERVICE_PORT=9099
-
-# EAGLE_SERVICE_USER
-export EAGLE_SERVICE_USER=admin
-
-# EAGLE_SERVICE_PASSWORD
-export EAGLE_SERVICE_PASSWD=secret
-
-export EAGLE_CLASSPATH=$EAGLE_HOME/conf
-# Add eagle shared library jars
-for file in $EAGLE_HOME/lib/share/*;do
-	EAGLE_CLASSPATH=$EAGLE_CLASSPATH:$file
-done
-
-# Add eagle storm library jars
-# Separate out of share directory because of asm version conflict
-export EAGLE_STORM_CLASSPATH=$EAGLE_CLASSPATH
-for file in $EAGLE_HOME/lib/storm/*;do
-	EAGLE_STORM_CLASSPATH=$EAGLE_STORM_CLASSPATH:$file
-done

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/eagle-policy.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-policy.sh b/eagle-assembly/src/main/bin/eagle-policy.sh
deleted file mode 100755
index 6469129..0000000
--- a/eagle-assembly/src/main/bin/eagle-policy.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/eagle-env.sh
-
-function create_policy() {
-    echo "Creating Policy $service_name..."
-    curl -u ${EAGLE_LOGIN_USER}:${EAGLE_LOGIN_PASSWD} -XPOST -H "Content-Type: application/json" \
-        "http://$service_host:$service_port/eagle-service/rest/entities?serviceName=$service_name" \
-        -d @$data_file
-    exit 0
-}
-
-
-function delete_policy() {
-    echo "Deleting policy ..."
-    curl -u ${EAGLE_LOGIN_USER}:${EAGLE_LOGIN_PASSWD}  -XDELETE -H "Content-Type: application/json" \
-         "http://$service_host:$service_port/eagle-service/rest/entities?query=$service_name[@site=\"$site\" AND @dataSource=\"$source\"]{*}&pageSize=10000"
-    if [ $? -eq 0 ]; then
-        echo
-        echo "Deleting Policy $program_id:$policy_id is completed."
-    else
-        echo "Error: deleting failed!"
-        exit 1
-    fi
-}
-
-# by default list all policies, or filter with @policyId and so on
-function list_policy() {
-    if [ -z $site -a -z $dataSource ]; then
-        query="http://$service_host:$service_port/eagle-service/rest/list?query=$service_name[]{*}&pageSize=100000"
-        echo $query
-        curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -XGET --globoff -H "Content-Type: application/json" $query
-    else
-        query="http://$service_host:$service_port/eagle-service/rest/list?query=$service_name[@site=\"$site\" AND @dataSource=\"$source\"]{*}&pageSize=100000"
-        echo $query
-        curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -XGET --globoff -H "Content-Type: application/json" $query
-    fi
-    if [ $? -eq 0 ]; then
-        echo
-        echo "Listing Policy $service_name is completed."
-    else
-        echo "Error: listing policy failed!"
-        exit 1
-    fi
-}
-
-function print_help() {
-    echo "  Usage: $0 options {create | list}"
-    echo "  Options:                     Description:"
-    echo "  --host <serviceHost>         eagle service hostname, default is localhost"
-    echo "  --port <servicePort>         eagle service port, default is 9099"
-    echo "  --serviceName <name>         eagle service name, default is AlertDefinitionService"
-    echo "  --site <site>                Default is sandbox"
-    echo "  --source <dataSource>        Default is hdfsAuditLog"
-    echo "  --file <JsonFile>            policy content"
-    echo "  Examples:"
-    echo "  createCmd: $0 [--host <serviceHost>] [--port <servicePort>] [--name <service>] --file <datafile> create"
-    echo "  listCmd: $0 [--host <serviceHost>] [--port <servicePort>] [--name <service>] [--site <site>] [--source <dataSource>] list"
-}
-
-if [ $# -eq 0 ] 
-then
-	print_help
-	exit 1
-fi
-
-if [ `expr $# % 2` != 1 ]
-then
-    print_help
-    exit 1
-fi
-
-cmd=""
-while [  $# -gt 0  ]; do
-case $1 in
-    "create")
-        cmd=$1
-        shift
-        ;;
-    "delete")
-        cmd=$1
-        shift
-        ;;
-    "list")
-        cmd=$1
-        shift
-        ;;
-     --host)
-        service_host=$2
-        shift 2
-        ;;
-    --port)
-        service_port=$2
-        shift 2
-        ;;
-    --name)
-       service_name=$2
-       shift 2
-       ;;
-    --file)
-        data_file=$2
-        shift 2
-        ;;
-    --site)
-        site=$2
-        shift 2
-        ;;
-    --source)
-        source=$2
-        shift 2
-        ;;
-    *)
-        echo "Internal Error: option processing error: $1" 1>&2
-        exit 1
-        ;;
-    esac
-done
-
-
-if [ -z "$service_host" ]; then
-    service_host=${EAGLE_SERVICE_HOST}
-fi
-
-if [ -z "$service_port" ]; then
-    service_port=${EAGLE_SERVICE_PORT}
-fi
-
-if [ -z "$service_name" ]; then
-    service_name="AlertDefinitionService"
-fi
-
-if [ ! -e $data_file ]; then
-    echo "Error: json file $data_file is not found!"
-    print_help
-    exit 1
-fi
-
-echo "service_host="$service_host "service_port="$service_port "service_name="$service_name
-case $cmd in
-"create")
-	create_policy
-	;;
-"list")
-	list_policy
-	;;
-*)
-	echo "Invalid command"
-	print_help
-    exit 1
-	;;
-esac
-
-exit 0

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/eagle-run-class.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-run-class.sh b/eagle-assembly/src/main/bin/eagle-run-class.sh
deleted file mode 100755
index 6828746..0000000
--- a/eagle-assembly/src/main/bin/eagle-run-class.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [ $# -lt 1 ];
-then
-  echo "USAGE: $0 [-daemon] [-name servicename] [-loggc] classname [opts]"
-  exit 1
-fi
-
-base_dir=$(dirname $0)/..
-
-source $base_dir/bin/eagle-env.sh
-
-export EAGLE_CLASSPATH=$EAGLE_CLASSPATH:$(ls $EAGLE_HOME/lib/userprofile/eagle-security-userprofile-training-*-assembly.jar)
-export EAGLE_CLASSPATH=$EAGLE_CLASSPATH:$(ls $EAGLE_HOME/lib/topology/eagle-topology-*.jar)
-
-if [ -z "$EAGLE_JMX_OPTS" ]; then
-  export EAGLE_JMX_OPTS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false  -Dcom.sun.management.jmxremote.ssl=false "
-fi
-
-# Log directory to use
-if [ "x$EAGLE_LOG_DIR" = "x" ]; then
-    EAGLE_LOG_DIR="$base_dir/logs"
-fi
-
-# create logs directory
-if [ ! -d "$EAGLE_LOG_DIR" ]; then
-	mkdir -p "$EAGLE_LOG_DIR"
-fi
-
-# Log4j settings
-if [ -z "$EAGLE_LOG4J_OPTS" ]; then
-  # Log to console. This is a tool.
-  EAGLE_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/conf/tools-log4j.properties"
-else
-  # create logs directory
-  if [ ! -d "$EAGLE_LOG_DIR" ]; then
-    mkdir -p "$EAGLE_LOG_DIR"
-  fi
-fi
-
-# Generic jvm settings you want to add
-if [ -z "$EAGLE_OPTS" ]; then
-  EAGLE_OPTS=""
-fi
-
-# Which java to use
-if [ -z "$JAVA_HOME" ]; then
-  JAVA="java"
-else
-  JAVA="$JAVA_HOME/bin/java"
-fi
-
-# Memory options
-if [ -z "$EAGLE_HEAP_OPTS" ]; then
-  EAGLE_HEAP_OPTS="-Xmx256M"
-fi
-
-# JVM performance options
-if [ -z "$EAGLE_JVM_PERFORMANCE_OPTS" ]; then
-  EAGLE_JVM_PERFORMANCE_OPTS="-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+DisableExplicitGC -Djava.awt.headless=true"
-fi
-
-while [ $# -gt 0 ]; do
-  COMMAND=$1
-  case $COMMAND in
-    -name)
-      DAEMON_NAME=$2
-      CONSOLE_OUTPUT_FILE=$EAGLE_LOG_DIR/$DAEMON_NAME.out
-      shift 2
-      ;;
-    -loggc)
-      if [ -z "$EAGLE_GC_LOG_OPTS" ]; then
-        GC_LOG_ENABLED="true"
-      fi
-      shift
-      ;;
-    -daemon)
-      DAEMON_MODE="true"
-      shift
-      ;;
-    *)
-      break
-      ;;
-  esac
-done
-
-# GC options
-GC_FILE_SUFFIX='-gc.log'
-GC_LOG_FILE_NAME=''
-if [ "x$GC_LOG_ENABLED" = "xtrue" ]; then
-  GC_LOG_FILE_NAME=$DAEMON_NAME$GC_FILE_SUFFIX
-  EAGLE_GC_LOG_OPTS="-Xloggc:$LOG_DIR/$GC_LOG_FILE_NAME -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps "
-fi
-
-# Launch mode
-if [ "x$DAEMON_MODE" = "xtrue" ]; then
-  nohup $JAVA $EAGLE_HEAP_OPTS $EAGLE_JVM_PERFORMANCE_OPTS $EAGLE_GC_LOG_OPTS $EAGLE_JMX_OPTS $EAGLE_LOG4J_OPTS -cp $EAGLE_CLASSPATH $EAGLE_OPTS "$@" > "$CONSOLE_OUTPUT_FILE" 2>&1 < /dev/null &
-else
-  exec $JAVA $EAGLE_HEAP_OPTS $EAGLE_JVM_PERFORMANCE_OPTS $EAGLE_GC_LOG_OPTS $EAGLE_JMX_OPTS $EAGLE_LOG4J_OPTS -cp $EAGLE_CLASSPATH $EAGLE_OPTS "$@"
-fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/eagle-service.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-service.sh b/eagle-assembly/src/main/bin/eagle-service.sh
deleted file mode 100755
index 844a079..0000000
--- a/eagle-assembly/src/main/bin/eagle-service.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-function print_help() {
-	echo "Usage: $0 {start | stop | restart | status}"
-	exit 1
-}
-
-if [ $# != 1 ]
-then
-	print_help
-fi
-
-source $(dirname $0)/eagle-env.sh
-
-export CATALINA_HOME=$EAGLE_HOME/lib/tomcat
-export CATALINA_BASE=$CATALINA_HOME
-
-export CATALINA_LOGDIR=$EAGLE_HOME/logs
-export CATALINA_TMPDIR=$EAGLE_HOME/temp
-export CATALINA_OUT=$CATALINA_LOGDIR/eagle-service.out
-export CATALINA_PID=$CATALINA_TMPDIR/service.pid
-export JAVA_OPTS="-Xmx3072m -XX:MaxPermSize=1024m"
-
-# CLASSPATH
-export CLASSPATH=$CLASSPATH:$EAGLE_HOME/conf
-
-#for i in `ls $EAGLE_HOME/lib/*.jar`; do CLASSPATH=$CLASSPATH:$i; done
-
-if [ ! -e $CATALINA_LOGDIR ];then
-    mkdir -p $CATALINA_LOGDIR
-fi
-
-if [ ! -e $CATALINA_TMPDIR ]; then
-    mkdir -p $CATALINA_TMPDIR
-fi
-
-
-EAGLE_SERVICE_CONF="eagle-service.conf"
-EAGLE_LDAP_CONF="ldap.properties"
-EAGLE_SCHEDULER_CONF="eagle-scheduler.conf"
-
-# Always copy conf/eagle-service.properties to lib/tomcat/webapps/eagle-service/WEB-INF/classes/application.conf before starting
-if [ ! -e ${EAGLE_HOME}/conf/${EAGLE_SERVICE_CONF} ]
-then
-	echo "Failure: cannot find ${EAGLE_HOME}/conf/${EAGLE_SERVICE_CONF}"
-	exit 1
-fi
-cp -f $EAGLE_HOME/conf/$EAGLE_SERVICE_CONF ${EAGLE_HOME}/lib/tomcat/webapps/eagle-service/WEB-INF/classes/application.conf
-
-if [ -e ${EAGLE_HOME}/conf/${EAGLE_LDAP_CONF} ]
-then
-	cp -f $EAGLE_HOME/conf/$EAGLE_LDAP_CONF ${EAGLE_HOME}/lib/tomcat/webapps/eagle-service/WEB-INF/classes/
-fi
-if [ -e ${EAGLE_HOME}/conf/${EAGLE_SCHEDULER_CONF} ]
-then
-	cp -f $EAGLE_HOME/conf/$EAGLE_SCHEDULER_CONF ${EAGLE_HOME}/lib/tomcat/webapps/eagle-service/WEB-INF/classes/
-fi
-
-
-case $1 in
-"start")
-	echo "Starting eagle service ..."
-	$EAGLE_HOME/lib/tomcat/bin/catalina.sh start
-	if [ $? != 0 ];then 
-		echo "Error: failed starting"
-		exit 1
-	fi
-	;;
-"stop")
-	echo "Stopping eagle service ..."
-	$EAGLE_HOME/lib/tomcat/bin/catalina.sh stop
-	if [ $? != 0 ];then
-		echo "Error: failed stopping"
-		exit 1
-	fi
-	echo "Stopping is completed"
-	;;
-"restart")
-	echo "Stopping eagle service ..."
-	$EAGLE_HOME/lib/tomcat/bin/catalina.sh stop
-	echo "Restarting eagle service ..."
-	$EAGLE_HOME/lib/tomcat/bin/catalina.sh start
-	if [ $? != 0 ];then
-		echo "Error: failed starting"
-		exit 1
-	fi
-	echo "Restarting is completed "
-	;;
-"status")
-	#echo "Listing eagle service status ..."
-	if [ -e $CATALINA_TMPDIR/service.pid ]  && ps -p `cat $CATALINA_TMPDIR/service.pid`  > /dev/null
-	then
-		echo "Eagle service is running `cat $CATALINA_TMPDIR/service.pid`"
-		exit 0
-	else
-		echo "Eagle service is stopped"
-		exit 1
-	fi
-	;;
-*)
-	print_help
-	;;
-esac
-
-if [ $? != 0 ]; then
-	echo "Error: start failure"
-	exit 1
-fi
-
-exit 0
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/eagle-topology-init.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-topology-init.sh b/eagle-assembly/src/main/bin/eagle-topology-init.sh
deleted file mode 100755
index 365fa99..0000000
--- a/eagle-assembly/src/main/bin/eagle-topology-init.sh
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with`
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/eagle-env.sh
-eagle_bin=$EAGLE_HOME/bin
-
-
-#####################################################################
-#            Import stream metadata for HDFS
-#####################################################################
-
-## AlertDataSource: data sources bound to sites
-
-echo "Begin to initialize HBase tables ..."
-
-echo ""
-echo "Importing sample site ..."
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=SiteDescService" -d '[{"prefix":"eagleSiteDesc","tags":{"site" : "sandbox"}, "enabled": true}]'
-
-echo ""
-echo "Importing applications for sample site ..."
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=SiteApplicationService" -d '[{"prefix":"eagleSiteApplication","tags":{"site" : "sandbox", "application":"hdfsAuditLog"}, "enabled": true, "config" : "classification.fs.defaultFS=hdfs://sandbox.hortonworks.com:8020"}]'
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=SiteApplicationService" -d '[{"prefix":"eagleSiteApplication","tags":{"site" : "sandbox", "application":"hbaseSecurityLog"}, "enabled": true, "config" : "classification.hbase.zookeeper.property.clientPort=2181\nclassification.hbase.zookeeper.quorum=sandbox.hortonworks.com"}]'
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=SiteApplicationService" -d '[{"prefix":"eagleSiteApplication","tags":{"site" : "sandbox", "application":"hiveQueryLog"}, "enabled": true, "config":"classification.accessType=metastoredb_jdbc\nclassification.password=hive\nclassification.user=hive\nclassification.jdbcDriverClassName=com.mysql.jdbc.Driver\nclassification.jdbcUrl=jdbc:mysql://sandbox.hortonworks.com/hive?createDatabaseIfNotExist=true"}]'
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=SiteApplicationService" -d '[{"prefix":"eagleSiteApplication","tags":{"site" : "sandbox", "application":"oozieAuditLog"}, "enabled": true, "config" : "classification.accessType=oozie_api\nclassification.oozieUrl=http://localhost:11000/oozie\nclassification.filter=status=RUNNING\nclassification.authType=SIMPLE"}]'
-
-echo ""
-echo "Importing application definitions ..."
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=ApplicationDescService" -d '[{"prefix":"eagleApplicationDesc","tags":{"application":"hdfsAuditLog"},"description":"HDFS audit log security check application","alias":"HDFS","groupName":"DAM","features":["common","classification","userProfile","metadata"],"config":"{\n\t\"view\": {\n\t\t\"prefix\": \"fileSensitivity\",\n\t\t\"service\": \"FileSensitivityService\",\n\t\t\"keys\": [\n\t\t\t\"filedir\",\n\t\t\t\"sensitivityType\"\n\t\t],\n\t\t\"type\": \"folder\",\n\t\t\"api\": \"hdfsResource\"\n\t}\n}"}]'
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=ApplicationDescService" -d '[{"prefix":"eagleApplicationDesc","tags":{"application":"hbaseSecurityLog"},"description":"HBASE audit log security check application","alias":"HBASE","groupName":"DAM","features":["common","classification","userProfile","metadata"],"config":"{\n\t\"view\": {\n\t\t\"prefix\": \"hbaseResourceSensitivity\",\n\t\t\"service\": \"HbaseResourceSensitivityService\",\n\t\t\"keys\": [\n\t\t\t\"hbaseResource\",\n\t\t\t\"sensitivityType\"\n\t\t],\n\t\t\"type\": \"table\",\n\t\t\"api\": {\n\t\t\t\"database\": \"hbaseResource/namespaces\",\n\t\t\t\"table\": \"hbaseResource/tables\",\n\t\t\t\"column\": \"hbaseResource/columns\"\n\t\t},\n\t\t\"mapping\": {\n\t\t\t\"database\": \"namespace\",\n\t\t\t\"table\": \"table\",\n\t\t\t\"column\": \"columnFamily\"\n\t\t}\n\t}\n}"}]'
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=ApplicationDescService" -d '[{"prefix":"eagleApplicationDesc","tags":{"application":"hiveQueryLog"},"description":"Hive query log security check application","alias":"HIVE","groupName":"DAM","features":["common","classification","userProfile","metadata"], "config":"{\n\t\"view\": {\n\t\t\"prefix\": \"hiveResourceSensitivity\",\n\t\t\"service\": \"HiveResourceSensitivityService\",\n\t\t\"keys\": [\n\t\t\t\"hiveResource\",\n\t\t\t\"sensitivityType\"\n\t\t],\n\t\t\"type\": \"table\",\n\t\t\"api\": {\n\t\t\t\"database\": \"hiveResource/databases\",\n\t\t\t\"table\": \"hiveResource/tables\",\n\t\t\t\"column\": \"hiveResource/columns\"\n\t\t},\n\t\t\"mapping\": {\n\t\t\t\"database\": \"database\",\n\t\t\t\"table\": \"table\",\n\t\t\t\"column\": \"column\"\n\t\t}\n\t}\n}"}]'
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=ApplicationDescService" -d '[{"prefix":"eagleApplicationDesc","tags":{"application":"oozieAuditLog"},"description":"Oozie audit log security check application","alias":"OOZIE","groupName":"DAM","features":["common","classification","metadata"],"config":"{\n\t\"view\": {\n\t\t\"prefix\": \"oozieResourceSensitivity\",\n\t\t\"service\": \"OozieResourceSensitivityService\",\n\t\t\"keys\": [\n\t\t\t\"oozieResource\",\n\t\t\t\"sensitivityType\"\n\t\t],\n\t\t\"type\": \"job\",\n\t\t\"api\": \"oozieResource/coordinators\"\n\t}\n}"}]'
-
-echo ""
-echo "Importing feature definitions ..."
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=FeatureDescService" -d '[{"prefix":"eagleFeatureDesc","tags":{"feature":"common"},"description":"Provide the Policy & Alert feature.","version":"v0.3.0"}]'
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=FeatureDescService" -d '[{"prefix":"eagleFeatureDesc","tags":{"feature":"classification"},"description":"Sensitivity browser of the data classification.","version":"v0.3.0"}]'
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=FeatureDescService" -d '[{"prefix":"eagleFeatureDesc","tags":{"feature":"userProfile"},"description":"Machine learning of the user profile","version":"v0.3.0"}]'
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=FeatureDescService" -d '[{"prefix":"eagleFeatureDesc","tags":{"feature":"metadata"},"description":"Stream metadata viewer","version":"v0.3.0"}]'
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=FeatureDescService" -d '[{"prefix":"eagleFeatureDesc","tags":{"feature":"metrics"},"description":"Metrics dashboard","version":"v0.3.0"}]'
-
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=FeatureDescService" -d '[{"prefix":"eagleFeatureDesc","tags":{"feature":"topology"},"description":"Application topology management feature","version":"v0.4.0"}]'
-
-
-## AlertStreamService: alert streams generated from data source
-echo ""
-echo "Importing AlertStreamService for HDFS... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertStreamService" -d '[{"prefix":"alertStream","tags":{"application":"hdfsAuditLog","streamName":"hdfsAuditLogEventStream"},"description":"alert event stream from hdfs audit log"}]'
-
-## AlertExecutorService: what alert streams are consumed by alert executor
-echo ""
-echo "Importing AlertExecutorService for HDFS... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertExecutorService" -d '[{"prefix":"alertExecutor","tags":{"application":"hdfsAuditLog","alertExecutorId":"hdfsAuditLogAlertExecutor","streamName":"hdfsAuditLogEventStream"},"description":"alert executor for hdfs audit log event stream"}]'
-
-## AlertStreamSchemaService: schema for event from alert stream
-echo ""
-echo "Importing AlertStreamSchemaService for HDFS... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertStreamSchemaService" -d '[{"prefix":"alertStreamSchema","tags":{"application":"hdfsAuditLog","streamName":"hdfsAuditLogEventStream","attrName":"src"},"attrDescription":"source directory or file, such as /tmp","attrType":"string","category":"","attrValueResolver":"org.apache.eagle.service.security.hdfs.resolver.HDFSResourceResolver"},{"prefix":"alertStreamSchema","tags":{"application":"hdfsAuditLog","streamName":"hdfsAuditLogEventStream","attrName":"dst"},"attrDescription":"destination directory, such as /tmp","attrType":"string","category":"","attrValueResolver":"org.apache.eagle.service.security.hdfs.resolver.HDFSResourceResolver"},{"prefix":"alertStreamSchema","tags":{"application":"hdfsAuditLog","streamName":"hdfsAuditLogEventStream","attrName":"host"},"attrDescription":"hostname, 
 such as localhost","attrType":"string","category":"","attrValueResolver":""},{"prefix":"alertStreamSchema","tags":{"application":"hdfsAuditLog","streamName":"hdfsAuditLogEventStream","attrName":"timestamp"},"attrDescription":"milliseconds of the datetime","attrType":"long","category":"","attrValueResolver":""},{"prefix":"alertStreamSchema","tags":{"application":"hdfsAuditLog","streamName":"hdfsAuditLogEventStream","attrName":"allowed"},"attrDescription":"true, false or none","attrType":"bool","category":"","attrValueResolver":""},{"prefix":"alertStreamSchema","tags":{"application":"hdfsAuditLog","streamName":"hdfsAuditLogEventStream","attrName":"user"},"attrDescription":"process user","attrType":"string","category":"","attrValueResolver":""},{"prefix":"alertStreamSchema","tags":{"application":"hdfsAuditLog","streamName":"hdfsAuditLogEventStream","attrName":"cmd"},"attrDescription":"file/directory operation, such as getfileinfo, open, listStatus and so on","attrType":"string","catego
 ry":"","attrValueResolver":"org.apache.eagle.service.security.hdfs.resolver.HDFSCommandResolver"},{"prefix":"alertStreamSchema","tags":{"application":"hdfsAuditLog","streamName":"hdfsAuditLogEventStream","attrName":"sensitivityType"},"attrDescription":"mark such as AUDITLOG, SECURITYLOG","attrType":"string","category":"","attrValueResolver":"org.apache.eagle.service.security.hdfs.resolver.HDFSSensitivityTypeResolver"},{"prefix":"alertStreamSchema","tags":{"application":"hdfsAuditLog","streamName":"hdfsAuditLogEventStream","attrName":"securityZone"},"attrDescription":"","attrType":"string","category":"","attrValueResolver":""}]'
-
-
-#####################################################################
-#            Import stream metadata for HBASE
-#####################################################################
-
-#### AlertStreamService: alert streams generated from data source
-echo ""
-echo "Importing AlertStreamService for HBASE... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertStreamService" -d '[{"prefix":"alertStream","tags":{"application":"hbaseSecurityLog","streamName":"hbaseSecurityLogEventStream"},"description":"alert event stream from hbase security audit log"}]'
-
-
-#### AlertExecutorService: what alert streams are consumed by alert executor
-echo ""
-echo "Importing AlertExecutorService for HBASE... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertExecutorService" -d '[{"prefix":"alertExecutor","tags":{"application":"hbaseSecurityLog","alertExecutorId":"hbaseSecurityLogAlertExecutor","streamName":"hbaseSecurityLogEventStream"},"description":"alert executor for hbase security log event stream"}]'
-
-
-#### AlertStreamSchemaService: schema for event from alert stream
-echo ""
-echo "Importing AlertStreamSchemaService for HBASE... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertStreamSchemaService" -d '[{"prefix":"alertStreamSchema","tags":{"application":"hbaseSecurityLog","streamName":"hbaseSecurityLogEventStream","attrName":"host"},"attrDescription":"remote ip address to access hbase","attrType":"string","category":"","attrValueResolver":""},{"prefix":"alertStreamSchema","tags":{"application":"hbaseSecurityLog","streamName":"hbaseSecurityLogEventStream","attrName":"request"},"attrDescription":"","attrType":"string","category":"","attrValueResolver":"org.apache.eagle.service.security.hbase.resolver.HbaseRequestResolver"},{"prefix":"alertStreamSchema","tags":{"application":"hbaseSecurityLog","streamName":"hbaseSecurityLogEventStream","attrName":"status"},"attrDescription":"access status: allowed or denied","attrType":"string","category":"","attrValueResolver
 ":""},{"prefix":"alertStreamSchema","tags":{"application":"hbaseSecurityLog","streamName":"hbaseSecurityLogEventStream","attrName":"user"},"attrDescription":"hbase user","attrType":"string","category":"","attrValueResolver":""},{"prefix":"alertStreamSchema","tags":{"application":"hbaseSecurityLog","streamName":"hbaseSecurityLogEventStream","attrName":"timestamp"},"attrDescription":"milliseconds of the datetime","attrType":"long","category":"","attrValueResolver":""},{"prefix":"alertStreamSchema","tags":{"application":"hbaseSecurityLog","streamName":"hbaseSecurityLogEventStream","attrName":"scope"},"attrDescription":"the resources which users are then granted specific permissions (Read, Write, Execute, Create, Admin) against","attrType":"string","category":"","attrValueResolver":"org.apache.eagle.service.security.hbase.resolver.HbaseMetadataResolver"},{"prefix":"alertStreamSchema","tags":{"application":"hbaseSecurityLog","streamName":"hbaseSecurityLogEventStream","attrName":"action"}
 ,"attrDescription":"action types, such as read, write, create, execute, and admin","attrType":"string","category":"","attrValueResolver":"org.apache.eagle.service.security.hbase.resolver.HbaseActionResolver"},{"prefix":"alertStreamSchema","tags":{"application":"hbaseSecurityLog","streamName":"hbaseSecurityLogEventStream","attrName":"sensitivityType"},"attrDescription":"","attrType":"string","category":"","attrValueResolver":"org.apache.eagle.service.security.hbase.resolver.HbaseSensitivityTypeResolver"}]'
-
-
-#####################################################################
-#            Import stream metadata for HIVE
-#####################################################################
-
-## AlertStreamService: alert streams generated from data source
-echo ""
-echo "Importing AlertStreamService for HIVE... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertStreamService" -d '[{"prefix":"alertStream","tags":{"application":"hiveQueryLog","streamName":"hiveAccessLogStream"},"description":"alert event stream from hive query"}]'
-
-## AlertExecutorService: what alert streams are consumed by alert executor
-echo ""
-echo "Importing AlertExecutorService for HIVE... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertExecutorService" -d '[{"prefix":"alertExecutor","tags":{"application":"hiveQueryLog","alertExecutorId":"hiveAccessAlertByRunningJob","streamName":"hiveAccessLogStream"},"description":"alert executor for hive query log event stream"}]'
-
-## AlertStreamSchemaServiceService: schema for event from alert stream
-echo ""
-echo "Importing AlertStreamSchemaService for HIVE... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertStreamSchemaService" -d '[{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"process user","attrValueResolver":"","tags":{"application":"hiveQueryLog","streamName":"hiveAccessLogStream","attrName":"user"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"hive sql command, such as SELECT, INSERT and DELETE","attrValueResolver":"org.apache.eagle.service.security.hive.resolver.HiveCommandResolver","tags":{"application":"hiveQueryLog","streamName":"hiveAccessLogStream","attrName":"command"}},{"prefix":"alertStreamSchema","category":"","attrType":"long","attrDescription":"milliseconds of the datetime","attrValueResolver":"","tags":{"application":"hiveQueryLog","streamName":"hiveAccessLogStream","attrName":"timestamp"}},{"pre
 fix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"/database/table/column or /database/table/*","attrValueResolver":"org.apache.eagle.service.security.hive.resolver.HiveMetadataResolver","tags":{"application":"hiveQueryLog","streamName":"hiveAccessLogStream","attrName":"resource"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"mark such as PHONE_NUMBER","attrValueResolver":"org.apache.eagle.service.security.hive.resolver.HiveSensitivityTypeResolver","tags":{"application":"hiveQueryLog","streamName":"hiveAccessLogStream","attrName":"sensitivityType"}}]'
-
-#####################################################################
-#            Import stream metadata for UserProfile
-#####################################################################
-
-
-echo ""
-echo "Importing AlertDefinitionService for USERPROFILE"
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H "Content-Type: application/json"  "http://$EAGLE_SERVICE_HOST:$EAGLE_SERVICE_PORT/eagle-service/rest/entities?serviceName=AlertDefinitionService" \
-     -d '[ { "prefix": "alertdef", "tags": { "site": "sandbox", "application": "userProfile", "alertExecutorId": "userProfileAnomalyDetectionExecutor", "policyId": "userProfile", "policyType": "MachineLearning" }, "description": "user profile anomaly detection", "policyDef": "{\"type\":\"MachineLearning\",\"alertContext\":{\"site\":\"sandbox\",\"application\":\"userProfile\",\"component\":\"testComponent\",\"description\":\"ML based user profile anomaly detection\",\"severity\":\"WARNING\",\"notificationByEmail\":\"true\"},\"algorithms\":[{\"name\":\"EigenDecomposition\",\"evaluator\":\"org.apache.eagle.security.userprofile.impl.UserProfileAnomalyEigenEvaluator\",\"description\":\"EigenBasedAnomalyDetection\",\"features\":\"getfileinfo, open, listStatus, setTimes, setPermission, rename, mkdirs, create, setReplication, contentSummary, delete, setOwner, fsck\"},{\"name\":\"KDE\",\"evaluator\":\"org.apache.eagle.security.userprofile.impl.UserProfileAnomalyKDEEvaluator\",\"description\"
 :\"DensityBasedAnomalyDetection\",\"features\":\"getfileinfo, open, listStatus, setTimes, setPermission, rename, mkdirs, create, setReplication, contentSummary, delete, setOwner, fsck\"}]}", "dedupeDef": "{\"alertDedupIntervalMin\":\"0\",\"emailDedupIntervalMin\":\"0\"}", "notificationDef": "", "remediationDef": "", "enabled": true } ]'
-
-echo ""
-echo "Importing AlertExecutorService for USERPROFILE"
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H "Content-Type: application/json"  "http://$EAGLE_SERVICE_HOST:$EAGLE_SERVICE_PORT/eagle-service/rest/entities?serviceName=AlertExecutorService" \
-      -d '[ { "prefix": "alertExecutor", "tags":{ "site":"sandbox", "application":"userProfile", "alertExecutorId" : "userProfileAnomalyDetectionExecutor", "streamName":"userActivity" }, "description": "user activity data source" } ]'
-
-echo ""
-echo "Importing AlertStreamService for USERPROFILE"
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H "Content-Type: application/json"  "http://$EAGLE_SERVICE_HOST:$EAGLE_SERVICE_PORT/eagle-service/rest/entities?serviceName=AlertStreamService" \
-     -d '[ { "prefix": "alertStream", "tags": { "streamName": "userActivity", "site":"sandbox", "application":"userProfile" }, "alertExecutorIdList": [ "userProfileAnomalyDetectionExecutor" ] } ]'
-
-#####################################################################
-#            Import stream metadata for OOZIE
-#####################################################################
-
-## AlertStreamService: alert streams generated from data source
-echo ""
-echo "Importing AlertStreamService for OOZIE... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertStreamService" -d '[{"prefix":"alertStream","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream"},"description":"alert event stream from oozie audit log"}]'
-
-## AlertExecutorService: what alert streams are consumed by alert executor
-echo ""
-echo "Importing AlertExecutorService for OOZIE... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertExecutorService" -d '[{"prefix":"alertExecutor","tags":{"application":"oozieAuditLog","alertExecutorId":"oozieAuditLogAlertExecutor","streamName":"oozieSecurityLogEventStream"},"description":"alert executor for oozie audit log event stream"}]'
-
-## AlertStreamSchemaServiceService: schema for event from alert stream
-echo ""
-echo "Importing AlertStreamSchemaService for OOZIE... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertStreamSchemaService" -d '[{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"errorcode"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"httpcode"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"log level such as INFO,DEBUG","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"level"}},{"prefix":"alertStreamSchema","category":"","attrType":"long","attrDescription":"milliseconds of the dat
 etime","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"timestamp"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"ip"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"user"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"app"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"group"}},{"prefix":"alertStreamSchem
 a","category":"","attrType":"string","attrDescription":"such as start kill suspend resume","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"operation"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"jobId"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"status"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"errormessage"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"","attrValueResolver":"","tags":{"application":"oozieAud
 itLog","streamName":"oozieSecurityLogEventStream","attrName":"sensitivityType"}},{"prefix":"alertStreamSchema","category":"","attrType":"string","attrDescription":"","attrValueResolver":"","tags":{"application":"oozieAuditLog","streamName":"oozieSecurityLogEventStream","attrName":"parameter"}}]'
-
-
-#####################################################################
-#     Import notification plugin configuration into Eagle Service   #
-#####################################################################
-
-## AlertNotificationService : schema for notifcation plugin configuration
-echo ""
-echo "Importing notification plugin configurations ... "
-curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' \
- "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertNotificationService" \
- -d '
- [
-     {
-       "prefix": "alertNotifications",
-       "tags": {
-         "notificationType": "email"
-       },
-       "className": "org.apache.eagle.notification.plugin.AlertEmailPlugin",
-       "description": "send alert to email",
-       "enabled":true,
-       "fields": [{"name":"sender"},{"name":"recipients"},{"name":"subject"}]
-     },
-     {
-       "prefix": "alertNotifications",
-       "tags": {
-         "notificationType": "kafka"
-       },
-       "className": "org.apache.eagle.notification.plugin.AlertKafkaPlugin",
-       "description": "send alert to kafka bus",
-       "enabled":true,
-       "fields": [{"name":"kafka_broker","value":"sandbox.hortonworks.com:6667"},{"name":"topic"}]
-     },
-     {
-       "prefix": "alertNotifications",
-       "tags": {
-         "notificationType": "eagleStore"
-       },
-       "className": "org.apache.eagle.notification.plugin.AlertEagleStorePlugin",
-       "description": "send alert to eagle store",
-       "enabled":true
-     }
- ]
- '
-
-## Finished
-echo ""
-echo "Finished initialization for eagle topology"
-
-exit 0


[12/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/docs/kafka.rb
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/docs/kafka.rb b/eagle-assembly/src/main/docs/kafka.rb
deleted file mode 100644
index 4c5f9b3..0000000
--- a/eagle-assembly/src/main/docs/kafka.rb
+++ /dev/null
@@ -1,191 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'logstash/namespace'
-require 'logstash/outputs/base'
-require 'jruby-kafka'
-
-# Write events to a Kafka topic. This uses the Kafka Producer API to write messages to a topic on
-# the broker.
-#
-# The only required configuration is the topic name. The default codec is json,
-# so events will be persisted on the broker in json format. If you select a codec of plain,
-# Logstash will encode your messages with not only the message but also with a timestamp and
-# hostname. If you do not want anything but your message passing through, you should make the output
-# configuration something like:
-# [source,ruby]
-#     output {
-#       kafka {
-#         codec => plain {
-#            format => "%{message}"
-#         }
-#       }
-#     }
-# For more information see http://kafka.apache.org/documentation.html#theproducer
-#
-# Kafka producer configuration: http://kafka.apache.org/documentation.html#producerconfigs
-class LogStash::Outputs::Kafka < LogStash::Outputs::Base
-  config_name 'kafka'
-  milestone 2
-
-  default :codec, 'json'
-  # This is for bootstrapping and the producer will only use it for getting metadata (topics,
-  # partitions and replicas). The socket connections for sending the actual data will be
-  # established based on the broker information returned in the metadata. The format is
-  # `host1:port1,host2:port2`, and the list can be a subset of brokers or a VIP pointing to a
-  # subset of brokers.
-  config :broker_list, :validate => :string, :default => 'localhost:9092'
-  # The topic to produce the messages to
-  config :topic_id, :validate => :string, :required => true
-  # This parameter allows you to specify the compression codec for all data generated by this
-  # producer. Valid values are `none`, `gzip` and `snappy`.
-  config :compression_codec, :validate => %w( none gzip snappy ), :default => 'none'
-  # This parameter allows you to set whether compression should be turned on for particular
-  # topics. If the compression codec is anything other than `NoCompressionCodec`,
-  # enable compression only for specified topics if any. If the list of compressed topics is
-  # empty, then enable the specified compression codec for all topics. If the compression codec
-  # is `NoCompressionCodec`, compression is disabled for all topics
-  config :compressed_topics, :validate => :string, :default => ''
-  # This value controls when a produce request is considered completed. Specifically,
-  # how many other brokers must have committed the data to their log and acknowledged this to the
-  # leader. For more info, see -- http://kafka.apache.org/documentation.html#producerconfigs
-  config :request_required_acks, :validate => [-1,0,1], :default => 0
-  # The serializer class for messages. The default encoder takes a byte[] and returns the same byte[]
-  config :serializer_class, :validate => :string, :default => 'kafka.serializer.StringEncoder'
-  # The partitioner class for partitioning messages amongst partitions in the topic. The default
-  # partitioner is based on the hash of the key. If the key is null,
-  # the message is sent to a random partition in the broker.
-  # NOTE: `topic_metadata_refresh_interval_ms` controls how long the producer will distribute to a
-  # partition in the topic. This defaults to 10 mins, so the producer will continue to write to a
-  # single partition for 10 mins before it switches
-  config :partitioner_class, :validate => :string, :default => 'kafka.producer.DefaultPartitioner'
-  # The amount of time the broker will wait trying to meet the `request.required.acks` requirement
-  # before sending back an error to the client.
-  config :request_timeout_ms, :validate => :number, :default => 10000
-  # This parameter specifies whether the messages are sent asynchronously in a background thread.
-  # Valid values are (1) async for asynchronous send and (2) sync for synchronous send. By
-  # setting the producer to async we allow batching together of requests (which is great for
-  # throughput) but open the possibility of a failure of the client machine dropping unsent data.
-  config :producer_type, :validate => %w( sync async ), :default => 'sync'
-  # The serializer class for keys (defaults to the same as for messages if nothing is given)
-  config :key_serializer_class, :validate => :string, :default => 'kafka.serializer.StringEncoder'
-  # This property will cause the producer to automatically retry a failed send request. This
-  # property specifies the number of retries when such failures occur. Note that setting a
-  # non-zero value here can lead to duplicates in the case of network errors that cause a message
-  # to be sent but the acknowledgement to be lost.
-  config :message_send_max_retries, :validate => :number, :default => 3
-  # Before each retry, the producer refreshes the metadata of relevant topics to see if a new
-  # leader has been elected. Since leader election takes a bit of time,
-  # this property specifies the amount of time that the producer waits before refreshing the
-  # metadata.
-  config :retry_backoff_ms, :validate => :number, :default => 100
-  # The producer generally refreshes the topic metadata from brokers when there is a failure
-  # (partition missing, leader not available...). It will also poll regularly (default: every
-  # 10min so 600000ms). If you set this to a negative value, metadata will only get refreshed on
-  # failure. If you set this to zero, the metadata will get refreshed after each message sent
-  # (not recommended). Important note: the refresh happen only AFTER the message is sent,
-  # so if the producer never sends a message the metadata is never refreshed
-  config :topic_metadata_refresh_interval_ms, :validate => :number, :default => 600 * 1000
-  # Maximum time to buffer data when using async mode. For example a setting of 100 will try to
-  # batch together 100ms of messages to send at once. This will improve throughput but adds
-  # message delivery latency due to the buffering.
-  config :queue_buffering_max_ms, :validate => :number, :default => 5000
-  # The maximum number of unsent messages that can be queued up the producer when using async
-  # mode before either the producer must be blocked or data must be dropped.
-  config :queue_buffering_max_messages, :validate => :number, :default => 10000
-  # The amount of time to block before dropping messages when running in async mode and the
-  # buffer has reached `queue.buffering.max.messages`. If set to 0 events will be enqueued
-  # immediately or dropped if the queue is full (the producer send call will never block). If set
-  # to -1 the producer will block indefinitely and never willingly drop a send.
-  config :queue_enqueue_timeout_ms, :validate => :number, :default => -1
-  # The number of messages to send in one batch when using async mode. The producer will wait
-  # until either this number of messages are ready to send or `queue.buffer.max.ms` is reached.
-  config :batch_num_messages, :validate => :number, :default => 200
-  # Socket write buffer size
-  config :send_buffer_bytes, :validate => :number, :default => 100 * 1024
-  # The client id is a user-specified string sent in each request to help trace calls. It should
-  # logically identify the application making the request.
-  config :client_id, :validate => :string, :default => ''
-  # Provides a way to specify a partition key as a string. To specify a partition key for
-  # Kafka, configure a format that will produce the key as a string. Defaults
-  # `key_serializer_class` to `kafka.serializer.StringEncoder` to match. For example, to partition
-  # by host:
-  # [source,ruby]
-  #     output {
-  #       kafka {
-  #           partition_key_format => "%{host}"
-  #       }
-  #     }
-  config :partition_key_format, :validate => :string, :default => nil
-
-  public
-  def register
-    LogStash::Logger.setup_log4j(@logger)
-
-    options = {
-        :broker_list => @broker_list,
-        :compression_codec => @compression_codec,
-        :compressed_topics => @compressed_topics,
-        :request_required_acks => @request_required_acks,
-        :serializer_class => @serializer_class,
-        :partitioner_class => @partitioner_class,
-        :request_timeout_ms => @request_timeout_ms,
-        :producer_type => @producer_type,
-        :key_serializer_class => @key_serializer_class,
-        :message_send_max_retries => @message_send_max_retries,
-        :retry_backoff_ms => @retry_backoff_ms,
-        :topic_metadata_refresh_interval_ms => @topic_metadata_refresh_interval_ms,
-        :queue_buffering_max_ms => @queue_buffering_max_ms,
-        :queue_buffering_max_messages => @queue_buffering_max_messages,
-        :queue_enqueue_timeout_ms => @queue_enqueue_timeout_ms,
-        :batch_num_messages => @batch_num_messages,
-        :send_buffer_bytes => @send_buffer_bytes,
-        :client_id => @client_id
-    }
-    @producer = Kafka::Producer.new(options)
-    @producer.connect
-
-    @logger.info('Registering kafka producer', :topic_id => @topic_id, :broker_list => @broker_list)
-
-    @codec.on_event do |data|
-      begin
-        @producer.send_msg(@current_topic_id,@partition_key,data)
-      rescue LogStash::ShutdownSignal
-        @logger.info('Kafka producer got shutdown signal')
-      rescue => e
-        @logger.warn('kafka producer threw exception, restarting',
-                     :exception => e)
-      end
-    end
-  end # def register
-
-  def receive(event)
-    return unless output?(event)
-    if event == LogStash::SHUTDOWN
-      finished
-      return
-    end
-    @partition_key = if @partition_key_format.nil? then nil else event.sprintf(@partition_key_format) end
-    @current_topic_id = if @topic_id.nil? then nil else event.sprintf(@topic_id) end
-    @codec.encode(event)
-    @partition_key = nil
-    @current_topic_id = nil
-  end
-
-  def teardown
-    @producer.close
-  end
-end #class LogStash::Outputs::Kafka
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/docs/logstash-kafka-conf.md
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/docs/logstash-kafka-conf.md b/eagle-assembly/src/main/docs/logstash-kafka-conf.md
deleted file mode 100644
index 9003fb4..0000000
--- a/eagle-assembly/src/main/docs/logstash-kafka-conf.md
+++ /dev/null
@@ -1,207 +0,0 @@
-<!--
-{% comment %}
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-{% endcomment %}
--->
-
-# Logstash-kafka 
-
-### Install logstash-kafka plugin
-
-
-#### For Logstash 1.5.x, 2.x
-
-
-logstash-kafka has been intergrated into [logstash-input-kafka][logstash-input-kafka] and [logstash-output-kafka][logstash-output-kafka], you can directly use it.
-
-[logstash-input-kafka]: https://github.com/logstash-plugins/logstash-input-kafka
-[logstash-output-kafka]: https://github.com/logstash-plugins/logstash-output-kafka
-
-#### For Logstash 1.4.x
-
-In logstash 1.4.x, the online version does not support specifying partition\_key for Kafka producer, and data will be produced into each partitions in turn. For eagle, we need to use the src in hdfs\_audit\_log as the partition key, so some hacking work have been done. If you have the same requirment, you can follow it.
-
-1. Install logstash-kafka
-
-        cd /path/to/logstash
-        GEM_HOME=vendor/bundle/jruby/1.9 GEM_PATH= java -jar vendor/jar/jruby-complete-1.7.11.jar -S gem install logstash-kafka
-        cp -R vendor/bundle/jruby/1.9/gems/logstash-kafka-*-java/{lib/logstash/*,spec/*} {lib/logstash/,spec/}
-        # test install
-        USE_JRUBY=1 bin/logstash rspec spec/**/kafka*.rb
-
-    or
-
-        cd /path/to/logstash-kafka
-        make tarball
-        <!-- a tarball package will be generated under build, including logstash -->
-
-2. Hacking the kafka.rb
-
-   We have added partition\_key\_format, which is used to specify the partition_key and supported by logstash 1.5.x, into  lib/logstash/outputs/kafka.rb. More details are shown [here](https://github.xyz.com/eagle/eagle/blob/master/eagle-assembly/src/main/docs/kafka.rb).
-
-          config :partition_key_format, :validate => :string, :default => nil
-
-          public
-          def register
-            LogStash::Logger.setup_log4j(@logger)
-
-            options = {
-                :broker_list => @broker_list,
-                :compression_codec => @compression_codec,
-                :compressed_topics => @compressed_topics,
-                :request_required_acks => @request_required_acks,
-                :serializer_class => @serializer_class,
-                :partitioner_class => @partitioner_class,
-                :request_timeout_ms => @request_timeout_ms,
-                :producer_type => @producer_type,
-                :key_serializer_class => @key_serializer_class,
-                :message_send_max_retries => @message_send_max_retries,
-                :retry_backoff_ms => @retry_backoff_ms,
-                :topic_metadata_refresh_interval_ms => @topic_metadata_refresh_interval_ms,
-                :queue_buffering_max_ms => @queue_buffering_max_ms,
-                :queue_buffering_max_messages => @queue_buffering_max_messages,
-                :queue_enqueue_timeout_ms => @queue_enqueue_timeout_ms,
-                :batch_num_messages => @batch_num_messages,
-                :send_buffer_bytes => @send_buffer_bytes,
-                :client_id => @client_id
-            }
-            @producer = Kafka::Producer.new(options)
-            @producer.connect
-
-            @logger.info('Registering kafka producer', :topic_id => @topic_id, :broker_list => @broker_list)
-
-            @codec.on_event do |data|
-              begin
-                @producer.send_msg(@current_topic_id,@partition_key,data)
-              rescue LogStash::ShutdownSignal
-                @logger.info('Kafka producer got shutdown signal')
-              rescue => e
-                @logger.warn('kafka producer threw exception, restarting',
-                             :exception => e)
-              end
-            end
-          end # def register
-
-          def receive(event)
-            return unless output?(event)
-            if event == LogStash::SHUTDOWN
-              finished
-              return
-            end
-            @partition_key = if @partition_key_format.nil? then nil else event.sprintf(@partition_key_format) end
-            @current_topic_id = if @topic_id.nil? then nil else event.sprintf(@topic_id) end
-            @codec.encode(event)
-            @partition_key = nil
-            @current_topic_id = nil
-          end
-
-
-### Create logstash configuration file
-Go to the logstash root dir, and create a configure file
-The 2.0 release of Logstash includes a new version of the Kafka output plugin with significant configuration changes. For more details, please check the documentation pages for the [Logstash1.5](https://www.elastic.co/guide/en/logstash/1.5/plugins-outputs-kafka.html) and [Logstash2.0](https://www.elastic.co/guide/en/logstash/2.0/plugins-outputs-kafka.html) version of the kafka output plugin.
-
-#### For Logstash 1.4.X, 1.5.X
-
-        input {
-            file {
-                type => "hdp-nn-audit"
-                path => "/path/to/audit.log"
-                start_position => end
-                sincedb_path => "/var/log/logstash/"
-             }
-        }
-
-        filter{
-            if [type] == "hdp-nn-audit" {
-        	   grok {
-        	       match => ["message", "ugi=(?<user>([\w\d\-]+))@|ugi=(?<user>([\w\d\-]+))/[\w\d\-.]+@|ugi=(?<user>([\w\d.\-_]+))[\s(]+"]
-        	   }
-            }
-        }
-
-        output {
-            if [type] == "hdp-nn-audit" {
-                kafka {
-                    codec => plain {
-                        format => "%{message}"
-                    }
-                    broker_list => "localhost:9092"
-                    topic_id => "hdfs_audit_log"
-                    request_required_acks => 0
-                    request_timeout_ms => 10000
-                    producer_type => "async"
-                    message_send_max_retries => 3
-                    retry_backoff_ms => 100
-                    queue_buffering_max_ms => 5000
-                    queue_enqueue_timeout_ms => 5000
-                    batch_num_messages => 200
-                    send_buffer_bytes => 102400
-                    client_id => "hdp-nn-audit"
-                    partition_key_format => "%{user}"
-                }
-                # stdout { codec => rubydebug }
-            }
-        }
-
-#### For Logstash 2.X
-
-		input {
-			file {
-				type => "hdp-nn-audit"
-				path => "/path/to/audit.log"
-				start_position => end
-				sincedb_path => "/var/log/logstash/"
-			}
-		}
-
-
-		filter{
-			if [type] == "hdp-nn-audit" {
-			  grok {
-				  match => ["message", "ugi=(?<user>([\w\d\-]+))@|ugi=(?<user>([\w\d\-]+))/[\w\d\-.]+@|ugi=(?<user>([\w\d.\-_]+))[\s(]+"]
-			  }
-			}
-		}
-
-		output {
-			 if [type] == "hdp-nn-audit" {
-				  kafka {
-					  codec => plain {
-						  format => "%{message}"
-					  }
-					  bootstrap_servers => "localhost:9092"
-					  topic_id => "hdfs_audit_log"
-					  acks => \u201c0\u201d
-					  timeout_ms => 10000
-					  retries => 3
-					  retry_backoff_ms => 100
-					  batch_size => 16384
-					  send_buffer_bytes => 131072
-					  client_id => "hdp-nn-audit"
-				  }
-				  # stdout { codec => rubydebug }
-			  }
-		}
-
-#### grok pattern testing
-We have 3 typical patterns for ugi field as follows
-2015-02-11 15:00:00,000 INFO FSNamesystem.audit: allowed=true	ugi=user1@xyz.com (auth:TOKEN)	ip=/10.115.44.55	cmd=open	src=/apps/hdmi-technology/b_pulsar_coe/schema/avroschema/Session.avsc	dst=null	perm=null
-2015-02-11 15:00:00,000 INFO FSNamesystem.audit: allowed=true	ugi=hdc_uc4_platform (auth:TOKEN) via sg_adm@xyz.com (auth:TOKEN)	ip=/10.115.11.54	cmd=open	src=/sys/soj/event/2015/02/08/same_day/00000000000772509716119204458864#3632400774990000-949461-r-01459.avro	dst=null	perm=null
-
-### Reference Links
-1. [logstash-kafka](https://github.com/joekiller/logstash-kafka)
-2. [logstash](https://github.com/elastic/logstash)
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/examples/eagle-sandbox-starter.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/examples/eagle-sandbox-starter.sh b/eagle-assembly/src/main/examples/eagle-sandbox-starter.sh
deleted file mode 100644
index 286bc87..0000000
--- a/eagle-assembly/src/main/examples/eagle-sandbox-starter.sh
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/../bin/eagle-env.sh
-eagle_bin=$EAGLE_HOME/bin
-
-
-###################################################################
-#             STEP 1: Check Installation
-###################################################################
-
-echo "STEP [1/3]: checking environment"
-$eagle_bin/eagle-check-env.sh
-[ $? != 0 ] && exit 1
-
-pid_dir=/var/run
-
-# Check HBase if it has been started
-hbase_master_pid=${pid_dir}/hbase/hbase-hbase-master.pid
-hbase_regionserver_pid=${pid_dir}/hbase/hbase-hbase-regionserver.pid
-echo "Checking if hbase is running ..."
-
-if [ -f $hbase_master_pid ] && \
-	ps aux | grep -v grep | grep $(cat $hbase_master_pid) > /dev/null
-then
-	echo "HBase Master is running as process `cat $hbase_master_pid`."
-else
-	echo "Error: HBase Master is not running. Please start it via Ambari."
-	exit 1
-fi
-
-if [ -f $hbase_regionserver_pid ] && \
-	ps aux | grep -v grep | grep $(cat $hbase_regionserver_pid) > /dev/null
-then
-	echo "HBase RegionServer is running as process `cat $hbase_regionserver_pid`."
-else
-	echo "Error: HBase RegionServer is not running. Please start it via Ambari."
-	exit 1
-fi
-
-# Check kafka if it has been started
-kafka_pid=$pid_dir/kafka/kafka.pid
-echo "Checking if kafka is running ..."
-
-if [ -f $kafka_pid ] && ps aux | grep -v grep | grep $(cat $kafka_pid) > /dev/null
-then
-	echo "Kafka is running as process `cat $kafka_pid`."
-else
-	echo "Error: Kafka is not running. Please start it via Ambari."
-	exit 1
-fi
-
-# Check storm if it has been started
-nimbus_pid=$pid_dir/storm/nimbus.pid
-supervisor_pid=$pid_dir/storm/supervisor.pid
-ui_pid=$pid_dir/storm/ui.pid
-echo "Checking if storm is running ..."
-
-if ! ([ -f $nimbus_pid ] && ps aux | grep -v grep | grep $(cat $nimbus_pid) > /dev/null)
-then
-    echo "Error: Storm Nimbus is not running"
-    exit 1
-fi
-
-if ! ([ -f $supervisor_pid ] && ps aux | grep -v grep | grep $(cat $supervisor_pid) > /dev/null)
-then
-    echo "Error: Storm Supervisor is not running"
-    exit 1
-fi
-
-if ! ([ -f $ui_pid ] && ps aux | grep -v grep | grep $(cat $ui_pid) > /dev/null)
-then
-    echo "Error: Storm UI is not running"
-    exit 1
-fi
-
-echo "Storm is running"
-
-
-###################################################################
-#              STEP 2: Starting Eagle Service
-###################################################################
-
-echo "STEP [2/3]: start eagle service"
-$eagle_bin/eagle-service.sh start
-
-
-###################################################################
-#              STEP 3: Starting Eagle Topology
-###################################################################
-
-echo "STEP [3/3]: start eagle topology"
-$eagle_bin/eagle-service-init.sh
-[ $? != 0 ] && exit 1
-
-echo "Creating kafka topics for eagle ... "
-KAFKA_HOME=/usr/hdp/current/kafka-broker
-EAGLE_ZOOKEEPER_QUORUM=localhost:2181
-topic=`${KAFKA_HOME}/bin/kafka-topics.sh --list --zookeeper $EAGLE_ZOOKEEPER_QUORUM --topic sandbox_hdfs_audit_log`
-if [ -z $topic ]; then
-	$KAFKA_HOME/bin/kafka-topics.sh --create --zookeeper $EAGLE_ZOOKEEPER_QUORUM --replication-factor 1 --partitions 1 --topic sandbox_hdfs_audit_log
-fi
-
-if [ $? = 0 ]; then
-echo "==> Create kafka topic successfully for eagle"
-else
-echo "==> Failed, exiting"
-exit 1
-fi
-$eagle_bin/eagle-topology-init.sh
-[ $? != 0 ] && exit 1
-${EAGLE_HOME}/examples/sample-sensitivity-resource-create.sh
-[ $? != 0 ] && exit 1
-${EAGLE_HOME}/examples/sample-policy-create.sh
-[ $? != 0 ] && exit 1
-$eagle_bin/eagle-topology.sh --main org.apache.eagle.security.auditlog.HdfsAuditLogProcessorMain --config ${EAGLE_HOME}/conf/sandbox-hdfsAuditLog-application.conf start
-[ $? != 0 ] && exit 1
-$eagle_bin/eagle-topology.sh --main org.apache.eagle.security.hive.jobrunning.HiveJobRunningMonitoringMain --config ${EAGLE_HOME}/conf/sandbox-hiveQueryLog-application.conf start
-[ $? != 0 ] && exit 1
-$eagle_bin/eagle-topology.sh --main org.apache.eagle.security.userprofile.UserProfileDetectionMain --config ${EAGLE_HOME}/conf/sandbox-userprofile-topology.conf start
-[ $? != 0 ] && exit 1
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/examples/hadoop-metric-policy-create.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/examples/hadoop-metric-policy-create.sh b/eagle-assembly/src/main/examples/hadoop-metric-policy-create.sh
deleted file mode 100644
index 9e9e861..0000000
--- a/eagle-assembly/src/main/examples/hadoop-metric-policy-create.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with`
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/../bin/eagle-env.sh
-
-##### add policies ##########
-echo ""
-echo "Importing policy: safeModePolicy "
-curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' \
- "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertDefinitionService" \
- -d '
- [
-     {
-       "prefix": "alertdef",
-       "tags": {
-         "site": "sandbox",
-         "application": "hadoopJmxMetricDataSource",
-         "policyId": "safeModePolicy",
-         "alertExecutorId": "hadoopJmxMetricAlertExecutor",
-         "policyType": "siddhiCEPEngine"
-       },
-       "description": "jmx metric ",
-       "policyDef": "{\"expression\":\"from hadoopJmxMetricEventStream[component==\\\"namenode\\\" and metric == \\\"hadoop.namenode.fsnamesystemstate.fsstate\\\" and convert(value, \\\"long\\\") > 0]#window.externalTime(timestamp ,10 min) select metric, host, value, timestamp, component, site insert into tmp; \",\"type\":\"siddhiCEPEngine\"}",
-       "enabled": true,
-       "dedupeDef": "{\"alertDedupIntervalMin\":10,\"emailDedupIntervalMin\":10}",
-       "notificationDef": "[{\"sender\":\"eagle@apache.org\",\"recipients\":\"eagle@apache.org\",\"subject\":\"missing block found.\",\"flavor\":\"email\",\"id\":\"email_1\",\"tplFileName\":\"\"}]"
-     }
- ]
- '
-
-exit 0
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/examples/hadoop-metric-sandbox-starter.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/examples/hadoop-metric-sandbox-starter.sh b/eagle-assembly/src/main/examples/hadoop-metric-sandbox-starter.sh
deleted file mode 100644
index 8f227b0..0000000
--- a/eagle-assembly/src/main/examples/hadoop-metric-sandbox-starter.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/../bin/eagle-env.sh
-eagle_bin=$EAGLE_HOME/bin
-
-
-###################################################################
-#             STEP 1: Check Installation
-###################################################################
-
-echo "STEP [1/3]: checking environment"
-$eagle_bin/eagle-check-env.sh
-[ $? != 0 ] && exit 1
-
-pid_dir=/var/run
-
-# Check HBase if it has been started
-hbase_master_pid=${pid_dir}/hbase/hbase-hbase-master.pid
-hbase_regionserver_pid=${pid_dir}/hbase/hbase-hbase-regionserver.pid
-echo "Checking if hbase is running ..."
-
-if [ -f $hbase_master_pid ] && \
-	ps aux | grep -v grep | grep $(cat $hbase_master_pid) > /dev/null
-then
-	echo "HBase Master is running as process `cat $hbase_master_pid`."
-else
-	echo "Error: HBase Master is not running. Please start it via Ambari."
-	exit 1
-fi
-
-if [ -f $hbase_regionserver_pid ] && \
-	ps aux | grep -v grep | grep $(cat $hbase_regionserver_pid) > /dev/null
-then
-	echo "HBase RegionServer is running as process `cat $hbase_regionserver_pid`."
-else
-	echo "Error: HBase RegionServer is not running. Please start it via Ambari."
-	exit 1
-fi
-
-# Check kafka if it has been started
-kafka_pid=$pid_dir/kafka/kafka.pid
-echo "Checking if kafka is running ..."
-
-if [ -f $kafka_pid ] && ps aux | grep -v grep | grep $(cat $kafka_pid) > /dev/null
-then
-	echo "Kafka is running as process `cat $kafka_pid`."
-else
-	echo "Error: Kafka is not running. Please start it via Ambari."
-	exit 1
-fi
-
-# Check storm if it has been started
-nimbus_pid=$pid_dir/storm/nimbus.pid
-supervisor_pid=$pid_dir/storm/supervisor.pid
-ui_pid=$pid_dir/storm/ui.pid
-echo "Checking if storm is running ..."
-
-if ! ([ -f $nimbus_pid ] && ps aux | grep -v grep | grep $(cat $nimbus_pid) > /dev/null)
-then
-    echo "Error: Storm Nimbus is not running"
-    exit 1
-fi
-
-if ! ([ -f $supervisor_pid ] && ps aux | grep -v grep | grep $(cat $supervisor_pid) > /dev/null)
-then
-    echo "Error: Storm Supervisor is not running"
-    exit 1
-fi
-
-if ! ([ -f $ui_pid ] && ps aux | grep -v grep | grep $(cat $ui_pid) > /dev/null)
-then
-    echo "Error: Storm UI is not running"
-    exit 1
-fi
-
-echo "Storm is running"
-
-
-###################################################################
-#              STEP 2: Starting Eagle Service
-###################################################################
-
-echo "STEP [2/3]: Start Eagle Service"
-$eagle_bin/eagle-service.sh start
-
-
-###################################################################
-#              STEP 3: Starting Eagle Topology
-###################################################################
-
-echo "STEP [3/3]: Init Eagle Service"
-$eagle_bin/eagle-service-init.sh
-[ $? != 0 ] && exit 1
-
-echo "Creating kafka topics for eagle ... "
-KAFKA_HOME=/usr/hdp/current/kafka-broker
-EAGLE_ZOOKEEPER_QUORUM=localhost:2181
-topic=`${KAFKA_HOME}/bin/kafka-topics.sh --list --zookeeper $EAGLE_ZOOKEEPER_QUORUM --topic nn_jmx_metric_sandbox`
-if [ -z $topic ]; then
-	$KAFKA_HOME/bin/kafka-topics.sh --create --zookeeper $EAGLE_ZOOKEEPER_QUORUM --replication-factor 1 --partitions 1 --topic nn_jmx_metric_sandbox
-fi
-
-if [ $? = 0 ]; then
-echo "==> Create kafka topic successfully for Hadoop Metric Monitoring"
-else
-echo "==> Failed, exiting"
-exit 1
-fi
-$eagle_bin/hadoop-metric-monitor.sh
-[ $? != 0 ] && exit 1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/examples/sample-policy-create.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/examples/sample-policy-create.sh b/eagle-assembly/src/main/examples/sample-policy-create.sh
deleted file mode 100644
index 71e099e..0000000
--- a/eagle-assembly/src/main/examples/sample-policy-create.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/../bin/eagle-env.sh
-
-su hdfs -c "hdfs dfs -touchz /tmp/private"
-#su hdfs -c "hdfs dfs -touchz /tmp/sensitive"
-
-#### create hdfs policy sample in sandbox
-echo "create hdfs policy sample in sandbox... "
-curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertDefinitionService" -d \
-'[{"tags":{"site":"sandbox","application":"hdfsAuditLog","alertExecutorId":"hdfsAuditLogAlertExecutor","policyId":"viewPrivate","policyType":"siddhiCEPEngine"},"desc":"view private file","policyDef":"{\"type\":\"siddhiCEPEngine\",\"expression\":\"from hdfsAuditLogEventStream[(cmd=='\'open\'') and (src=='\'/tmp/private\'')] select * insert into outputStream\"}","dedupeDef": "{\"alertDedupIntervalMin\":0,\"emailDedupIntervalMin\":1440}","notificationDef": "[{\"subject\":\"just for test\",\"sender\":\"nobody@test.com\",\"recipients\":\"nobody@test.com\",\"flavor\":\"email\",\"id\":\"email_1\",\"tplFileName\":\"\"}]","remediationDef":"","enabled":true}]'
-
-#### create hive policy sample in sandbox
-echo "create hive policy sample in sandbox... "
-curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertDefinitionService" -d \
-'[{"tags":{"site":"sandbox","application":"hiveQueryLog","alertExecutorId":"hiveAccessAlertByRunningJob","policyId":"queryPhoneNumber","policyType":"siddhiCEPEngine"},"desc":"query sensitive hive data","policyDef":"{\"type\":\"siddhiCEPEngine\",\"expression\":\"from hiveAccessLogStream[(sensitivityType=='\'PHONE_NUMBER\'')] select * insert into outputStream;\"}","dedupeDef": "{\"alertDedupIntervalMin\":0,\"emailDedupIntervalMin\":1440}","notificationDef": "[{\"subject\":\"just for test\",\"sender\":\"nobody@test.com\",\"recipients\":\"nobody@test.com\",\"flavor\":\"email\",\"id\":\"email_1\",\"tplFileName\":\"\"}]","remediationDef":"","enabled":"true"}]'

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/examples/sample-sensitivity-resource-create.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/examples/sample-sensitivity-resource-create.sh b/eagle-assembly/src/main/examples/sample-sensitivity-resource-create.sh
deleted file mode 100644
index 4a8f06f..0000000
--- a/eagle-assembly/src/main/examples/sample-sensitivity-resource-create.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/../bin/eagle-env.sh
-
-#### create hive sensitivity sample in sandbox
-echo "create hive sensitivity sample in sandbox... "
-curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=HiveResourceSensitivityService" -d '[{"tags":{"site" : "sandbox", "hiveResource":"/xademo/customer_details/phone_number"}, "sensitivityType": "PHONE_NUMBER"}]'
-
-
-#### create hdfs sensitivity sample in sandbox
-echo "create hdfs sensitivity sample in sandbox... "
-curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=FileSensitivityService" -d '[{"tags":{"site" : "sandbox", "filedir":"/tmp/private"}, "sensitivityType": "PRIVATE"}]'
-
-#### create hbase sensitivity sample in sandbox
-echo "create hdfs sensitivity sample in sandbox... "
-curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=HbaseResourceSensitivityService" -d '[{"tags":{"site":"sandbox","hbaseResource":"default:alertStreamSchema"},"sensitivityType":"PrivateTable"}]'
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/jdbc/eagle-jdbc-mysql.sql
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/jdbc/eagle-jdbc-mysql.sql b/eagle-assembly/src/main/lib/jdbc/eagle-jdbc-mysql.sql
deleted file mode 100644
index d4be66c..0000000
--- a/eagle-assembly/src/main/lib/jdbc/eagle-jdbc-mysql.sql
+++ /dev/null
@@ -1,331 +0,0 @@
--- /*
---  * Licensed to the Apache Software Foundation (ASF) under one or more
---  * contributor license agreements.  See the NOTICE file distributed with
---  * this work for additional information regarding copyright ownership.
---  * The ASF licenses this file to You under the Apache License, Version 2.0
---  * (the "License"); you may not use this file except in compliance with
---  * the License.  You may obtain a copy of the License at
---  *
---  *    http://www.apache.org/licenses/LICENSE-2.0
---  *
---  * Unless required by applicable law or agreed to in writing, software
---  * distributed under the License is distributed on an "AS IS" BASIS,
---  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---  * See the License for the specific language governing permissions and
---  * limitations under the License.
---  *
---  */
-
--- MySQL dump 10.13  Distrib 5.6.23, for osx10.8 (x86_64)
---
--- Host: localhost    Database: eagle
--- ------------------------------------------------------
--- Server version	5.6.23
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `alertdef_alertdef`
---
-
-DROP TABLE IF EXISTS `alertdef_alertdef`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `alertdef_alertdef` (
-  `uuid` varchar(100) COLLATE utf8_bin NOT NULL,
-  `timestamp` bigint(20) DEFAULT NULL,
-  `site` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `application` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `alertexecutorid` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `policyid` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `policytype` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `description` varchar(200) COLLATE utf8_bin DEFAULT NULL,
-  `policydef` varchar(1000) COLLATE utf8_bin DEFAULT NULL,
-  `dedupedef` varchar(1000) COLLATE utf8_bin DEFAULT NULL,
-  `notificationdef` varchar(1000) COLLATE utf8_bin DEFAULT NULL,
-  `remediationdef` varchar(1000) COLLATE utf8_bin DEFAULT NULL,
-  `enabled` tinyint(1) DEFAULT NULL,
-  `owner` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `lastmodifieddate` bigint(20) DEFAULT NULL,
-  `severity` bigint(20) DEFAULT NULL,
-  `createdtime` bigint(20) DEFAULT NULL,
-  `markdownReason` varchar(1000) COLLATE utf8_bin DEFAULT NULL,
-  `markdownEnabled` tinyint(1) DEFAULT NULL,
-  PRIMARY KEY (`uuid`),
-  UNIQUE KEY `uuid_UNIQUE` (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `alertdef_alertdef`
---
-
-LOCK TABLES `alertdef_alertdef` WRITE;
-/*!40000 ALTER TABLE `alertdef_alertdef` DISABLE KEYS */;
-/*!40000 ALTER TABLE `alertdef_alertdef` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `alertdetail_hadoop`
---
-
-DROP TABLE IF EXISTS `alertdetail_hadoop`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `alertdetail_hadoop` (
-  `uuid` varchar(100) COLLATE utf8_bin NOT NULL,
-  `timestamp` bigint(20) DEFAULT NULL,
-  `site` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `application` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `hostname` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `policyid` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `alertsource` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `sourcestreams` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `alertexecutorid` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `description` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `remediationid` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `remediationcallback` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `alertcontext` varchar(1000) COLLATE utf8_bin DEFAULT NULL,
-  `streamid` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  PRIMARY KEY (`uuid`),
-  UNIQUE KEY `uuid_UNIQUE` (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `alertdetail_hadoop`
---
-
-LOCK TABLES `alertdetail_hadoop` WRITE;
-/*!40000 ALTER TABLE `alertdetail_hadoop` DISABLE KEYS */;
-/*!40000 ALTER TABLE `alertdetail_hadoop` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `alertexecutor_alertexecutor`
---
-
-DROP TABLE IF EXISTS `alertexecutor_alertexecutor`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `alertexecutor_alertexecutor` (
-  `uuid` varchar(100) COLLATE utf8_bin NOT NULL,
-  `timestamp` bigint(20) DEFAULT NULL,
-  `application` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `alertexecutorid` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `streamname` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `description` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `site` varchar(45) COLLATE utf8_bin DEFAULT NULL,
-  PRIMARY KEY (`uuid`),
-  UNIQUE KEY `uuid_UNIQUE` (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `alertexecutor_alertexecutor`
---
-
-LOCK TABLES `alertexecutor_alertexecutor` WRITE;
-/*!40000 ALTER TABLE `alertexecutor_alertexecutor` DISABLE KEYS */;
-INSERT INTO `alertexecutor_alertexecutor` VALUES ('0ijKT3_____62aP_uMZ-K1SsoVDrH3vKa382HVykBVAJItDs',0,'hiveQueryLog','hiveAccessAlertByRunningJob','hiveAccessLogStream','alert executor for hive query log event stream',NULL),('0ijKT3_____62aP_uMZ-K2-GR_rrH3vKDuSvMwA130dvL77HXKQFUNuQa14',0,'userProfile','userProfileAnomalyDetectionExecutor','userActivity','user activity data source','sandbox'),('0ijKT3_____62aP_uMZ-K4uAAAjrH3vKhK_cHVykBVB3iZNS',0,'hdfsAuditLog','hdfsAuditLogAlertExecutor','hdfsAuditLogEventStream','alert executor for hdfs audit log event stream',NULL),('0ijKT3_____62aP_uMZ-K_85ls_rH3vK8F7dJFykBVCMCnLr',0,'hbaseSecurityLog','hbaseSecurityLogAlertExecutor','hbaseSecurityLogEventStream','alert executor for hbase security log event stream',NULL);
-/*!40000 ALTER TABLE `alertexecutor_alertexecutor` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `alertstream_alertstream`
---
-
-DROP TABLE IF EXISTS `alertstream_alertstream`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `alertstream_alertstream` (
-  `uuid` varchar(100) COLLATE utf8_bin NOT NULL,
-  `timestamp` bigint(20) DEFAULT NULL,
-  `application` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `streamname` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `description` varchar(1024) COLLATE utf8_bin DEFAULT NULL,
-  `site` varchar(45) COLLATE utf8_bin DEFAULT NULL,
-  PRIMARY KEY (`uuid`),
-  UNIQUE KEY `uuid_UNIQUE` (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `alertstream_alertstream`
---
-
-LOCK TABLES `alertstream_alertstream` WRITE;
-/*!40000 ALTER TABLE `alertstream_alertstream` DISABLE KEYS */;
-INSERT INTO `alertstream_alertstream` VALUES ('x3ZP_H_____62aP_uMZ-K2-GR_oANd9Hby--x1ykBVDbkGte',0,'userProfile','userActivity',NULL,'sandbox');
-/*!40000 ALTER TABLE `alertstream_alertstream` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `alertstreamschema_alertstreamschema`
---
-
-DROP TABLE IF EXISTS `alertstreamschema_alertstreamschema`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `alertstreamschema_alertstreamschema` (
-  `uuid` varchar(100) COLLATE utf8_bin NOT NULL,
-  `timestamp` bigint(20) DEFAULT NULL,
-  `application` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `streamname` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `attrname` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `attrtype` varchar(20) COLLATE utf8_bin DEFAULT NULL,
-  `category` varchar(20) COLLATE utf8_bin DEFAULT NULL,
-  `attrValueResolver` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `usedastag` tinyint(1) DEFAULT NULL,
-  `attrdescription` varchar(1024) COLLATE utf8_bin DEFAULT NULL,
-  `attrdisplayname` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `defaultvalue` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  PRIMARY KEY (`uuid`),
-  UNIQUE KEY `uuid_UNIQUE` (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `alertstreamschema_alertstreamschema`
---
-
-LOCK TABLES `alertstreamschema_alertstreamschema` WRITE;
-/*!40000 ALTER TABLE `alertstreamschema_alertstreamschema` DISABLE KEYS */;
-INSERT INTO `alertstreamschema_alertstreamschema` VALUES ('iSeEvX_____62aP_uMZ-K1SsoVAhAmgc66vEDlykBVAJItDs',0,'hiveQueryLog','hiveAccessLogStream','resource','string','','org.apache.eagle.service.security.hive.resolver.HiveMetadataResolver',NULL,'/database/table/column or /database/table/*',NULL,NULL),('iSeEvX_____62aP_uMZ-K1SsoVAhAmgcA0kpFlykBVAJItDs',0,'hiveQueryLog','hiveAccessLogStream','timestamp','long','','',NULL,'milliseconds of the datetime',NULL,NULL),('iSeEvX_____62aP_uMZ-K1SsoVAhAmgcADbry1ykBVAJItDs',0,'hiveQueryLog','hiveAccessLogStream','user','string','','',NULL,'process user',NULL,NULL),('iSeEvX_____62aP_uMZ-K1SsoVAhAmgcOKXfS1ykBVAJItDs',0,'hiveQueryLog','hiveAccessLogStream','command','string','','org.apache.eagle.service.security.hive.resolver.HiveCommandResolver',NULL,'hive sql command, such as SELECT, INSERT and DELETE',NULL,NULL),('iSeEvX_____62aP_uMZ-K1SsoVAhAmgcX026eVykBVAJItDs',0,'hiveQueryLog','hiveAccessLogStream','sensitivityType','string','','org.apache.
 eagle.service.security.hive.resolver.HiveSensitivityTypeResolver',NULL,'mark such as PHONE_NUMBER',NULL,NULL),('iSeEvX_____62aP_uMZ-K4uAAAghAmgcA0kpFlykBVB3iZNS',0,'hdfsAuditLog','hdfsAuditLogEventStream','timestamp','long','','',NULL,'milliseconds of the datetime',NULL,NULL),('iSeEvX_____62aP_uMZ-K4uAAAghAmgcAAG95FykBVB3iZNS',0,'hdfsAuditLog','hdfsAuditLogEventStream','src','string','','org.apache.eagle.service.security.hdfs.resolver.HDFSResourceResolver',NULL,'source directory or file, such as /tmp',NULL,NULL),('iSeEvX_____62aP_uMZ-K4uAAAghAmgcAAGBOlykBVB3iZNS',0,'hdfsAuditLog','hdfsAuditLogEventStream','cmd','string','','org.apache.eagle.service.security.hdfs.resolver.HDFSCommandResolver',NULL,'file/directory operation, such as getfileinfo, open, listStatus and so on',NULL,NULL),('iSeEvX_____62aP_uMZ-K4uAAAghAmgcAAGFxVykBVB3iZNS',0,'hdfsAuditLog','hdfsAuditLogEventStream','dst','string','','org.apache.eagle.service.security.hdfs.resolver.HDFSResourceResolver',NULL,'destination di
 rectory, such as /tmp',NULL,NULL),('iSeEvX_____62aP_uMZ-K4uAAAghAmgcADD1qFykBVB3iZNS',0,'hdfsAuditLog','hdfsAuditLogEventStream','host','string','','',NULL,'hostname, such as localhost',NULL,NULL),('iSeEvX_____62aP_uMZ-K4uAAAghAmgcADbry1ykBVB3iZNS',0,'hdfsAuditLog','hdfsAuditLogEventStream','user','string','','',NULL,'process user',NULL,NULL),('iSeEvX_____62aP_uMZ-K4uAAAghAmgcMC9vDFykBVB3iZNS',0,'hdfsAuditLog','hdfsAuditLogEventStream','securityZone','string','','',NULL,'',NULL,NULL),('iSeEvX_____62aP_uMZ-K4uAAAghAmgcX026eVykBVB3iZNS',0,'hdfsAuditLog','hdfsAuditLogEventStream','sensitivityType','string','','org.apache.eagle.service.security.hdfs.resolver.HDFSSensitivityTypeResolver',NULL,'mark such as AUDITLOG, SECURITYLOG',NULL,NULL),('iSeEvX_____62aP_uMZ-K4uAAAghAmgcya4BqFykBVB3iZNS',0,'hdfsAuditLog','hdfsAuditLogEventStream','allowed','bool','','',NULL,'true, false or none',NULL,NULL),('iSeEvX_____62aP_uMZ-K_85ls8hAmgcA0kpFlykBVCMCnLr',0,'hbaseSecurityLog','hbaseSecurityLogEventS
 tream','timestamp','long','','',NULL,'milliseconds of the datetime',NULL,NULL),('iSeEvX_____62aP_uMZ-K_85ls8hAmgcADD1qFykBVCMCnLr',0,'hbaseSecurityLog','hbaseSecurityLogEventStream','host','string','','',NULL,'remote ip address to access hbase',NULL,NULL),('iSeEvX_____62aP_uMZ-K_85ls8hAmgcADbry1ykBVCMCnLr',0,'hbaseSecurityLog','hbaseSecurityLogEventStream','user','string','','',NULL,'hbase user',NULL,NULL),('iSeEvX_____62aP_uMZ-K_85ls8hAmgcBoM-VFykBVCMCnLr',0,'hbaseSecurityLog','hbaseSecurityLogEventStream','scope','string','','org.apache.eagle.service.security.hbase.resolver.HbaseMetadataResolver',NULL,'the resources which users are then granted specific permissions (Read, Write, Execute, Create, Admin) against',NULL,NULL),('iSeEvX_____62aP_uMZ-K_85ls8hAmgcQU7yj1ykBVCMCnLr',0,'hbaseSecurityLog','hbaseSecurityLogEventStream','request','string','','org.apache.eagle.service.security.hbase.resolver.HbaseRequestResolver',NULL,'',NULL,NULL),('iSeEvX_____62aP_uMZ-K_85ls8hAmgcX026eVykBVCMC
 nLr',0,'hbaseSecurityLog','hbaseSecurityLogEventStream','sensitivityType','string','','org.apache.eagle.service.security.hbase.resolver.HbaseSensitivityTypeResolver',NULL,'',NULL,NULL),('iSeEvX_____62aP_uMZ-K_85ls8hAmgcqy9-NlykBVCMCnLr',0,'hbaseSecurityLog','hbaseSecurityLogEventStream','action','string','','org.apache.eagle.service.security.hbase.resolver.HbaseActionResolver',NULL,'action types, such as read, write, create, execute, and admin',NULL,NULL),('iSeEvX_____62aP_uMZ-K_85ls8hAmgcys3P8lykBVCMCnLr',0,'hbaseSecurityLog','hbaseSecurityLogEventStream','status','string','','',NULL,'access status: allowed or denied',NULL,NULL);
-/*!40000 ALTER TABLE `alertstreamschema_alertstreamschema` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `eagleapplicationdesc_eagleapplicationdesc`
---
-
-DROP TABLE IF EXISTS `eagleapplicationdesc_eagleapplicationdesc`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `eagleapplicationdesc_eagleapplicationdesc` (
-  `uuid` varchar(100) COLLATE utf8_bin NOT NULL,
-  `timestamp` bigint(20) DEFAULT NULL,
-  `application` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `description` varchar(1024) COLLATE utf8_bin DEFAULT NULL,
-  `alias` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `groupName` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `features` blob,
-  `config` varchar(1024) COLLATE utf8_bin DEFAULT NULL,
-  PRIMARY KEY (`uuid`),
-  UNIQUE KEY `uuid_UNIQUE` (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `eagleapplicationdesc_eagleapplicationdesc`
---
-
-LOCK TABLES `eagleapplicationdesc_eagleapplicationdesc` WRITE;
-/*!40000 ALTER TABLE `eagleapplicationdesc_eagleapplicationdesc` DISABLE KEYS */;
-INSERT INTO `eagleapplicationdesc_eagleapplicationdesc` VALUES ('54TRXX_____62aP_XKQFUAki0Ow',0,'hiveQueryLog','Hive query log security check application','HIVE','DAM','\0\0\0\0\0\0\0\0\0common\0\0\0\0\0\0classification\0\0\0\0\0\0userProfile\0\0\0\0\0\0metadata','{\n	\"view\": {\n		\"prefix\": \"hiveResourceSensitivity\",\n		\"service\": \"HiveResourceSensitivityService\",\n		\"keys\": [\n			\"hiveResource\",\n			\"sensitivityType\"\n		],\n		\"type\": \"table\",\n		\"api\": {\n			\"database\": \"hiveResource/databases\",\n			\"table\": \"hiveResource/tables\",\n			\"column\": \"hiveResource/columns\"\n		},\n		\"mapping\": {\n			\"database\": \"database\",\n			\"table\": \"table\",\n			\"column\": \"column\"\n		}\n	}\n}'),('54TRXX_____62aP_XKQFUHeJk1I',0,'hdfsAuditLog','HDFS audit log security check application','HDFS','DAM','\0\0\0\0\0\0\0\0\0common\0\0\0\0\0\0classification\0\0\0\0\0\0userProfile\0\0\0\0\0\0metadata','{\n	\"view\": {\n		\"prefix\": \"fileSensitiv
 ity\",\n		\"service\": \"FileSensitivityService\",\n		\"keys\": [\n			\"filedir\",\n			\"sensitivityType\"\n		],\n		\"type\": \"folder\",\n		\"api\": \"hdfsResource\"\n	}\n}'),('54TRXX_____62aP_XKQFUIwKcus',0,'hbaseSecurityLog','HBASE audit log security check application','HBASE','DAM','\0\0\0\0\0\0\0\0\0common\0\0\0\0\0\0classification\0\0\0\0\0\0userProfile\0\0\0\0\0\0metadata','{\n	\"view\": {\n		\"prefix\": \"hbaseResourceSensitivity\",\n		\"service\": \"HbaseResourceSensitivityService\",\n		\"keys\": [\n			\"hbaseResource\",\n			\"sensitivityType\"\n		],\n		\"type\": \"table\",\n		\"api\": {\n			\"database\": \"hbaseResource/namespaces\",\n			\"table\": \"hbaseResource/tables\",\n			\"column\": \"hbaseResource/columns\"\n		},\n		\"mapping\": {\n			\"database\": \"namespace\",\n			\"table\": \"table\",\n			\"column\": \"columnFamily\"\n		}\n	}\n}');
-/*!40000 ALTER TABLE `eagleapplicationdesc_eagleapplicationdesc` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `eaglefeaturedesc_eaglefeaturedesc`
---
-
-DROP TABLE IF EXISTS `eaglefeaturedesc_eaglefeaturedesc`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `eaglefeaturedesc_eaglefeaturedesc` (
-  `uuid` varchar(100) COLLATE utf8_bin NOT NULL,
-  `timestamp` bigint(20) DEFAULT NULL,
-  `feature` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `description` varchar(1024) COLLATE utf8_bin DEFAULT NULL,
-  `version` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  PRIMARY KEY (`uuid`),
-  UNIQUE KEY `uuid_UNIQUE` (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `eaglefeaturedesc_eaglefeaturedesc`
---
-
-LOCK TABLES `eaglefeaturedesc_eaglefeaturedesc` WRITE;
-/*!40000 ALTER TABLE `eaglefeaturedesc_eaglefeaturedesc` DISABLE KEYS */;
-INSERT INTO `eaglefeaturedesc_eaglefeaturedesc` VALUES ('4DMSA3_____62aP_xaJ69hbKM-Y',0,'classification','Sensitivity browser of the data classification.','v0.3.0'),('4DMSA3_____62aP_xaJ69jj4wMM',0,'metrics','Metrics dashboard','v0.3.0'),('4DMSA3_____62aP_xaJ69q8_Kes',0,'common','Provide the Policy & Alert feature.','v0.3.0'),('4DMSA3_____62aP_xaJ69tuQa14',0,'userProfile','Machine learning of the user profile','v0.3.0'),('4DMSA3_____62aP_xaJ69uUtey8',0,'metadata','Stream metadata viewer','v0.3.0');
-/*!40000 ALTER TABLE `eaglefeaturedesc_eaglefeaturedesc` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `eaglesiteapplication_eaglesiteapplication`
---
-
-DROP TABLE IF EXISTS `eaglesiteapplication_eaglesiteapplication`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `eaglesiteapplication_eaglesiteapplication` (
-  `uuid` varchar(100) COLLATE utf8_bin NOT NULL,
-  `timestamp` bigint(20) DEFAULT NULL,
-  `site` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `application` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `enabled` tinyint(1) DEFAULT NULL,
-  `config` varchar(1024) COLLATE utf8_bin DEFAULT NULL,
-  PRIMARY KEY (`uuid`),
-  UNIQUE KEY `uuid_UNIQUE` (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `eaglesiteapplication_eaglesiteapplication`
---
-
-LOCK TABLES `eaglesiteapplication_eaglesiteapplication` WRITE;
-/*!40000 ALTER TABLE `eaglesiteapplication_eaglesiteapplication` DISABLE KEYS */;
-INSERT INTO `eaglesiteapplication_eaglesiteapplication` VALUES ('D-7M5X_____62aP_ADXfR28vvsdcpAVQCSLQ7A',0,'sandbox','hiveQueryLog',1,'{\"accessType\":\"metastoredb_jdbc\",\"password\":\"hive\",\"user\":\"hive\",\"jdbcDriverClassName\":\"com.mysql.jdbc.Driver\",\"jdbcUrl\":\"jdbc:mysql://sandbox.hortonworks.com/hive?createDatabaseIfNotExist=true\"}'),('D-7M5X_____62aP_ADXfR28vvsdcpAVQd4mTUg',0,'sandbox','hdfsAuditLog',1,'{\"fs.defaultFS\":\"hdfs://sandbox.hortonworks.com:8020\"}'),('D-7M5X_____62aP_ADXfR28vvsdcpAVQjApy6w',0,'sandbox','hbaseSecurityLog',1,'{\"hbase.zookeeper.property.clientPort\":\"2181\", \"hbase.zookeeper.quorum\":\"localhost\"}');
-/*!40000 ALTER TABLE `eaglesiteapplication_eaglesiteapplication` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `eaglesitedesc_eaglesitedesc`
---
-
-DROP TABLE IF EXISTS `eaglesitedesc_eaglesitedesc`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `eaglesitedesc_eaglesitedesc` (
-  `uuid` varchar(100) COLLATE utf8_bin NOT NULL,
-  `timestamp` bigint(20) DEFAULT NULL,
-  `site` varchar(100) COLLATE utf8_bin DEFAULT NULL,
-  `enabled` tinyint(1) DEFAULT NULL,
-  PRIMARY KEY (`uuid`),
-  UNIQUE KEY `uuid_UNIQUE` (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `eaglesitedesc_eaglesitedesc`
---
-
-LOCK TABLES `eaglesitedesc_eaglesitedesc` WRITE;
-/*!40000 ALTER TABLE `eaglesitedesc_eaglesitedesc` DISABLE KEYS */;
-INSERT INTO `eaglesitedesc_eaglesitedesc` VALUES ('phJknH_____62aP_ADXfR28vvsc',0,'sandbox',1);
-/*!40000 ALTER TABLE `eaglesitedesc_eaglesitedesc` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2016-03-08 18:34:19

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/share/.placeholder
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/share/.placeholder b/eagle-assembly/src/main/lib/share/.placeholder
deleted file mode 100644
index 823c394..0000000
--- a/eagle-assembly/src/main/lib/share/.placeholder
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements.  See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License.  You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
\ No newline at end of file


[06/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/resources/applicationContext.xml
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/applicationContext.xml b/eagle-webservice/src/main/resources/applicationContext.xml
deleted file mode 100644
index 9872e5f..0000000
--- a/eagle-webservice/src/main/resources/applicationContext.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:mvc="http://www.springframework.org/schema/mvc" 
-	xmlns:task="http://www.springframework.org/schema/task"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:cache="http://www.springframework.org/schema/cache" 
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-    http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-    http://www.springframework.org/schema/context
-    http://www.springframework.org/schema/context/spring-context-3.1.xsd
-    http://www.springframework.org/schema/task
-    http://www.springframework.org/schema/task/spring-task-3.1.xsd
-    http://www.springframework.org/schema/mvc
-    http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
-    http://www.springframework.org/schema/aop
-    http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-    http://www.springframework.org/schema/cache
-    http://www.springframework.org/schema/cache/spring-cache.xsd
-    http://www.springframework.org/schema/jdbc  
-    http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
-
-	<context:component-scan base-package="org.apache.eagle.service.security" />
-	<context:property-placeholder location="classpath:ldap.properties"/>
-</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/resources/eagle-scheduler.conf
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/eagle-scheduler.conf b/eagle-webservice/src/main/resources/eagle-scheduler.conf
deleted file mode 100644
index 74ff18b..0000000
--- a/eagle-webservice/src/main/resources/eagle-scheduler.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-### scheduler propertise
-appCommandLoaderEnabled = false
-appCommandLoaderIntervalSecs = 1
-appHealthCheckIntervalSecs = 5
-
-### execution platform properties
-envContextConfig.env = "storm"
-envContextConfig.url = "http://sandbox.hortonworks.com:8744"
-envContextConfig.nimbusHost = "sandbox.hortonworks.com"
-envContextConfig.nimbusThriftPort = 6627
-envContextConfig.jarFile = "/dir-to-jar/eagle-topology-0.3.0-incubating-assembly.jar"
-
-### default topology properties
-eagleProps.mailHost = "mailHost.com"
-eagleProps.mailSmtpPort = "25"
-eagleProps.mailDebug = "true"
-eagleProps.eagleService.host = "localhost"
-eagleProps.eagleService.port = 9099
-eagleProps.eagleService.username = "admin"
-eagleProps.eagleService.password = "secret"
-eagleProps.dataJoinPollIntervalSec = 30
-
-dynamicConfigSource.enabled = true
-dynamicConfigSource.initDelayMillis = 0
-dynamicConfigSource.delayMillis = 30000
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/resources/eagleSecurity.xml
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/eagleSecurity.xml b/eagle-webservice/src/main/resources/eagleSecurity.xml
deleted file mode 100644
index 952f2e7..0000000
--- a/eagle-webservice/src/main/resources/eagleSecurity.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:scr="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans
-	http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-	http://www.springframework.org/schema/security
-	http://www.springframework.org/schema/security/spring-security-3.1.xsd
-	http://www.springframework.org/schema/tx
-    http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
-
-    <scr:http auto-config="true" use-expressions="true">
-        <!-- Support HTTP Basic Auth-->
-        <scr:http-basic entry-point-ref="unauthorisedEntryPoint"/>
-        <scr:intercept-url pattern="/rest/entities" method="POST" access="hasRole('ROLE_ADMIN')" />
-        <scr:intercept-url pattern="/rest/entities/delete" method="POST" access="hasRole('ROLE_ADMIN')" />
-        <scr:intercept-url pattern="/rest/list" method="POST" access="hasRole('ROLE_ADMIN')" />
-        <scr:intercept-url pattern="/rest/status" method="GET" access="permitAll" />
-        <scr:intercept-url pattern="/rest/*" access="isAuthenticated()" />
-        <scr:logout logout-url="/logout" invalidate-session="true" delete-cookies="JSESSIONID" success-handler-ref="logoutSuccessHandler"/>
-        <scr:session-management session-fixation-protection="newSession"/>
-    </scr:http>
-
-    <bean id="passwordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" />
-    <bean id="logoutSuccessHandler" class="org.apache.eagle.service.security.auth.LogoutSuccessHandlerImpl" />
-    <bean id="unauthorisedEntryPoint" class="org.springframework.security.web.authentication.Http403ForbiddenEntryPoint" />
-
-    <beans profile="default">
-        <bean id="ldapUserAuthProvider" class="org.springframework.security.ldap.authentication.LdapAuthenticationProvider">
-            <constructor-arg>
-                <bean class="org.springframework.security.ldap.authentication.BindAuthenticator">
-                    <constructor-arg ref="ldapSource" />
-                    <property name="userSearch">
-                        <bean id="userSearch" class="org.springframework.security.ldap.search.FilterBasedLdapUserSearch">
-                            <constructor-arg index="0" value="${ldap.user.searchBase}" />
-                            <constructor-arg index="1" value="${ldap.user.searchPattern}" />
-                            <constructor-arg index="2" ref="ldapSource" />
-                        </bean>
-                    </property>
-                </bean>
-            </constructor-arg>
-            <constructor-arg>
-                <bean class="org.apache.eagle.service.security.auth.AuthoritiesPopulator">
-                    <constructor-arg index="0" ref="ldapSource" />
-                    <constructor-arg index="1" value="${ldap.user.groupSearchBase}" />
-                    <constructor-arg index="2" value="${acl.adminRole}" />
-                    <constructor-arg index="3" value="${acl.defaultRole}" />
-                </bean>
-            </constructor-arg>
-        </bean>
-
-        <scr:authentication-manager alias="authenticationManager">
-            <!-- do user ldap auth -->
-            <scr:authentication-provider ref="ldapUserAuthProvider"></scr:authentication-provider>
-        </scr:authentication-manager>
-
-        <bean id="ldapSource" class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
-            <constructor-arg value="${ldap.server}" />
-            <property name="userDn" value="${ldap.username}" />
-            <property name="password" value="${ldap.password}" />
-        </bean>
-    </beans>
-
-    <beans profile="sandbox,testing">
-        <scr:authentication-manager alias="authenticationManager">
-            <scr:authentication-provider>
-                <scr:user-service>
-                    <!-- user admin has role ADMIN, user eagle has role USER, both have password "secret" -->
-                    <scr:user name="eagle" password="$2a$10$TwALMRHpSetDaeTurg9rj.DnIdOde4fkQGBSPG3fVqtH.G5ZH8sQK" authorities="ROLE_USER" />
-                    <scr:user name="admin" password="$2a$10$TwALMRHpSetDaeTurg9rj.DnIdOde4fkQGBSPG3fVqtH.G5ZH8sQK" authorities="ROLE_ADMIN" />
-                </scr:user-service>
-                <scr:password-encoder ref="passwordEncoder" />
-            </scr:authentication-provider>
-        </scr:authentication-manager>
-    </beans>
-</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/resources/hbase-default.xml
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/hbase-default.xml b/eagle-webservice/src/main/resources/hbase-default.xml
deleted file mode 100644
index fe7a895..0000000
--- a/eagle-webservice/src/main/resources/hbase-default.xml
+++ /dev/null
@@ -1,935 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<configuration>
-  <property>
-    <name>hbase.rootdir</name>
-    <value>file:///tmp/hbase-${user.name}/hbase</value>
-    <description>The directory shared by region servers and into
-    which HBase persists.  The URL should be 'fully-qualified'
-    to include the filesystem scheme.  For example, to specify the
-    HDFS directory '/hbase' where the HDFS instance's namenode is
-    running at namenode.example.org on port 9000, set this value to:
-    hdfs://namenode.example.org:9000/hbase.  By default HBase writes
-    into /tmp.  Change this configuration else all data will be lost
-    on machine restart.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.port</name>
-    <value>60000</value>
-    <description>The port the HBase Master should bind to.</description>
-  </property>
-  <property>
-    <name>hbase.cluster.distributed</name>
-    <value>false</value>
-    <description>The mode the cluster will be in. Possible values are
-      false for standalone mode and true for distributed mode.  If
-      false, startup will run all HBase and ZooKeeper daemons together
-      in the one JVM.
-    </description>
-  </property>
-  <property>
-    <name>hbase.tmp.dir</name>
-    <value>/tmp/hbase-${user.name}</value>
-    <description>Temporary directory on the local filesystem.
-    Change this setting to point to a location more permanent
-    than '/tmp' (The '/tmp' directory is often cleared on
-    machine restart).
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.info.port</name>
-    <value>60010</value>
-    <description>The port for the HBase Master web UI.
-    Set to -1 if you do not want a UI instance run.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.info.bindAddress</name>
-    <value>0.0.0.0</value>
-    <description>The bind address for the HBase Master web UI
-    </description>
-  </property>
-  <property>
-    <name>hbase.client.write.buffer</name>
-    <value>2097152</value>
-    <description>Default size of the HTable clien write buffer in bytes.
-    A bigger buffer takes more memory -- on both the client and server
-    side since server instantiates the passed write buffer to process
-    it -- but a larger buffer size reduces the number of RPCs made.
-    For an estimate of server-side memory-used, evaluate
-    hbase.client.write.buffer * hbase.regionserver.handler.count
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.port</name>
-    <value>60020</value>
-    <description>The port the HBase RegionServer binds to.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.info.port</name>
-    <value>60030</value>
-    <description>The port for the HBase RegionServer web UI
-    Set to -1 if you do not want the RegionServer UI to run.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.info.port.auto</name>
-    <value>false</value>
-    <description>Whether or not the Master or RegionServer
-    UI should search for a port to bind to. Enables automatic port
-    search if hbase.regionserver.info.port is already in use.
-    Useful for testing, turned off by default.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.info.bindAddress</name>
-    <value>0.0.0.0</value>
-    <description>The address for the HBase RegionServer web UI
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.class</name>
-    <value>org.apache.hadoop.hbase.ipc.HRegionInterface</value>
-    <description>The RegionServer interface to use.
-    Used by the client opening proxy to remote region server.
-    </description>
-  </property>
-  <property>
-    <name>hbase.client.pause</name>
-    <value>1000</value>
-    <description>General client pause value.  Used mostly as value to wait
-    before running a retry of a failed get, region lookup, etc.</description>
-  </property>
-  <property>
-    <name>hbase.client.retries.number</name>
-    <value>10</value>
-    <description>Maximum retries.  Used as maximum for all retryable
-    operations such as fetching of the root region from root region
-    server, getting a cell's value, starting a row update, etc.
-    Default: 10.
-    </description>
-  </property> 
-  <property>
-    <name>hbase.bulkload.retries.number</name>
-    <value>0</value>
-    <description>Maximum retries.  This is maximum number of iterations
-    to atomic bulk loads are attempted in the face of splitting operations
-    0 means never give up.  Default: 0.
-    </description>
-  </property>
-  <property>
-    <name>hbase.client.scanner.caching</name>
-    <value>1</value>
-    <description>Number of rows that will be fetched when calling next
-    on a scanner if it is not served from (local, client) memory. Higher
-    caching values will enable faster scanners but will eat up more memory
-    and some calls of next may take longer and longer times when the cache is empty.
-    Do not set this value such that the time between invocations is greater
-    than the scanner timeout; i.e. hbase.regionserver.lease.period
-    </description>
-  </property>
-  <property>
-    <name>hbase.client.keyvalue.maxsize</name>
-    <value>10485760</value>
-    <description>Specifies the combined maximum allowed size of a KeyValue
-    instance. This is to set an upper boundary for a single entry saved in a
-    storage file. Since they cannot be split it helps avoiding that a region
-    cannot be split any further because the data is too large. It seems wise
-    to set this to a fraction of the maximum region size. Setting it to zero
-    or less disables the check.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.lease.period</name>
-    <value>60000</value>
-    <description>HRegion server lease period in milliseconds. Default is
-    60 seconds. Clients must report in within this period else they are
-    considered dead.</description>
-  </property>
-  <property>
-    <name>hbase.regionserver.handler.count</name>
-    <value>10</value>
-    <description>Count of RPC Listener instances spun up on RegionServers.
-    Same property is used by the Master for count of master handlers.
-    Default is 10.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.msginterval</name>
-    <value>3000</value>
-    <description>Interval between messages from the RegionServer to Master
-    in milliseconds.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.optionallogflushinterval</name>
-    <value>1000</value>
-    <description>Sync the HLog to the HDFS after this interval if it has not
-    accumulated enough entries to trigger a sync. Default 1 second. Units:
-    milliseconds.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.regionSplitLimit</name>
-    <value>2147483647</value>
-    <description>Limit for the number of regions after which no more region
-    splitting should take place. This is not a hard limit for the number of
-    regions but acts as a guideline for the regionserver to stop splitting after
-    a certain limit. Default is set to MAX_INT; i.e. do not block splitting.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.logroll.period</name>
-    <value>3600000</value>
-    <description>Period at which we will roll the commit log regardless
-    of how many edits it has.</description>
-  </property>
-  <property>
-    <name>hbase.regionserver.logroll.errors.tolerated</name>
-    <value>2</value>
-    <description>The number of consecutive WAL close errors we will allow
-    before triggering a server abort.  A setting of 0 will cause the
-    region server to abort if closing the current WAL writer fails during
-    log rolling.  Even a small value (2 or 3) will allow a region server
-    to ride over transient HDFS errors.</description>
-  </property>
-  <property>
-    <name>hbase.regionserver.hlog.reader.impl</name>
-    <value>org.apache.hadoop.hbase.regionserver.wal.SequenceFileLogReader</value>
-    <description>The HLog file reader implementation.</description>
-  </property>
-  <property>
-    <name>hbase.regionserver.hlog.writer.impl</name>
-    <value>org.apache.hadoop.hbase.regionserver.wal.SequenceFileLogWriter</value>
-    <description>The HLog file writer implementation.</description>
-  </property>
-  <property>
-    <name>hbase.regionserver.nbreservationblocks</name>
-    <value>4</value>
-    <description>The number of resevoir blocks of memory release on
-    OOME so we can cleanup properly before server shutdown.
-    </description>
-  </property>
-  <property>
-    <name>hbase.zookeeper.dns.interface</name>
-    <value>default</value>
-    <description>The name of the Network Interface from which a ZooKeeper server
-      should report its IP address.
-    </description>
-  </property>
-  <property>
-    <name>hbase.zookeeper.dns.nameserver</name>
-    <value>default</value>
-    <description>The host name or IP address of the name server (DNS)
-      which a ZooKeeper server should use to determine the host name used by the
-      master for communication and display purposes.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.dns.interface</name>
-    <value>default</value>
-    <description>The name of the Network Interface from which a region server
-      should report its IP address.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.dns.nameserver</name>
-    <value>default</value>
-    <description>The host name or IP address of the name server (DNS)
-      which a region server should use to determine the host name used by the
-      master for communication and display purposes.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.dns.interface</name>
-    <value>default</value>
-    <description>The name of the Network Interface from which a master
-      should report its IP address.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.dns.nameserver</name>
-    <value>default</value>
-    <description>The host name or IP address of the name server (DNS)
-      which a master should use to determine the host name used
-      for communication and display purposes.
-    </description>
-  </property>
-  <property>
-    <name>hbase.balancer.period
-    </name>
-    <value>300000</value>
-    <description>Period at which the region balancer runs in the Master.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regions.slop</name>
-    <value>0.2</value>
-    <description>Rebalance if any regionserver has average + (average * slop) regions.
-    Default is 20% slop.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.logcleaner.ttl</name>
-    <value>600000</value>
-    <description>Maximum time a HLog can stay in the .oldlogdir directory,
-    after which it will be cleaned by a Master thread.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.logcleaner.plugins</name>
-    <value>org.apache.hadoop.hbase.master.cleaner.TimeToLiveLogCleaner</value>
-    <description>A comma-separated list of LogCleanerDelegate invoked by
-    the LogsCleaner service. These WAL/HLog cleaners are called in order,
-    so put the HLog cleaner that prunes the most HLog files in front. To
-    implement your own LogCleanerDelegate, just put it in HBase's classpath
-    and add the fully qualified class name here. Always add the above
-    default log cleaners in the list.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.global.memstore.upperLimit</name>
-    <value>0.4</value>
-    <description>Maximum size of all memstores in a region server before new
-      updates are blocked and flushes are forced. Defaults to 40% of heap
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.global.memstore.lowerLimit</name>
-    <value>0.35</value>
-    <description>When memstores are being forced to flush to make room in
-      memory, keep flushing until we hit this mark. Defaults to 35% of heap.
-      This value equal to hbase.regionserver.global.memstore.upperLimit causes
-      the minimum possible flushing to occur when updates are blocked due to
-      memstore limiting.
-    </description>
-  </property>
-  <property>
-    <name>hbase.server.thread.wakefrequency</name>
-    <value>10000</value>
-    <description>Time to sleep in between searches for work (in milliseconds).
-    Used as sleep interval by service threads such as log roller.
-    </description>
-  </property>
-  <property>
-    <name>hbase.server.versionfile.writeattempts</name>
-    <value>3</value>
-    <description>
-    How many time to retry attempting to write a version file
-    before just aborting. Each attempt is seperated by the
-    hbase.server.thread.wakefrequency milliseconds.
-    </description>
-  </property>
-  <property>
-    <name>hbase.hregion.memstore.flush.size</name>
-    <value>134217728</value>
-    <description>
-    Memstore will be flushed to disk if size of the memstore
-    exceeds this number of bytes.  Value is checked by a thread that runs
-    every hbase.server.thread.wakefrequency.
-    </description>
-  </property>
-  <property>
-    <name>hbase.hregion.preclose.flush.size</name>
-    <value>5242880</value>
-    <description>
-      If the memstores in a region are this size or larger when we go
-      to close, run a "pre-flush" to clear out memstores before we put up
-      the region closed flag and take the region offline.  On close,
-      a flush is run under the close flag to empty memory.  During
-      this time the region is offline and we are not taking on any writes.
-      If the memstore content is large, this flush could take a long time to
-      complete.  The preflush is meant to clean out the bulk of the memstore
-      before putting up the close flag and taking the region offline so the
-      flush that runs under the close flag has little to do.
-    </description>
-  </property>
-  <property>
-    <name>hbase.hregion.memstore.block.multiplier</name>
-    <value>2</value>
-    <description>
-    Block updates if memstore has hbase.hregion.block.memstore
-    time hbase.hregion.flush.size bytes.  Useful preventing
-    runaway memstore during spikes in update traffic.  Without an
-    upper-bound, memstore fills such that when it flushes the
-    resultant flush files take a long time to compact or split, or
-    worse, we OOME.
-    </description>
-  </property>
-  <property>
-    <name>hbase.hregion.memstore.mslab.enabled</name>
-    <value>true</value>
-    <description>
-      Enables the MemStore-Local Allocation Buffer,
-      a feature which works to prevent heap fragmentation under
-      heavy write loads. This can reduce the frequency of stop-the-world
-      GC pauses on large heaps.
-    </description>
-  </property>
-  <property>
-    <name>hbase.hregion.max.filesize</name>
-    <value>10737418240</value>
-    <description>
-    Maximum HStoreFile size. If any one of a column families' HStoreFiles has
-    grown to exceed this value, the hosting HRegion is split in two.
-    Default: 10G.
-    </description>
-  </property>
-  <property>
-    <name>hbase.hstore.compactionThreshold</name>
-    <value>3</value>
-    <description>
-    If more than this number of HStoreFiles in any one HStore
-    (one HStoreFile is written per flush of memstore) then a compaction
-    is run to rewrite all HStoreFiles files as one.  Larger numbers
-    put off compaction but when it runs, it takes longer to complete.
-    </description>
-  </property>
-  <property>
-    <name>hbase.hstore.blockingStoreFiles</name>
-    <value>7</value>
-    <description>
-    If more than this number of StoreFiles in any one Store
-    (one StoreFile is written per flush of MemStore) then updates are
-    blocked for this HRegion until a compaction is completed, or
-    until hbase.hstore.blockingWaitTime has been exceeded.
-    </description>
-  </property>
-  <property>
-    <name>hbase.hstore.blockingWaitTime</name>
-    <value>90000</value>
-    <description>
-    The time an HRegion will block updates for after hitting the StoreFile
-    limit defined by hbase.hstore.blockingStoreFiles.
-    After this time has elapsed, the HRegion will stop blocking updates even
-    if a compaction has not been completed.  Default: 90 seconds.
-    </description>
-  </property>
-  <property>
-    <name>hbase.hstore.compaction.max</name>
-    <value>10</value>
-    <description>Max number of HStoreFiles to compact per 'minor' compaction.
-    </description>
-  </property>
-  <property>
-    <name>hbase.hregion.majorcompaction</name>
-    <value>86400000</value>
-    <description>The time (in miliseconds) between 'major' compactions of all
-    HStoreFiles in a region.  Default: 1 day.
-    Set to 0 to disable automated major compactions.
-    </description>
-  </property>
-  <property>
-    <name>hbase.mapreduce.hfileoutputformat.blocksize</name>
-    <value>65536</value>
-    <description>The mapreduce HFileOutputFormat writes storefiles/hfiles.
-    This is the minimum hfile blocksize to emit.  Usually in hbase, writing
-    hfiles, the blocksize is gotten from the table schema (HColumnDescriptor)
-    but in the mapreduce outputformat context, we don't have access to the
-    schema so get blocksize from Configuration.  The smaller you make
-    the blocksize, the bigger your index and the less you fetch on a
-    random-access.  Set the blocksize down if you have small cells and want
-    faster random-access of individual cells.
-    </description>
-  </property>
-  <property>
-    <name>hfile.block.cache.size</name>
-    <value>0.25</value>
-    <description>
-        Percentage of maximum heap (-Xmx setting) to allocate to block cache
-        used by HFile/StoreFile. Default of 0.25 means allocate 25%.
-        Set to 0 to disable but it's not recommended.
-    </description>
-  </property>
-  <property>
-    <name>hbase.hash.type</name>
-    <value>murmur</value>
-    <description>The hashing algorithm for use in HashFunction. Two values are
-    supported now: murmur (MurmurHash) and jenkins (JenkinsHash).
-    Used by bloom filters.
-    </description>
-  </property>
-  <property>
-      <name>hfile.block.index.cacheonwrite</name>
-      <value>false</value>
-      <description>
-          This allows to put non-root multi-level index blocks into the block
-          cache at the time the index is being written.
-      </description>
-  </property>
-  <property>
-      <name>hbase.regionserver.checksum.verify</name>
-      <value>false</value>
-      <description>
-         Allow hbase to do checksums rather than using hdfs checksums. This is a backwards
-         incompatible change.
-      </description>
-    </property>
-  <property>
-      <name>hfile.index.block.max.size</name>
-      <value>131072</value>
-      <description>
-          When the size of a leaf-level, intermediate-level, or root-level
-          index block in a multi-level block index grows to this size, the
-          block is written out and a new block is started.
-      </description>
-  </property>
-  <property>
-      <name>hfile.format.version</name>
-      <value>2</value>
-      <description>
-          The HFile format version to use for new files. Set this to 1 to test
-          backwards-compatibility. The default value of this option should be
-          consistent with FixedFileTrailer.MAX_VERSION.
-      </description>
-  </property>
-  <property>
-      <name>io.storefile.bloom.block.size</name>
-      <value>131072</value>
-      <description>
-          The size in bytes of a single block ("chunk") of a compound Bloom
-          filter. This size is approximate, because Bloom blocks can only be
-          inserted at data block boundaries, and the number of keys per data
-          block varies.
-      </description>
-  </property>
-  <property>
-      <name>io.storefile.bloom.cacheonwrite</name>
-      <value>false</value>
-      <description>
-          Enables cache-on-write for inline blocks of a compound Bloom filter.
-      </description>
-  </property>
-  <property>
-      <name>hbase.rs.cacheblocksonwrite</name>
-      <value>false</value>
-      <description>
-          Whether an HFile block should be added to the block cache when the
-          block is finished.
-      </description>
-  </property>
-  <property>
-    <name>hbase.rpc.engine</name>
-    <value>org.apache.hadoop.hbase.ipc.WritableRpcEngine</value>
-    <description>Implementation of org.apache.hadoop.hbase.ipc.RpcEngine to be
-    used for client / server RPC call marshalling.
-    </description>
-  </property>
-
-  <!-- The following properties configure authentication information for
-       HBase processes when using Kerberos security.  There are no default
-       values, included here for documentation purposes -->
-  <property>
-    <name>hbase.master.keytab.file</name>
-    <value></value>
-    <description>Full path to the kerberos keytab file to use for logging in
-    the configured HMaster server principal.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.kerberos.principal</name>
-    <value></value>
-    <description>Ex. "hbase/_HOST@EXAMPLE.COM".  The kerberos principal name
-    that should be used to run the HMaster process.  The principal name should
-    be in the form: user/hostname@DOMAIN.  If "_HOST" is used as the hostname
-    portion, it will be replaced with the actual hostname of the running
-    instance.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.keytab.file</name>
-    <value></value>
-    <description>Full path to the kerberos keytab file to use for logging in
-    the configured HRegionServer server principal.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.kerberos.principal</name>
-    <value></value>
-    <description>Ex. "hbase/_HOST@EXAMPLE.COM".  The kerberos principal name
-    that should be used to run the HRegionServer process.  The principal name
-    should be in the form: user/hostname@DOMAIN.  If "_HOST" is used as the
-    hostname portion, it will be replaced with the actual hostname of the
-    running instance.  An entry for this principal must exist in the file
-    specified in hbase.regionserver.keytab.file
-    </description>
-  </property>
-
-  <!-- Additional configuration specific to HBase security -->
-  <property>
-    <name>hadoop.policy.file</name>
-    <value>hbase-policy.xml</value>
-    <description>The policy configuration file used by RPC servers to make
-      authorization decisions on client requests.  Only used when HBase
-      security is enabled.
-    </description>
-  </property>
-  <property>
-    <name>hbase.superuser</name>
-    <value></value>
-    <description>List of users or groups (comma-separated), who are allowed
-    full privileges, regardless of stored ACLs, across the cluster.
-    Only used when HBase security is enabled.
-    </description>
-  </property>
-  <property>
-    <name>hbase.auth.key.update.interval</name>
-    <value>86400000</value>
-    <description>The update interval for master key for authentication tokens 
-    in servers in milliseconds.  Only used when HBase security is enabled.
-    </description>
-  </property>
-  <property>
-    <name>hbase.auth.token.max.lifetime</name>
-    <value>604800000</value>
-    <description>The maximum lifetime in milliseconds after which an
-    authentication token expires.  Only used when HBase security is enabled.
-    </description>
-  </property>
-
-  <property>
-    <name>zookeeper.session.timeout</name>
-    <value>180000</value>
-    <description>ZooKeeper session timeout.
-      HBase passes this to the zk quorum as suggested maximum time for a
-      session (This setting becomes zookeeper's 'maxSessionTimeout').  See
-      http://hadoop.apache.org/zookeeper/docs/current/zookeeperProgrammers.html#ch_zkSessions
-      "The client sends a requested timeout, the server responds with the
-      timeout that it can give the client. " In milliseconds.
-    </description>
-  </property>
-  <property>
-    <name>zookeeper.znode.parent</name>
-    <value>/hbase-unsecure</value>
-    <description>Root ZNode for HBase in ZooKeeper. All of HBase's ZooKeeper
-      files that are configured with a relative path will go under this node.
-      By default, all of HBase's ZooKeeper file path are configured with a
-      relative path, so they will all go under this directory unless changed.
-    </description>
-  </property>
-  <property>
-    <name>zookeeper.znode.rootserver</name>
-    <value>root-region-server</value>
-    <description>Path to ZNode holding root region location. This is written by
-      the master and read by clients and region servers. If a relative path is
-      given, the parent folder will be ${zookeeper.znode.parent}. By default,
-      this means the root location is stored at /hbase/root-region-server.
-    </description>
-  </property>
-
-  <property>
-    <name>zookeeper.znode.acl.parent</name>
-    <value>acl</value>
-    <description>Root ZNode for access control lists.</description>
-  </property>
-  
-  <property>
-    <name>hbase.coprocessor.region.classes</name>
-    <value></value>
-    <description>A comma-separated list of Coprocessors that are loaded by
-    default on all tables. For any override coprocessor method, these classes
-    will be called in order. After implementing your own Coprocessor, just put
-    it in HBase's classpath and add the fully qualified class name here.
-    A coprocessor can also be loaded on demand by setting HTableDescriptor.
-    </description>
-  </property>
-
-  <property>
-    <name>hbase.coprocessor.master.classes</name>
-    <value></value>
-    <description>A comma-separated list of
-    org.apache.hadoop.hbase.coprocessor.MasterObserver coprocessors that are
-    loaded by default on the active HMaster process. For any implemented
-    coprocessor methods, the listed classes will be called in order. After
-    implementing your own MasterObserver, just put it in HBase's classpath
-    and add the fully qualified class name here.
-    </description>
-  </property>
-
-  <!--
-  The following three properties are used together to create the list of
-  host:peer_port:leader_port quorum servers for ZooKeeper.
-  -->
-  <property>
-    <name>hbase.zookeeper.quorum</name>
-    <value>localhost</value>
-    <description>Comma separated list of servers in the ZooKeeper Quorum.
-    For example, "host1.mydomain.com,host2.mydomain.com,host3.mydomain.com".
-    By default this is set to localhost for local and pseudo-distributed modes
-    of operation. For a fully-distributed setup, this should be set to a full
-    list of ZooKeeper quorum servers. If HBASE_MANAGES_ZK is set in hbase-env.sh
-    this is the list of servers which we will start/stop ZooKeeper on.
-    </description>
-  </property>
-  <property>
-    <name>hbase.zookeeper.peerport</name>
-    <value>2888</value>
-    <description>Port used by ZooKeeper peers to talk to each other.
-    See http://hadoop.apache.org/zookeeper/docs/r3.1.1/zookeeperStarted.html#sc_RunningReplicatedZooKeeper
-    for more information.
-    </description>
-  </property>
-  <property>
-    <name>hbase.zookeeper.leaderport</name>
-    <value>3888</value>
-    <description>Port used by ZooKeeper for leader election.
-    See http://hadoop.apache.org/zookeeper/docs/r3.1.1/zookeeperStarted.html#sc_RunningReplicatedZooKeeper
-    for more information.
-    </description>
-  </property>
-  <property>
-    <name>hbase.zookeeper.useMulti</name>
-    <value>true</value>
-    <description>Instructs HBase to make use of ZooKeeper's multi-update functionality.
-    This allows certain ZooKeeper operations to complete more quickly and prevents some issues
-    with rare ZooKeeper failure scenarios (see the release note of HBASE-6710 for an example).
-    IMPORTANT: only set this to true if all ZooKeeper servers in the cluster are on version 3.4+
-    and will not be downgraded.  ZooKeeper versions before 3.4 do not support multi-update and will
-    not fail gracefully if multi-update is invoked (see ZOOKEEPER-1495).
-    NOTE: this and future versions of HBase are only supported to work with
-    versions of ZooKeeper with multi support (CDH4+), so it is safe to use ZK.multi.
-    </description>
-  </property>
-  <!-- End of properties used to generate ZooKeeper host:port quorum list. -->
-
-  <!--
-  Beginning of properties that are directly mapped from ZooKeeper's zoo.cfg.
-  All properties with an "hbase.zookeeper.property." prefix are converted for
-  ZooKeeper's configuration. Hence, if you want to add an option from zoo.cfg,
-  e.g.  "initLimit=10" you would append the following to your configuration:
-    <property>
-      <name>hbase.zookeeper.property.initLimit</name>
-      <value>10</value>
-    </property>
-  -->
-  <property>
-    <name>hbase.zookeeper.property.initLimit</name>
-    <value>10</value>
-    <description>Property from ZooKeeper's config zoo.cfg.
-    The number of ticks that the initial synchronization phase can take.
-    </description>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.syncLimit</name>
-    <value>5</value>
-    <description>Property from ZooKeeper's config zoo.cfg.
-    The number of ticks that can pass between sending a request and getting an
-    acknowledgment.
-    </description>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.dataDir</name>
-    <value>${hbase.tmp.dir}/zookeeper</value>
-    <description>Property from ZooKeeper's config zoo.cfg.
-    The directory where the snapshot is stored.
-    </description>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.clientPort</name>
-    <value>2181</value>
-    <description>Property from ZooKeeper's config zoo.cfg.
-    The port at which the clients will connect.
-    </description>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.maxClientCnxns</name>
-    <value>300</value>
-    <description>Property from ZooKeeper's config zoo.cfg.
-    Limit on number of concurrent connections (at the socket level) that a
-    single client, identified by IP address, may make to a single member of
-    the ZooKeeper ensemble. Set high to avoid zk connection issues running
-    standalone and pseudo-distributed.
-    </description>
-  </property>
-  <!-- End of properties that are directly mapped from ZooKeeper's zoo.cfg -->
-  <property>
-    <name>hbase.rest.port</name>
-    <value>8080</value>
-    <description>The port for the HBase REST server.</description>
-  </property>
-  <property>
-    <name>hbase.rest.readonly</name>
-    <value>false</value>
-    <description>
-    Defines the mode the REST server will be started in. Possible values are:
-    false: All HTTP methods are permitted - GET/PUT/POST/DELETE.
-    true: Only the GET method is permitted.
-    </description>
-  </property>
-
-  <property skipInDoc="true">
-    <name>hbase.defaults.for.version</name>
-    <value>0.94.2-cdh4.2.1</value>
-    <description>
-    This defaults file was compiled for version 0.94.2-cdh4.2.1. This variable is used
-    to make sure that a user doesn't have an old version of hbase-default.xml on the
-    classpath.
-    </description>
-  </property>
-  <property>
-    <name>hbase.defaults.for.version.skip</name>
-    <value>true</value>
-    <description>
-    Set to true to skip the 'hbase.defaults.for.version' check.
-    Setting this to true can be useful in contexts other than
-    the other side of a maven generation; i.e. running in an
-    ide.  You'll want to set this boolean to true to avoid
-    seeing the RuntimException complaint: "hbase-default.xml file
-    seems to be for and old version of HBase (0.94.2-cdh4.2.1), this
-    version is X.X.X-SNAPSHOT"
-    </description>
-  </property>
-  <property>
-      <name>hbase.coprocessor.abortonerror</name>
-      <value>false</value>
-      <description>
-      Set to true to cause the hosting server (master or regionserver) to
-      abort if a coprocessor throws a Throwable object that is not IOException or
-      a subclass of IOException. Setting it to true might be useful in development
-      environments where one wants to terminate the server as soon as possible to
-      simplify coprocessor failure analysis.
-      </description>
-  </property>
-  <property>
-    <name>hbase.online.schema.update.enable</name>
-    <value>false</value>
-    <description>
-    Set true to enable online schema changes.  This is an experimental feature.  
-    There are known issues modifying table schemas at the same time a region
-    split is happening so your table needs to be quiescent or else you have to
-    be running with splits disabled.
-    </description>
-  </property>
-  <property>
-    <name>dfs.support.append</name>
-    <value>true</value>
-    <description>Does HDFS allow appends to files?
-    This is an hdfs config. set in here so the hdfs client will do append support.
-    You must ensure that this config. is true serverside too when running hbase
-    (You will have to restart your cluster after setting it).
-    </description>
-  </property>
-  <property>
-    <name>hbase.thrift.minWorkerThreads</name>
-    <value>16</value>
-    <description>
-    The "core size" of the thread pool. New threads are created on every
-    connection until this many threads are created.
-    </description>
-  </property>
-  <property>
-    <name>hbase.thrift.maxWorkerThreads</name>
-    <value>1000</value>
-    <description>
-    The maximum size of the thread pool. When the pending request queue
-    overflows, new threads are created until their number reaches this number.
-    After that, the server starts dropping connections.
-    </description>
-  </property>
-  <property>
-     <name>hbase.thrift.maxQueuedRequests</name>
-     <value>1000</value>
-     <description>
-     The maximum number of pending Thrift connections waiting in the queue. If
-     there are no idle threads in the pool, the server queues requests. Only
-     when the queue overflows, new threads are added, up to
-     hbase.thrift.maxQueuedRequests threads.
-     </description>
-   </property>
-     <property>
-     <name>hbase.offheapcache.percentage</name>
-     <value>0</value>
-     <description>
-     The amount of off heap space to be allocated towards the experimental
-     off heap cache. If you desire the cache to be disabled, simply set this
-     value to 0.
-     </description>
-   </property>
-   <property>
-    <name>hbase.data.umask.enable</name>
-    <value>false</value>
-    <description>Enable, if true, that file permissions should be assigned
-      to the files written by the regionserver
-    </description>
-  </property>
-  <property>
-    <name>hbase.data.umask</name>
-    <value>000</value>
-    <description>File permissions that should be used to write data
-      files when hbase.data.umask.enable is true
-    </description>
-  </property>
-
-  <property>
-    <name>hbase.metrics.showTableName</name>
-    <value>true</value>
-    <description>Whether to include the prefix "tbl.tablename" in per-column family metrics.
-	If true, for each metric M, per-cf metrics will be reported for tbl.T.cf.CF.M, if false,
-	per-cf metrics will be aggregated by column-family across tables, and reported for cf.CF.M.
-	In both cases, the aggregated metric M across tables and cfs will be reported.
-    </description>
-  </property>
-  <property>
-    <name>hbase.table.archive.directory</name>
-    <value>.archive</value>
-    <description>Per-table directory name under which to backup files for a
-      table. Files are moved to the same directories as they would be under the
-      table directory, but instead are just one level lower (under
-      table/.archive/... rather than table/...). Currently only applies to HFiles.</description>
-  </property>
-  <property>
-    <name>hbase.master.hfilecleaner.plugins</name>
-    <value>org.apache.hadoop.hbase.master.cleaner.TimeToLiveHFileCleaner</value>
-    <description>A comma-separated list of HFileCleanerDelegate invoked by
-    the HFileCleaner service. These HFiles cleaners are called in order,
-    so put the cleaner that prunes the most files in front. To
-    implement your own HFileCleanerDelegate, just put it in HBase's classpath
-    and add the fully qualified class name here. Always add the above
-    default log cleaners in the list as they will be overwritten in hbase-site.xml.
-    </description>
-  </property>
-  <property>
-    <name>hbase.rest.threads.max</name>
-    <value>100</value>
-    <description>
-        The maximum number of threads of the REST server thread pool.
-        Threads in the pool are reused to process REST requests. This
-        controls the maximum number of requests processed concurrently.
-        It may help to control the memory used by the REST server to
-        avoid OOM issues. If the thread pool is full, incoming requests
-        will be queued up and wait for some free threads. The default
-        is 100.
-    </description>
-  </property>
-  <property>
-    <name>hbase.rest.threads.min</name>
-    <value>2</value>
-    <description>
-        The minimum number of threads of the REST server thread pool.
-        The thread pool always has at least these number of threads so
-        the REST server is ready to serve incoming requests. The default
-        is 2.
-    </description>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/resources/ldap.properties
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/ldap.properties b/eagle-webservice/src/main/resources/ldap.properties
deleted file mode 100644
index fa28ad3..0000000
--- a/eagle-webservice/src/main/resources/ldap.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ldap.server=ldap://localhost:10389
-ldap.username=uid=admin,ou=system
-ldap.password=secret
-ldap.user.searchBase=ou=Users,o=mojo
-ldap.user.searchPattern=(uid={0})
-ldap.user.groupSearchBase=ou=groups,o=mojo
-acl.adminRole=ADMIN
-acl.defaultRole=POLICYVIEWER
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/log4j.properties b/eagle-webservice/src/main/resources/log4j.properties
deleted file mode 100644
index 9ccd8da..0000000
--- a/eagle-webservice/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-log4j.rootLogger=INFO, stdout
-
-# standard output
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p [%t] %c{2}[%L]: %m%n
-
-# set log level as INFO for debug-log dumping components
-log4j.category.org.springframework=INFO
-log4j.category.org.apache.torque=INFO
-log4j.category.org.commons=INFO
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/META-INF/MANIFEST.MF b/eagle-webservice/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/eagle-webservice/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/META-INF/context.xml
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/META-INF/context.xml b/eagle-webservice/src/main/webapp/META-INF/context.xml
deleted file mode 100644
index 9b0b5d0..0000000
--- a/eagle-webservice/src/main/webapp/META-INF/context.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Context path="/">
-</Context>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/WEB-INF/web.xml b/eagle-webservice/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e68a22e..0000000
--- a/eagle-webservice/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<!-- This web.xml file is not required when using Servlet 3.0 container, 
-	see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html -->
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-	<welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-	<servlet>
-		<servlet-name>Jersey Web Application</servlet-name>
-		<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
-		<init-param>
-			<param-name>com.sun.jersey.config.property.packages</param-name>
-			<param-value>org.apache.eagle;org.codehaus.jackson.jaxrs</param-value>
-		</init-param>
-        <!--init-param> <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
-            <param-value>true</param-value> </init-param -->
-		<!-- probably the following parameter should not be in production -->
-		<!-- init-param> <param-name>com.sun.jersey.config.feature.Trace</param-name> 
-			<param-value>true</param-value> </init-param -->
-		<init-param>
-			<param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
-			<param-value>com.sun.jersey.api.container.filter.GZIPContentEncodingFilter;com.sun.jersey.api.container.filter.PostReplaceFilter</param-value>
-		</init-param>
-		<init-param>
-			<param-name>com.sun.jersey.spi.container.ContainerResponseFilters</param-name>
-			<param-value>com.sun.jersey.api.container.filter.GZIPContentEncodingFilter</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>Jersey Web Application</servlet-name>
-		<url-pattern>/rest/*</url-pattern>
-	</servlet-mapping>
-    <filter>
-       <filter-name>CorsFilter</filter-name>
-       <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
-        <init-param>
-            <param-name>cors.allowed.origins</param-name>
-            <param-value>*</param-value>
-        </init-param>
-        <init-param>
-            <param-name>cors.allowed.headers</param-name>
-            <param-value>Authorization,Origin, No-Cache, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type, X-E4M-With, Accept</param-value>
-        </init-param>
-        <init-param>
-            <param-name>cors.allowed.methods</param-name>
-            <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
-        </init-param>
-        <init-param>
-            <param-name>cors.support.credentials</param-name>
-            <param-value>true</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <filter-name>CorsFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <!-- spring security -->
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>
-            classpath:/applicationContext.xml
-            classpath:/eagleSecurity.xml
-        </param-value>
-    </context-param>
-<!--    <context-param>
-  		<param-name>spring.profiles.active</param-name>
-  		<param-value>sandbox</param-value>
-	</context-param>-->
-    <context-param>
-        <param-name>contextInitializerClasses</param-name>
-        <param-value>org.apache.eagle.service.security.profile.EagleServiceProfileInitializer</param-value>
-    </context-param>
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
-
-    <!-- AKKA System Setup -->
-    <listener>
-        <listener-class>org.apache.eagle.service.security.profile.ApplicationSchedulerListener</listener-class>
-    </listener>
-
-    <session-config>
-        <!-- in minutes -->
-        <session-timeout>60</session-timeout>
-    </session-config>
-</web-app>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/index.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/index.html b/eagle-webservice/src/main/webapp/_app/index.html
deleted file mode 100644
index 7cd3e25..0000000
--- a/eagle-webservice/src/main/webapp/_app/index.html
+++ /dev/null
@@ -1,281 +0,0 @@
-<!DOCTYPE html>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<html ng-app="eagleApp" ng-controller="MainCtrl">
-	<head>
-		<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta charset="UTF-8">
-		<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-		<link rel="shortcut icon" href="public/images/favicon.png">
-
-		<title>Eagle</title>
-		<link rel="shortcut icon" type="image/png" href="public/images/favicon.png">
-
-		<!-- ref:css public/css/styles.min.css -->
-		<link href="public/css/main.css" rel="stylesheet" type="text/css" media="screen">
-		<link href="public/css/animation.css" rel="stylesheet" type="text/css" media="screen">
-		<link href="../node_modules/bootstrap/dist/css/bootstrap.css" rel="stylesheet" type="text/css" media="screen">
-		<link href="../node_modules/zombiej-bootstrap-components/bootstrap-components/css/bootstrap-components.css" rel="stylesheet" type="text/css" media="screen">
-		<link href="../node_modules/zombiej-nvd3/build/nv.d3.css" rel="stylesheet" type="text/css" />
-		<link href="../node_modules/font-awesome/css/font-awesome.css" rel="stylesheet" type="text/css" />
-		<link href="../node_modules/admin-lte/dist/css/AdminLTE.css" rel="stylesheet" type="text/css" />
-		<link href="../node_modules/admin-lte/dist/css/skins/skin-blue.css" rel="stylesheet" type="text/css" />
-		<!-- endref -->
-	</head>
-	<body class="skin-blue sidebar-mini" ng-class="{'no-sidebar' : PageConfig.hideSidebar}">
-		<!-- Site wrapper -->
-		<div class="wrapper">
-			<header class="main-header">
-				<a href="#/" class="logo">
-					<span class="logo-mini"><img src="public/images/favicon_white.png" /></span>
-					<span class="logo-lg">Apache Eagle</span>
-				</a>
-				<!-- Header Navbar: style can be found in header.less -->
-				<nav class="navbar navbar-static-top" role="navigation">
-					<!-- Sidebar toggle button-->
-					<a ng-hide="PageConfig.hideSidebar" class="sidebar-toggle" data-toggle="offcanvas" role="button">
-						<span class="sr-only">Toggle navigation</span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-					</a>
-
-					<div class="navbar-custom-menu">
-						<ul class="nav navbar-nav">
-							<!-- Admin error list -->
-							<li class="dropdown" ng-show="ServiceError.list.length">
-								<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-									<i class="fa fa-exclamation-triangle" ng-class="{blink: ServiceError.hasUnread}"></i>
-								</a>
-								<ul class="dropdown-menu">
-									<li ng-repeat="error in ServiceError.list">
-										<a ng-click="ServiceError.showError(error);">
-											<span class="fa" ng-class="{'fa-envelope': !error._read, 'fa-check': error._read}"></span>
-											{{error.title}}
-										</a>
-									</li>
-									<li role="separator" class="divider"></li>
-									<li>
-										<a ng-click="ServiceError.clearAll();">
-											<span class="fa fa-trash"></span>
-											Clear All
-										</a>
-									</li>
-								</ul>
-							</li>
-
-							<!-- Site -->
-							<li class="dropdown" ng-show="!PageConfig.hideSite && !PageConfig.lockSite">
-								<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-									<i class="fa fa-server"></i>
-									{{Site.current().tags.site}}
-									<i class="fa fa-caret-down"></i>
-								</a>
-								<ul class="dropdown-menu">
-									<li ng-repeat="_site in Site.list" ng-if="_site.enabled">
-										<a ng-click="Site.current(_site);">
-											<span class="fa fa-database"></span> {{_site.tags.site}}
-										</a>
-									</li>
-								</ul>
-							</li>
-							<li class="dropdown" ng-show="PageConfig.lockSite">
-								<a>
-									<i class="fa fa-server"></i>
-									{{Site.current().tags.site}}
-								</a>
-							</li>
-
-							<!-- User -->
-							<li class="dropdown user user-menu" ng-hide="PageConfig.hideUser">
-								<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-									<i class="fa fa-user"></i>
-									{{Auth.userProfile.username}}
-								</a>
-								<ul class="dropdown-menu">
-									<!-- User image -->
-									<li class="user-header">
-										<span class="img-circle">
-											<span class="fa fa-user" alt="User Image"></span>
-										</span>
-										<p>
-											{{Auth.userProfile.username}}
-											<small>
-												<span ng-repeat="role in Auth.userProfile.authorities">{{role.authority}} </span>
-											</small>
-										</p>
-									</li>
-									<!-- Menu Footer-->
-									<li class="user-footer">
-										<div class="pull-left" ng-if="Auth.isRole('ROLE_ADMIN')">
-											<a href="#/config/site" class="btn btn-default btn-flat">Management</a>
-										</div>
-										<div class="pull-right">
-											<a ng-click="logout();" class="btn btn-default btn-flat">Sign out</a>
-										</div>
-									</li>
-								</ul>
-							</li>
-						</ul>
-					</div>
-
-					<!-- Applications -->
-					<div ng-hide="PageConfig.hideApplication">
-						<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#moduleMenu">
-							<span class="sr-only">Toggle navigation</span>
-							<span class="fa fa-map"></span>
-						</button>
-						<div class="collapse navbar-collapse" id="moduleMenu">
-							<ul class="nav navbar-nav">
-								<li ng-repeat="_grp in Site.current().applicationGroupList" ng-if="_grp.enabledList.length"
-									class="dropdown" ng-class="{active: Application.current().group === _grp.name}">
-									<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-										{{_grp.name}}
-									</a>
-									<ul class="dropdown-menu">
-										<li ng-repeat="_app in _grp.enabledList">
-											<a ng-click="Application.current(_app);">
-												<span class="fa fa-cubes"></span> {{_app.displayName}}
-											</a>
-										</li>
-									</ul>
-								</li>
-							</ul>
-						</div>
-					</div>
-				</nav>
-			</header>
-
-			<!-- =============================================== -->
-			<!-- Left side column. contains the side bar -->
-			<aside class="main-sidebar" ng-hide="PageConfig.hideSidebar">
-				<!-- side bar: style can be found in sidebar.less -->
-				<section class="sidebar">
-					<ul class="sidebar-menu">
-						<li class="header">
-							{{Application.current().group || 'Application'}} >
-							{{Application.current().displayName || 'Features'}}
-						</li>
-						<li ng-repeat="page in PageConfig.navConfig.pageList track by $index" ng-class="getNavClass(page)" ng-show="getNavVisible(page)">
-							<a href="{{page.url}}">
-								<i class="fa fa-{{page.icon}}"></i> <span>{{page.title}}</span> 
-							</a>
-						</li>
-					</ul>
-				</section>
-				<!-- /.sidebar -->
-			</aside>
-
-			<!-- =============================================== -->
-			<!-- Right side column. Contains the navbar and content of the page -->
-			<div class="content-wrapper">
-				<!-- Content Header (Page header) -->
-				<section class="content-header" ng-hide="PageConfig.hideSidebar">
-					<h1>
-						<span class="pageTitle">{{PageConfig.pageTitle}}</span>
-						<small class="pageSubTitle">{{PageConfig.pageSubTitle}}</small>
-					</h1>
-
-
-					<ol class="breadcrumb">
-						<li ng-repeat="navPath in PageConfig.navPath">
-							<a ng-href="#{{navPath.path}}">
-								<span class="fa fa-home" ng-if="$first"></span>
-								{{navPath.title || navPath.path}}
-							</a>
-						</li>
-					</ol>
-				</section>
-
-				<!-- Main content -->
-				<section class="content">
-					<div id="content">
-						<div ui-view></div>
-					</div>
-				</section><!-- /.content -->
-			</div><!-- /.content-wrapper -->
-
-			<footer class="main-footer">
-				<div class="pull-right hidden-xs">
-					<b>License</b>
-					<a href="http://www.apache.org/licenses/LICENSE-2.0" class="text-muted">Apache-2.0</a>
-				</div>
-				<strong>
-					Apache Eagle
-					<a target="_blank" href="https://eagle.incubator.apache.org/">Home</a> /
-					<a target="_blank" href="https://eagle.incubator.apache.org/docs/community.html">Community</a> /
-					<a target="_blank" href="https://cwiki.apache.org/confluence/display/EAG/FAQ">FAQ</a>
-				</strong>
-			</footer>
-		</div><!-- ./wrapper -->
-
-		<!-- ref:js public/js/doc.js -->
-		<script src="../node_modules/jquery/dist/jquery.js"></script>
-		<script src="../node_modules/jquery-slimscroll/jquery.slimscroll.min.js"></script>
-		<script src="../node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
-		<script src="../node_modules/zombiej-bootstrap-components/bootstrap-components/js/bootstrap-components.min.js"></script>
-		<script src="../node_modules/moment/min/moment-with-locales.min.js"></script>
-		<script src="../node_modules/moment-timezone/builds/moment-timezone-with-data.min.js"></script>
-		<script src="../node_modules/admin-lte/dist/js/app.min.js"></script>
-		<script src="../node_modules/angular/angular.js"></script>
-		<script src="../node_modules/angular-resource/angular-resource.js"></script>
-		<script src="../node_modules/angular-route/angular-route.js"></script>
-		<script src="../node_modules/angular-animate/angular-animate.js"></script>
-		<script src="../node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
-		<script src="../node_modules/angular-ui-router/release/angular-ui-router.js"></script>
-		<script src="../node_modules/d3/d3.js"></script>
-		<script src="../node_modules/zombiej-nvd3/build/nv.d3.js"></script>
-
-		<!-- Application -->
-		<script src="public/js/app.js" type="text/javascript" charset="utf-8"></script>
-
-		<!-- Service -->
-		<script src="public/js/srv/main.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/srv/applicationSrv.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/srv/authorizationSrv.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/srv/entitiesSrv.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/srv/siteSrv.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/srv/pageSrv.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/srv/wrapStateSrv.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/srv/uiSrv.js" type="text/javascript" charset="utf-8"></script>
-
-		<!-- Misc -->
-		<script src="public/js/app.ui.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/app.time.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/app.config.js" type="text/javascript" charset="utf-8"></script>
-
-		<script src="public/js/common.js" type="text/javascript" charset="utf-8"></script>
-
-		<!-- Components -->
-		<script src="public/js/components/main.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/components/sortTable.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/components/tabs.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/components/file.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/components/charts/line3d.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/components/nvd3.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/components/sortable.js" type="text/javascript" charset="utf-8"></script>
-
-		<!-- Controllers -->
-		<script src="public/js/ctrl/main.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/ctrl/authController.js" type="text/javascript" charset="utf-8"></script>
-		<script src="public/js/ctrl/configurationController.js" type="text/javascript" charset="utf-8"></script>
-		<!-- endref -->
-	</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/partials/config/application.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/partials/config/application.html b/eagle-webservice/src/main/webapp/_app/partials/config/application.html
deleted file mode 100644
index 0bf194c..0000000
--- a/eagle-webservice/src/main/webapp/_app/partials/config/application.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<div class="box box-info">
-	<div class="box-header with-border">
-		<h3 class="box-title">
-			<span class="fa fa-cogs"></span>
-			Configuration
-			<small class="text-danger" ng-show="changed">
-				<span class="label label-warning label-sm">Unsaved</span>
-			</small>
-		</h3>
-	</div><!-- /.box-header -->
-
-	<div class="box-body">
-		<div class="row">
-			<div class="col-md-3">
-				<ul class="nav nav-pills nav-stacked">
-					<li class="disabled"><a>Application</a></li>
-					<li role="presentation" ng-repeat="_application in Application.list track by $index" ng-class="{active: application === _application}">
-						<a ng-click="setApplication(_application)">
-							<span class="fa fa-server"></span>
-							{{_application.tags.application}}
-							<span ng-if="_application.alias">({{_application.alias}})</span>
-						</a>
-					</li>
-
-					<li>
-						<a class="text-light-blue" ng-click="newApplication()" ng-disabled="_pageLock">
-							<span class="fa fa-plus-square"></span>
-							New Application
-						</a>
-					</li>
-				</ul>
-			</div>
-
-			<div class="col-md-9">
-				<a class="pull-right btn btn-danger btn-xs" ng-click="deleteApplication(application)" ng-disabled="_pageLock">
-					<span class="fa fa-trash-o"></span>
-					Delete Application
-				</a>
-
-				<!-- Title -->
-				<h3 class="guideline">
-					Application
-					<small>{{application.tags.application}}</small>
-				</h3>
-				<hr/>
-
-				<!-- Config -->
-				<div class="form-group">
-					<label for="displayName">Display Name</label>
-					<input type="text" class="form-control" id="displayName" placeholder="(Optional) Display name." ng-model="applications[application.tags.application].alias">
-				</div>
-				<div class="form-group">
-					<label for="applicationGroup">Group</label>
-					<input type="text" class="form-control" id="applicationGroup" placeholder="(Optional) Group name" ng-model="applications[application.tags.application].groupName">
-				</div>
-				<div class="form-group">
-					<label for="applicationDescription">Description</label>
-					<textarea id="applicationDescription" class="form-control" placeholder="(Optional) Application description" rows="2" ng-model="applications[application.tags.application].description"></textarea>
-				</div>
-				<div class="form-group">
-					<label for="applicationConfiguration">Configuration</label>
-					<span class="text-danger">{{configCheck(applications[application.tags.application].config)}}</span>
-					<textarea id="applicationConfiguration" class="form-control" placeholder="Application configuration. Feature can read this " rows="5" ng-model="applications[application.tags.application].config"></textarea>
-				</div>
-
-				<!-- Feature -->
-				<label>* Feature</label>
-				<div class="row">
-					<div class="col-sm-6">
-						<h1 class="text-muted text-center" ng-show="applications[application.tags.application].features.length === 0">No feature in using</h1>
-						<ul class="products-list product-list-in-box fixed-height" ng-show="applications[application.tags.application].features.length !== 0">
-							<li class="item" ng-repeat="feature in applications[application.tags.application].features track by $index" ng-class="{active: _feature === feature}">
-								<div class="product-operation">
-									<a class="fa fa-chevron-up" ng-click="moveFeature(feature, applications[application.tags.application].features, -1)"></a>
-									<a class="fa fa-chevron-down" ng-click="moveFeature(feature, applications[application.tags.application].features, 1)"></a>
-								</div>
-								<div class="product-info">
-									<a class="fa fa-times pull-right" ng-click="removeFeature(feature, applications[application.tags.application])"></a>
-									<span class="product-title">{{feature}}</span>
-									<span class="product-description">{{Application.featureList.set[feature].description}}</span>
-								</div>
-							</li>
-						</ul>
-					</div>
-					<div class="col-sm-6">
-						<ul class="products-list product-list-in-box fixed-height">
-							<li class="item" ng-repeat="feature in applications[application.tags.application].optionalFeatures track by $index">
-								<button class="btn btn-lg btn-primary pull-left" ng-click="addFeature(feature, applications[application.tags.application])" ng-disabled="_pageLock">
-									<span class="fa fa-star-o"></span>
-								</button>
-								<div class="product-info">
-									<span class="product-title">{{feature}}</span>
-									<span class="product-description">{{Application.featureList.set[feature].description}}</span>
-								</div>
-							</li>
-						</ul>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div><!-- /.box-body -->
-
-	<div class="box-footer clearfix">
-		<button class="btn btn-primary" ng-click="saveAll()" ng-disabled="_pageLock">Save All</button>
-	</div>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/partials/config/feature.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/partials/config/feature.html b/eagle-webservice/src/main/webapp/_app/partials/config/feature.html
deleted file mode 100644
index 945d90b..0000000
--- a/eagle-webservice/src/main/webapp/_app/partials/config/feature.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<div class="box box-info">
-	<div class="box-header with-border">
-		<h3 class="box-title">
-			<span class="fa fa-cogs"></span>
-			Configuration
-			<small class="text-danger" ng-show="changed">
-				<span class="label label-warning label-sm">Unsaved</span>
-			</small>
-		</h3>
-	</div><!-- /.box-header -->
-
-	<div class="box-body">
-		<div class="row">
-			<div class="col-md-3">
-				<ul class="nav nav-pills nav-stacked">
-					<li class="disabled">
-						<a>Feature</a>
-					</li>
-					<li role="presentation" ng-repeat="_feature in Application.featureList" ng-class="{active: feature === _feature}">
-						<a ng-click="setFeature(_feature)">
-							<span class="fa fa-leaf" ng-class="{'text-danger': _feature._loaded === false}" uib-tooltip="Module load failed!" tooltip-enable="_feature._loaded === false"></span>
-							{{_feature.tags.feature}}
-						</a>
-					</li>
-					<li>
-						<a class="text-light-blue" ng-click="newFeature()" ng-disabled="_pageLock">
-							<span class="fa fa-plus-square"></span>
-							New Feature
-						</a>
-					</li>
-				</ul>
-			</div>
-
-			<div class="col-md-9">
-				<a class="pull-right btn btn-danger btn-xs" ng-click="deleteFeature(feature)" ng-disabled="_pageLock">
-					<span class="fa fa-trash-o"></span>
-					Delete Feature
-				</a>
-
-				<h3 class="guideline">
-					<span class="fa fa-exclamation-triangle text-danger" uib-tooltip="Module load failed!" ng-show="feature._loaded === false"></span>
-					{{feature.tags.feature}}
-				</h3>
-				<hr/>
-
-				<p class="text text-muted">
-					Will load the start up file <code>controller.js</code> from <code>public/feature/{{feature.tags.feature}}</code>.
-					If you are developing customized feature, please reference provided feature.
-				</p>
-
-				<!-- Config -->
-				<div class="form-group">
-					<label for="featureVersion">Version</label>
-					<input id="featureVersion" type="text" class="form-control" placeholder="(Optional) Feature version." ng-model="features[feature.tags.feature].version">
-				</div>
-				<div class="form-group">
-					<label for="featureDescription">Description</label>
-					<textarea id="featureDescription" class="form-control" placeholder="(Optional) Feature description." rows="10" ng-model="features[feature.tags.feature].description"></textarea>
-				</div>
-			</div>
-		</div>
-	</div><!-- /.box-body -->
-
-	<div class="box-footer clearfix">
-		<button class="btn btn-primary" ng-click="saveAll()" ng-disabled="_pageLock">Save All</button>
-	</div>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/partials/config/site.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/partials/config/site.html b/eagle-webservice/src/main/webapp/_app/partials/config/site.html
deleted file mode 100644
index f7d43eb..0000000
--- a/eagle-webservice/src/main/webapp/_app/partials/config/site.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<div class="box box-info">
-	<div class="box-header with-border">
-		<h3 class="box-title">
-			<span class="fa fa-cogs"></span>
-			Configuration
-			<small class="text-danger" ng-show="changed">
-				<span class="label label-warning label-sm">Unsaved</span>
-			</small>
-		</h3>
-	</div><!-- /.box-header -->
-
-	<div class="box-body">
-		<div class="row">
-			<div class="col-md-3">
-				<ul class="nav nav-pills nav-stacked">
-					<li class="disabled"><a>Site</a></li>
-					<li role="presentation" ng-repeat="_site in Site.list track by $index" ng-class="{active: site === _site}">
-						<a ng-click="setSite(_site)">
-							<span class="fa fa-server"></span>
-							{{_site.tags.site}}
-						</a>
-					</li>
-
-					<li>
-						<a class="text-light-blue" ng-click="newSite()" ng-disabled="_pageLock">
-							<span class="fa fa-plus-square"></span>
-							New Site
-						</a>
-					</li>
-				</ul>
-			</div>
-
-			<div class="col-md-9">
-				<a class="pull-right btn btn-danger btn-xs" ng-click="deleteSite(site)" ng-disabled="_pageLock">
-					<span class="fa fa-trash-o"></span>
-					Delete Site
-				</a>
-
-				<!-- Title -->
-				<h3 class="guideline">
-					Site
-					<small>{{site.tags.site}}</small>
-				</h3>
-				<hr/>
-
-				<!-- Config -->
-				<div class="checkbox">
-					<label>
-						<input type="checkbox" ng-checked="sites[site.tags.site].enabled" ng-click="sites[site.tags.site].enabled = !sites[site.tags.site].enabled">
-						<strong>Enabled</strong>
-					</label>
-				</div>
-				<hr/>
-
-				<!-- Application -->
-				<label>* Application</label>
-				<div class="row">
-					<div class="col-sm-6">
-						<h1 class="text-muted text-center" ng-show="sites[site.tags.site].applications.length === 0">No application in using</h1>
-						<ul class="products-list product-list-in-box fixed-height" ng-show="sites[site.tags.site].applications.length !== 0">
-							<li class="item" ng-repeat="application in sites[site.tags.site].applications track by $index" ng-class="{active: _application === application}">
-								<div class="product-operation single">
-									<span class="fa fa-cubes"></span>
-								</div>
-								<div class="product-info">
-									<a class="fa fa-times pull-right" ng-click="removeApplication(application, sites[site.tags.site])"></a>
-									<span class="product-title">
-										<a class="fa fa-cog" ng-click="setApplication(application)"></a>
-										{{application.tags.application}}
-									</span>
-									<span class="product-description">{{Application.list.set[application.tags.application].description}}</span>
-								</div>
-							</li>
-						</ul>
-					</div>
-					<div class="col-sm-6">
-						<ul class="products-list product-list-in-box fixed-height">
-							<li class="item" ng-repeat="application in sites[site.tags.site].optionalApplications track by $index">
-								<button class="btn btn-lg btn-primary pull-left" ng-click="addApplication(application, sites[site.tags.site])" ng-disabled="_pageLock">
-									<span class="fa fa-star-o"></span>
-								</button>
-								<div class="product-info">
-									<span class="product-title">{{application.tags.application}}</span>
-									<span class="product-description">{{Application.list.set[application.tags.application].description}}</span>
-								</div>
-							</li>
-						</ul>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div><!-- /.box-body -->
-
-	<div class="box-footer clearfix">
-		<button class="btn btn-primary" ng-click="saveAll()" ng-disabled="_pageLock">Save All</button>
-	</div>
-</div>
\ No newline at end of file


[10/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/catalina.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/catalina.sh b/eagle-assembly/src/main/lib/tomcat/bin/catalina.sh
deleted file mode 100644
index 2d0a6c3..0000000
--- a/eagle-assembly/src/main/lib/tomcat/bin/catalina.sh
+++ /dev/null
@@ -1,551 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# -----------------------------------------------------------------------------
-# Control Script for the CATALINA Server
-#
-# Environment Variable Prerequisites
-#
-#   Do not set the variables in this script. Instead put them into a script
-#   setenv.sh in CATALINA_BASE/bin to keep your customizations separate.
-#
-#   CATALINA_HOME   May point at your Catalina "build" directory.
-#
-#   CATALINA_BASE   (Optional) Base directory for resolving dynamic portions
-#                   of a Catalina installation.  If not present, resolves to
-#                   the same directory that CATALINA_HOME points to.
-#
-#   CATALINA_OUT    (Optional) Full path to a file where stdout and stderr
-#                   will be redirected.
-#                   Default is $CATALINA_BASE/logs/catalina.out
-#
-#   CATALINA_OPTS   (Optional) Java runtime options used when the "start",
-#                   "run" or "debug" command is executed.
-#                   Include here and not in JAVA_OPTS all options, that should
-#                   only be used by Tomcat itself, not by the stop process,
-#                   the version command etc.
-#                   Examples are heap size, GC logging, JMX ports etc.
-#
-#   CATALINA_TMPDIR (Optional) Directory path location of temporary directory
-#                   the JVM should use (java.io.tmpdir).  Defaults to
-#                   $CATALINA_BASE/temp.
-#
-#   JAVA_HOME       Must point at your Java Development Kit installation.
-#                   Required to run the with the "debug" argument.
-#
-#   JRE_HOME        Must point at your Java Runtime installation.
-#                   Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME
-#                   are both set, JRE_HOME is used.
-#
-#   JAVA_OPTS       (Optional) Java runtime options used when any command
-#                   is executed.
-#                   Include here and not in CATALINA_OPTS all options, that
-#                   should be used by Tomcat and also by the stop process,
-#                   the version command etc.
-#                   Most options should go into CATALINA_OPTS.
-#
-#   JAVA_ENDORSED_DIRS (Optional) Lists of of colon separated directories
-#                   containing some jars in order to allow replacement of APIs
-#                   created outside of the JCP (i.e. DOM and SAX from W3C).
-#                   It can also be used to update the XML parser implementation.
-#                   Defaults to $CATALINA_HOME/endorsed.
-#
-#   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
-#                   command is executed. The default is "dt_socket".
-#
-#   JPDA_ADDRESS    (Optional) Java runtime options used when the "jpda start"
-#                   command is executed. The default is 8000.
-#
-#   JPDA_SUSPEND    (Optional) Java runtime options used when the "jpda start"
-#                   command is executed. Specifies whether JVM should suspend
-#                   execution immediately after startup. Default is "n".
-#
-#   JPDA_OPTS       (Optional) Java runtime options used when the "jpda start"
-#                   command is executed. If used, JPDA_TRANSPORT, JPDA_ADDRESS,
-#                   and JPDA_SUSPEND are ignored. Thus, all required jpda
-#                   options MUST be specified. The default is:
-#
-#                   -agentlib:jdwp=transport=$JPDA_TRANSPORT,
-#                       address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND
-#
-#   CATALINA_PID    (Optional) Path of the file which should contains the pid
-#                   of the catalina startup java process, when start (fork) is
-#                   used
-#
-#   LOGGING_CONFIG  (Optional) Override Tomcat's logging config file
-#                   Example (all one line)
-#                   LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
-#
-#   LOGGING_MANAGER (Optional) Override Tomcat's logging manager
-#                   Example (all one line)
-#                   LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
-# -----------------------------------------------------------------------------
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false
-darwin=false
-os400=false
-case "`uname`" in
-CYGWIN*) cygwin=true;;
-Darwin*) darwin=true;;
-OS400*) os400=true;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
-  ls=`ls -ld "$PRG"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    PRG="$link"
-  else
-    PRG=`dirname "$PRG"`/"$link"
-  fi
-done
-
-# Get standard environment variables
-PRGDIR=`dirname "$PRG"`
-
-# Only set CATALINA_HOME if not already set
-[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
-
-# Copy CATALINA_BASE from CATALINA_HOME if not already set
-[ -z "$CATALINA_BASE" ] && CATALINA_BASE="$CATALINA_HOME"
-
-# Ensure that any user defined CLASSPATH variables are not used on startup,
-# but allow them to be specified in setenv.sh, in rare case when it is needed.
-CLASSPATH=
-
-if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
-  . "$CATALINA_BASE/bin/setenv.sh"
-elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
-  . "$CATALINA_HOME/bin/setenv.sh"
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin; then
-  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
-  [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"`
-  [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"`
-  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# For OS400
-if $os400; then
-  # Set job priority to standard for interactive (interactive - 6) by using
-  # the interactive priority - 6, the helper threads that respond to requests
-  # will be running at the same priority as interactive jobs.
-  COMMAND='chgjob job('$JOBNAME') runpty(6)'
-  system $COMMAND
-
-  # Enable multi threading
-  export QIBM_MULTI_THREADED=Y
-fi
-
-# Get standard Java environment variables
-if $os400; then
-  # -r will Only work on the os400 if the files are:
-  # 1. owned by the user
-  # 2. owned by the PRIMARY group of the user
-  # this will not work if the user belongs in secondary groups
-  . "$CATALINA_HOME"/bin/setclasspath.sh
-else
-  if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
-    . "$CATALINA_HOME"/bin/setclasspath.sh
-  else
-    echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh"
-    echo "This file is needed to run this program"
-    exit 1
-  fi
-fi
-
-# Add on extra jar files to CLASSPATH
-if [ ! -z "$CLASSPATH" ] ; then
-  CLASSPATH="$CLASSPATH":
-fi
-CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar
-
-if [ -z "$CATALINA_OUT" ] ; then
-  CATALINA_OUT="$CATALINA_BASE"/logs/catalina.out
-fi
-
-if [ -z "$CATALINA_TMPDIR" ] ; then
-  # Define the java.io.tmpdir to use for Catalina
-  CATALINA_TMPDIR="$CATALINA_BASE"/temp
-fi
-
-# Add tomcat-juli.jar to classpath
-# tomcat-juli.jar can be over-ridden per instance
-if [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then
-  CLASSPATH=$CLASSPATH:$CATALINA_BASE/bin/tomcat-juli.jar
-else
-  CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar
-fi
-
-# Bugzilla 37848: When no TTY is available, don't output to console
-have_tty=0
-if [ "`tty`" != "not a tty" ]; then
-    have_tty=1
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
-  JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
-  CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"`
-  CATALINA_BASE=`cygpath --absolute --windows "$CATALINA_BASE"`
-  CATALINA_TMPDIR=`cygpath --absolute --windows "$CATALINA_TMPDIR"`
-  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
-fi
-
-# Set juli LogManager config file if it is present and an override has not been issued
-if [ -z "$LOGGING_CONFIG" ]; then
-  if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
-    LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
-  else
-    # Bugzilla 45585
-    LOGGING_CONFIG="-Dnop"
-  fi
-fi
-
-if [ -z "$LOGGING_MANAGER" ]; then
-  LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
-fi
-
-# Uncomment the following line to make the umask available when using the
-# org.apache.catalina.security.SecurityListener
-#JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`"
-
-# ----- Execute The Requested Command -----------------------------------------
-
-# Bugzilla 37848: only output this if we have a TTY
-#if [ $have_tty -eq 1 ]; then
-  #echo "Using CATALINA_BASE:   $CATALINA_BASE"
-  #echo "Using CATALINA_HOME:   $CATALINA_HOME"
-  #echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR"
-  #if [ "$1" = "debug" ] ; then
-  #  echo "Using JAVA_HOME:       $JAVA_HOME"
-  #else
-  #  echo "Using JRE_HOME:        $JRE_HOME"
-  #fi
-  #echo "Using CLASSPATH:       $CLASSPATH"
-  #if [ ! -z "$CATALINA_PID" ]; then
-    #echo "Using CATALINA_PID:    $CATALINA_PID"
-  #fi
-#fi
-
-if [ "$1" = "jpda" ] ; then
-  if [ -z "$JPDA_TRANSPORT" ]; then
-    JPDA_TRANSPORT="dt_socket"
-  fi
-  if [ -z "$JPDA_ADDRESS" ]; then
-    JPDA_ADDRESS="8000"
-  fi
-  if [ -z "$JPDA_SUSPEND" ]; then
-    JPDA_SUSPEND="n"
-  fi
-  if [ -z "$JPDA_OPTS" ]; then
-    JPDA_OPTS="-agentlib:jdwp=transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND"
-  fi
-  CATALINA_OPTS="$CATALINA_OPTS $JPDA_OPTS"
-  shift
-fi
-
-if [ "$1" = "debug" ] ; then
-  if $os400; then
-    echo "Debug command not available on OS400"
-    exit 1
-  else
-    shift
-    if [ "$1" = "-security" ] ; then
-      if [ $have_tty -eq 1 ]; then
-        echo "Using Security Manager"
-      fi
-      shift
-      exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-        -sourcepath "$CATALINA_HOME"/../../java \
-        -Djava.security.manager \
-        -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
-        -Dcatalina.base="$CATALINA_BASE" \
-        -Dcatalina.home="$CATALINA_HOME" \
-        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-        org.apache.catalina.startup.Bootstrap "$@" start
-    else
-      exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-        -sourcepath "$CATALINA_HOME"/../../java \
-        -Dcatalina.base="$CATALINA_BASE" \
-        -Dcatalina.home="$CATALINA_HOME" \
-        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-        org.apache.catalina.startup.Bootstrap "$@" start
-    fi
-  fi
-
-elif [ "$1" = "run" ]; then
-
-  shift
-  if [ "$1" = "-security" ] ; then
-    if [ $have_tty -eq 1 ]; then
-      echo "Using Security Manager"
-    fi
-    shift
-    eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-      -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
-      -Djava.security.manager \
-      -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \
-      -Dcatalina.base="\"$CATALINA_BASE\"" \
-      -Dcatalina.home="\"$CATALINA_HOME\"" \
-      -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
-      org.apache.catalina.startup.Bootstrap "$@" start
-  else
-    eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-      -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
-      -Dcatalina.base="\"$CATALINA_BASE\"" \
-      -Dcatalina.home="\"$CATALINA_HOME\"" \
-      -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
-      org.apache.catalina.startup.Bootstrap "$@" start
-  fi
-
-elif [ "$1" = "start" ] ; then
-
-  if [ ! -z "$CATALINA_PID" ]; then
-    if [ -f "$CATALINA_PID" ]; then
-      if [ -s "$CATALINA_PID" ]; then
-        echo "Existing PID file found during start."
-        if [ -r "$CATALINA_PID" ]; then
-          PID=`cat "$CATALINA_PID"`
-          ps -p $PID >/dev/null 2>&1
-          if [ $? -eq 0 ] ; then
-            echo "Eagle service appears to still be running with PID $PID. Start aborted."
-            echo "If the following process is not an eagle service process, remove the PID file and try again:"
-            ps -f -p $PID
-            exit 1
-          else
-            echo "Removing/clearing stale PID file."
-            rm -f "$CATALINA_PID" >/dev/null 2>&1
-            if [ $? != 0 ]; then
-              if [ -w "$CATALINA_PID" ]; then
-                cat /dev/null > "$CATALINA_PID"
-              else
-                echo "Unable to remove or clear stale PID file. Start aborted."
-                exit 1
-              fi
-            fi
-          fi
-        else
-          echo "Unable to read PID file. Start aborted."
-          exit 1
-        fi
-      else
-        rm -f "$CATALINA_PID" >/dev/null 2>&1
-        if [ $? != 0 ]; then
-          if [ ! -w "$CATALINA_PID" ]; then
-            echo "Unable to remove or write to empty PID file. Start aborted."
-            exit 1
-          fi
-        fi
-      fi
-    fi
-  fi
-
-  shift
-  touch "$CATALINA_OUT"
-  if [ "$1" = "-security" ] ; then
-    if [ $have_tty -eq 1 ]; then
-      echo "Using Security Manager"
-    fi
-    shift
-    eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-      -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
-      -Djava.security.manager \
-      -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \
-      -Dcatalina.base="\"$CATALINA_BASE\"" \
-      -Dcatalina.home="\"$CATALINA_HOME\"" \
-      -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
-      org.apache.catalina.startup.Bootstrap "$@" start \
-      >> "$CATALINA_OUT" 2>&1 "&"
-
-  else
-    eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-      -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
-      -Dcatalina.base="\"$CATALINA_BASE\"" \
-      -Dcatalina.home="\"$CATALINA_HOME\"" \
-      -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
-      org.apache.catalina.startup.Bootstrap "$@" start \
-      >> "$CATALINA_OUT" 2>&1 "&"
-
-  fi
-
-  if [ ! -z "$CATALINA_PID" ]; then
-    echo $! > "$CATALINA_PID"
-  fi
-
-  echo "Eagle service started."
-
-elif [ "$1" = "stop" ] ; then
-
-  shift
-
-  SLEEP=5
-  if [ ! -z "$1" ]; then
-    echo $1 | grep "[^0-9]" >/dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      SLEEP=$1
-      shift
-    fi
-  fi
-
-  FORCE=0
-  if [ "$1" = "-force" ]; then
-    shift
-    FORCE=1
-  fi
-
-  if [ ! -z "$CATALINA_PID" ]; then
-    if [ -f "$CATALINA_PID" ]; then
-      if [ -s "$CATALINA_PID" ]; then
-        kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1
-        if [ $? -gt 0 ]; then
-          echo "PID file found but no matching process was found. Stop aborted."
-          exit 1
-        fi
-      else
-        echo "PID file is empty and has been ignored."
-      fi
-    else
-      echo "\$CATALINA_PID was set but the specified file does not exist. Is eagle service running? Stop aborted."
-      exit 1
-    fi
-  fi
-
-  eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \
-    -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
-    -Dcatalina.base="\"$CATALINA_BASE\"" \
-    -Dcatalina.home="\"$CATALINA_HOME\"" \
-    -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
-    org.apache.catalina.startup.Bootstrap "$@" stop
-
-  # stop failed. Shutdown port disabled? Try a normal kill.
-  if [ $? != 0 ]; then
-    if [ ! -z "$CATALINA_PID" ]; then
-      echo "The stop command failed. Attempting to signal the process to stop through OS signal."
-      kill -15 `cat "$CATALINA_PID"` >/dev/null 2>&1
-    fi
-  fi
-
-  if [ ! -z "$CATALINA_PID" ]; then
-    if [ -f "$CATALINA_PID" ]; then
-      while [ $SLEEP -ge 0 ]; do
-        kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1
-        if [ $? -gt 0 ]; then
-          rm -f "$CATALINA_PID" >/dev/null 2>&1
-          if [ $? != 0 ]; then
-            if [ -w "$CATALINA_PID" ]; then
-              cat /dev/null > "$CATALINA_PID"
-              # If Tomcat has stopped don't try and force a stop with an empty PID file
-              FORCE=0
-            else
-              echo "The PID file could not be removed or cleared."
-            fi
-          fi
-          echo "Eagle service stopped."
-          break
-        fi
-        if [ $SLEEP -gt 0 ]; then
-          sleep 1
-        fi
-        if [ $SLEEP -eq 0 ]; then
-          if [ $FORCE -eq 0 ]; then
-            echo "Eagle service did not stop in time. PID file was not removed. To aid diagnostics a thread dump has been written to standard out."
-            kill -3 `cat "$CATALINA_PID"`
-          fi
-        fi
-        SLEEP=`expr $SLEEP - 1 `
-      done
-    fi
-  fi
-
-  KILL_SLEEP_INTERVAL=5
-  if [ $FORCE -eq 1 ]; then
-    if [ -z "$CATALINA_PID" ]; then
-      echo "Kill failed: \$CATALINA_PID not set"
-    else
-      if [ -f "$CATALINA_PID" ]; then
-        PID=`cat "$CATALINA_PID"`
-        echo "Killing eagle service with the PID: $PID"
-        kill -9 $PID
-        while [ $KILL_SLEEP_INTERVAL -ge 0 ]; do
-            kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1
-            if [ $? -gt 0 ]; then
-                rm -f "$CATALINA_PID" >/dev/null 2>&1
-                if [ $? != 0 ]; then
-                    if [ -w "$CATALINA_PID" ]; then
-                        cat /dev/null > "$CATALINA_PID"
-                    else
-                        echo "The PID file could not be removed."
-                    fi
-                fi
-                # Set this to zero else a warning will be issued about the process still running
-                KILL_SLEEP_INTERVAL=0
-                echo "The eagle process has been killed."
-                break
-            fi
-            if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then
-                sleep 1
-            fi
-            KILL_SLEEP_INTERVAL=`expr $KILL_SLEEP_INTERVAL - 1 `
-        done
-        if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then
-            echo "eagle has not been killed completely yet. The process might be waiting on some system call or might be UNINTERRUPTIBLE."
-        fi
-      fi
-    fi
-  fi
-
-elif [ "$1" = "configtest" ] ; then
-
-    eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \
-      -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
-      -Dcatalina.base="\"$CATALINA_BASE\"" \
-      -Dcatalina.home="\"$CATALINA_HOME\"" \
-      -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
-      org.apache.catalina.startup.Bootstrap configtest
-    result=$?
-    if [ $result -ne 0 ]; then
-        echo "Configuration error detected!"
-    fi
-    exit $result
-
-elif [ "$1" = "version" ] ; then
-
-    "$_RUNJAVA"   \
-      -classpath "$CATALINA_HOME/lib/catalina.jar" \
-      org.apache.catalina.util.ServerInfo
-
-else
-
-    echo "Usage: eagle-service.sh <command>"
-  echo "  commands:"
-  echo "  start             Start eagle service in a separate window"
-  echo "  stop              Stop eagle service, waiting up to 5 seconds for the process to end"
-  exit 1
-
-fi

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar b/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar
deleted file mode 100644
index 2b6b9c6..0000000
Binary files a/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/configtest.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/configtest.sh b/eagle-assembly/src/main/lib/tomcat/bin/configtest.sh
deleted file mode 100644
index 9a8ebff..0000000
--- a/eagle-assembly/src/main/lib/tomcat/bin/configtest.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# -----------------------------------------------------------------------------
-# Configuration Test Script for the CATALINA Server
-# -----------------------------------------------------------------------------
-
-# Better OS/400 detection: see Bugzilla 31132
-os400=false
-case "`uname`" in
-OS400*) os400=true;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ] ; do
-  ls=`ls -ld "$PRG"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    PRG="$link"
-  else
-    PRG=`dirname "$PRG"`/"$link"
-  fi
-done
-
-PRGDIR=`dirname "$PRG"`
-EXECUTABLE=catalina.sh
-
-# Check that target executable exists
-if $os400; then
-  # -x will Only work on the os400 if the files are:
-  # 1. owned by the user
-  # 2. owned by the PRIMARY group of the user
-  # this will not work if the user belongs in secondary groups
-  eval
-else
-  if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
-    echo "Cannot find $PRGDIR/$EXECUTABLE"
-    echo "The file is absent or does not have execute permission"
-    echo "This file is needed to run this program"
-    exit 1
-  fi
-fi
-
-exec "$PRGDIR"/"$EXECUTABLE" configtest "$@"

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/daemon.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/daemon.sh b/eagle-assembly/src/main/lib/tomcat/bin/daemon.sh
deleted file mode 100644
index dee6c77..0000000
--- a/eagle-assembly/src/main/lib/tomcat/bin/daemon.sh
+++ /dev/null
@@ -1,252 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# -----------------------------------------------------------------------------
-# Commons Daemon wrapper script.
-# -----------------------------------------------------------------------------
-#
-# resolve links - $0 may be a softlink
-ARG0="$0"
-while [ -h "$ARG0" ]; do
-  ls=`ls -ld "$ARG0"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    ARG0="$link"
-  else
-    ARG0="`dirname $ARG0`/$link"
-  fi
-done
-DIRNAME="`dirname $ARG0`"
-PROGRAM="`basename $ARG0`"
-while [ ".$1" != . ]
-do
-  case "$1" in
-    --java-home )
-        JAVA_HOME="$2"
-        shift; shift;
-        continue
-    ;;
-    --catalina-home )
-        CATALINA_HOME="$2"
-        shift; shift;
-        continue
-    ;;
-    --catalina-base )
-        CATALINA_BASE="$2"
-        shift; shift;
-        continue
-    ;;
-    --catalina-pid )
-        CATALINA_PID="$2"
-        shift; shift;
-        continue
-    ;;
-    --tomcat-user )
-        TOMCAT_USER="$2"
-        shift; shift;
-        continue
-    ;;
-    --service-start-wait-time )
-        SERVICE_START_WAIT_TIME="$2"
-        shift; shift;
-        continue
-    ;;
-    * )
-        break
-    ;;
-  esac
-done
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-darwin=false;
-case "`uname`" in
-    CYGWIN*)
-        cygwin=true
-        ;;
-    Darwin*)
-        darwin=true
-        ;;
-esac
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-test ".$MAX_FD" = . && MAX_FD="maximum"
-# Setup parameters for running the jsvc
-#
-test ".$TOMCAT_USER" = . && TOMCAT_USER=tomcat
-# Set JAVA_HOME to working JDK or JRE
-# JAVA_HOME=/opt/jdk-1.6.0.22
-# If not set we'll try to guess the JAVA_HOME
-# from java binary if on the PATH
-#
-if [ -z "$JAVA_HOME" ]; then
-    JAVA_BIN="`which java 2>/dev/null || type java 2>&1`"
-    test -x "$JAVA_BIN" && JAVA_HOME="`dirname $JAVA_BIN`"
-    test ".$JAVA_HOME" != . && JAVA_HOME=`cd "$JAVA_HOME/.." >/dev/null; pwd`
-else
-    JAVA_BIN="$JAVA_HOME/bin/java"
-fi
-
-# Only set CATALINA_HOME if not already set
-test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd`
-test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME"
-test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap
-# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME
-if [ -z "$JSVC" ]; then
-    JSVC="$CATALINA_BASE/bin/jsvc"
-    if [ ! -x "$JSVC" ]; then
-        JSVC="$CATALINA_HOME/bin/jsvc"
-    fi
-fi
-# Set the default service-start wait time if necessary
-test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10
-
-# Ensure that any user defined CLASSPATH variables are not used on startup,
-# but allow them to be specified in setenv.sh, in rare case when it is needed.
-CLASSPATH=
-JAVA_OPTS=
-if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
-  . "$CATALINA_BASE/bin/setenv.sh"
-elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
-  . "$CATALINA_HOME/bin/setenv.sh"
-fi
-
-# Add on extra jar files to CLASSPATH
-test ".$CLASSPATH" != . && CLASSPATH="${CLASSPATH}:"
-CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar"
-
-test ".$CATALINA_OUT" = . && CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out"
-test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp"
-
-# Add tomcat-juli.jar to classpath
-# tomcat-juli.jar can be over-ridden per instance
-if [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then
-  CLASSPATH="$CLASSPATH:$CATALINA_BASE/bin/tomcat-juli.jar"
-else
-  CLASSPATH="$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar"
-fi
-# Set juli LogManager config file if it is present and an override has not been issued
-if [ -z "$LOGGING_CONFIG" ]; then
-  if [ -r "$CATALINA_BASE/conf/logging.properties" ]; then
-    LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
-  else
-    # Bugzilla 45585
-    LOGGING_CONFIG="-Dnop"
-  fi
-fi
-
-test ".$LOGGING_MANAGER" = . && LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
-JAVA_OPTS="$JAVA_OPTS $LOGGING_MANAGER"
-
-# Set -pidfile
-test ".$CATALINA_PID" = . && CATALINA_PID="$CATALINA_BASE/logs/catalina-daemon.pid"
-
-# Increase the maximum file descriptors if we can
-if [ "$cygwin" = "false" ]; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ "$?" -eq 0 ]; then
-        # Darwin does not allow RLIMIT_INFINITY on file soft limit
-        if [ "$darwin" = "true" -a "$MAX_FD_LIMIT" = "unlimited" ]; then
-            MAX_FD_LIMIT=`/usr/sbin/sysctl -n kern.maxfilesperproc`
-        fi
-        test ".$MAX_FD" = ".maximum" && MAX_FD="$MAX_FD_LIMIT"
-        ulimit -n $MAX_FD
-        if [ "$?" -ne 0 ]; then
-            echo "$PROGRAM: Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        echo "$PROGRAM: Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# ----- Execute The Requested Command -----------------------------------------
-case "$1" in
-    run     )
-      shift
-      "$JSVC" $* \
-      $JSVC_OPTS \
-      -java-home "$JAVA_HOME" \
-      -pidfile "$CATALINA_PID" \
-      -wait "$SERVICE_START_WAIT_TIME" \
-      -nodetach \
-      -outfile "&1" \
-      -errfile "&2" \
-      -classpath "$CLASSPATH" \
-      "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
-      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
-      -Dcatalina.base="$CATALINA_BASE" \
-      -Dcatalina.home="$CATALINA_HOME" \
-      -Djava.io.tmpdir="$CATALINA_TMP" \
-      $CATALINA_MAIN
-      exit $?
-    ;;
-    start   )
-      "$JSVC" $JSVC_OPTS \
-      -java-home "$JAVA_HOME" \
-      -user $TOMCAT_USER \
-      -pidfile "$CATALINA_PID" \
-      -wait "$SERVICE_START_WAIT_TIME" \
-      -outfile "$CATALINA_OUT" \
-      -errfile "&1" \
-      -classpath "$CLASSPATH" \
-      "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
-      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
-      -Dcatalina.base="$CATALINA_BASE" \
-      -Dcatalina.home="$CATALINA_HOME" \
-      -Djava.io.tmpdir="$CATALINA_TMP" \
-      $CATALINA_MAIN
-      exit $?
-    ;;
-    stop    )
-      "$JSVC" $JSVC_OPTS \
-      -stop \
-      -pidfile "$CATALINA_PID" \
-      -classpath "$CLASSPATH" \
-      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
-      -Dcatalina.base="$CATALINA_BASE" \
-      -Dcatalina.home="$CATALINA_HOME" \
-      -Djava.io.tmpdir="$CATALINA_TMP" \
-      $CATALINA_MAIN
-      exit $?
-    ;;
-    version  )
-      "$JSVC" \
-      -java-home "$JAVA_HOME" \
-      -pidfile "$CATALINA_PID" \
-      -classpath "$CLASSPATH" \
-      -errfile "&2" \
-      -version \
-      -check \
-      $CATALINA_MAIN
-      if [ "$?" = 0 ]; then
-        "$JAVA_BIN" \
-        -classpath "$CATALINA_HOME/lib/catalina.jar" \
-        org.apache.catalina.util.ServerInfo
-      fi
-      exit $?
-    ;;
-    *       )
-      echo "Unknown command: \`$1'"
-      echo "Usage: $PROGRAM ( commands ... )"
-      echo "commands:"
-      echo "  run               Start Tomcat without detaching from console"
-      echo "  start             Start Tomcat"
-      echo "  stop              Stop Tomcat"
-      echo "  version           What version of commons daemon and Tomcat"
-      echo "                    are you running?"
-      exit 1
-    ;;
-esac

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/digest.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/digest.sh b/eagle-assembly/src/main/lib/tomcat/bin/digest.sh
deleted file mode 100644
index 62ed5d0..0000000
--- a/eagle-assembly/src/main/lib/tomcat/bin/digest.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# -----------------------------------------------------------------------------
-# Script to digest password using the algorithm specified
-# -----------------------------------------------------------------------------
-
-# Better OS/400 detection: see Bugzilla 31132
-os400=false
-case "`uname`" in
-OS400*) os400=true;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ] ; do
-  ls=`ls -ld "$PRG"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    PRG="$link"
-  else
-    PRG=`dirname "$PRG"`/"$link"
-  fi
-done
-
-PRGDIR=`dirname "$PRG"`
-EXECUTABLE=tool-wrapper.sh
-
-# Check that target executable exists
-if $os400; then
-  # -x will Only work on the os400 if the files are:
-  # 1. owned by the user
-  # 2. owned by the PRIMARY group of the user
-  # this will not work if the user belongs in secondary groups
-  eval
-else
-  if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
-    echo "Cannot find $PRGDIR/$EXECUTABLE"
-    echo "The file is absent or does not have execute permission"
-    echo "This file is needed to run this program"
-    exit 1
-  fi
-fi
-
-exec "$PRGDIR"/"$EXECUTABLE" -server org.apache.catalina.realm.RealmBase "$@"

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/setclasspath.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/setclasspath.sh b/eagle-assembly/src/main/lib/tomcat/bin/setclasspath.sh
deleted file mode 100644
index 873fad3..0000000
--- a/eagle-assembly/src/main/lib/tomcat/bin/setclasspath.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# -----------------------------------------------------------------------------
-#  Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings
-#  are valid and consistent with the selected start-up options and set up the
-#  endorsed directory.
-# -----------------------------------------------------------------------------
-
-# Make sure prerequisite environment variables are set
-if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
-  if $darwin; then
-    # Bugzilla 54390
-    if [ -x '/usr/libexec/java_home' ] ; then
-      export JAVA_HOME=`/usr/libexec/java_home`
-    # Bugzilla 37284 (reviewed).
-    elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
-      export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home"
-    fi
-  else
-    JAVA_PATH=`which java 2>/dev/null`
-    if [ "x$JAVA_PATH" != "x" ]; then
-      JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null`
-      JRE_HOME=`dirname $JAVA_PATH 2>/dev/null`
-    fi
-    if [ "x$JRE_HOME" = "x" ]; then
-      # XXX: Should we try other locations?
-      if [ -x /usr/bin/java ]; then
-        JRE_HOME=/usr
-      fi
-    fi
-  fi
-  if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
-    echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
-    echo "At least one of these environment variable is needed to run this program"
-    exit 1
-  fi
-fi
-if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then
-  echo "JAVA_HOME should point to a JDK in order to run in debug mode."
-  exit 1
-fi
-if [ -z "$JRE_HOME" ]; then
-  JRE_HOME="$JAVA_HOME"
-fi
-
-# If we're running under jdb, we need a full jdk.
-if [ "$1" = "debug" ] ; then
-  if [ "$os400" = "true" ]; then
-    if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then
-      echo "The JAVA_HOME environment variable is not defined correctly"
-      echo "This environment variable is needed to run this program"
-      echo "NB: JAVA_HOME should point to a JDK not a JRE"
-      exit 1
-    fi
-  else
-    if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/jdb -o ! -x "$JAVA_HOME"/bin/javac ]; then
-      echo "The JAVA_HOME environment variable is not defined correctly"
-      echo "This environment variable is needed to run this program"
-      echo "NB: JAVA_HOME should point to a JDK not a JRE"
-      exit 1
-    fi
-  fi
-fi
-
-# Don't override the endorsed dir if the user has set it previously
-if [ -z "$JAVA_ENDORSED_DIRS" ]; then
-  # Set the default -Djava.endorsed.dirs argument
-  JAVA_ENDORSED_DIRS="$CATALINA_HOME"/endorsed
-fi
-
-# Set standard commands for invoking Java, if not already set.
-if [ -z "$_RUNJAVA" ]; then
-  _RUNJAVA="$JRE_HOME"/bin/java
-fi
-if [ "$os400" != "true" ]; then
-  if [ -z "$_RUNJDB" ]; then
-    _RUNJDB="$JAVA_HOME"/bin/jdb
-  fi
-fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/shutdown.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/shutdown.sh b/eagle-assembly/src/main/lib/tomcat/bin/shutdown.sh
deleted file mode 100644
index cd0c97d..0000000
--- a/eagle-assembly/src/main/lib/tomcat/bin/shutdown.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# -----------------------------------------------------------------------------
-# Stop script for the CATALINA Server
-# -----------------------------------------------------------------------------
-
-# Better OS/400 detection: see Bugzilla 31132
-os400=false
-case "`uname`" in
-OS400*) os400=true;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ] ; do
-  ls=`ls -ld "$PRG"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    PRG="$link"
-  else
-    PRG=`dirname "$PRG"`/"$link"
-  fi
-done
-
-PRGDIR=`dirname "$PRG"`
-EXECUTABLE=catalina.sh
-
-# Check that target executable exists
-if $os400; then
-  # -x will Only work on the os400 if the files are:
-  # 1. owned by the user
-  # 2. owned by the PRIMARY group of the user
-  # this will not work if the user belongs in secondary groups
-  eval
-else
-  if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
-    echo "Cannot find $PRGDIR/$EXECUTABLE"
-    echo "The file is absent or does not have execute permission"
-    echo "This file is needed to run this program"
-    exit 1
-  fi
-fi
-
-exec "$PRGDIR"/"$EXECUTABLE" stop "$@"

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/startup.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/startup.sh b/eagle-assembly/src/main/lib/tomcat/bin/startup.sh
deleted file mode 100644
index 7b10287..0000000
--- a/eagle-assembly/src/main/lib/tomcat/bin/startup.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# -----------------------------------------------------------------------------
-# Start Script for the CATALINA Server
-# -----------------------------------------------------------------------------
-
-# Better OS/400 detection: see Bugzilla 31132
-os400=false
-case "`uname`" in
-OS400*) os400=true;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ] ; do
-  ls=`ls -ld "$PRG"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    PRG="$link"
-  else
-    PRG=`dirname "$PRG"`/"$link"
-  fi
-done
-
-PRGDIR=`dirname "$PRG"`
-EXECUTABLE=catalina.sh
-
-# Check that target executable exists
-if $os400; then
-  # -x will Only work on the os400 if the files are:
-  # 1. owned by the user
-  # 2. owned by the PRIMARY group of the user
-  # this will not work if the user belongs in secondary groups
-  eval
-else
-  if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
-    echo "Cannot find $PRGDIR/$EXECUTABLE"
-    echo "The file is absent or does not have execute permission"
-    echo "This file is needed to run this program"
-    exit 1
-  fi
-fi
-
-exec "$PRGDIR"/"$EXECUTABLE" start "$@"

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar b/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar
deleted file mode 100644
index e1b80ad..0000000
Binary files a/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/tool-wrapper.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/tool-wrapper.sh b/eagle-assembly/src/main/lib/tomcat/bin/tool-wrapper.sh
deleted file mode 100644
index 31cebf6..0000000
--- a/eagle-assembly/src/main/lib/tomcat/bin/tool-wrapper.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# -----------------------------------------------------------------------------
-# Wrapper script for command line tools
-#
-# Environment Variable Prerequisites
-#
-#   CATALINA_HOME   May point at your Catalina "build" directory.
-#
-#   TOOL_OPTS       (Optional) Java runtime options.
-#
-#   JAVA_HOME       Must point at your Java Development Kit installation.
-#                   Using JRE_HOME instead works as well.
-#
-#   JRE_HOME        Must point at your Java Runtime installation.
-#                   Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME
-#                   are both set, JRE_HOME is used.
-#
-#   JAVA_OPTS       (Optional) Java runtime options.
-#
-#   JAVA_ENDORSED_DIRS (Optional) Lists of of colon separated directories
-#                   containing some jars in order to allow replacement of APIs
-#                   created outside of the JCP (i.e. DOM and SAX from W3C).
-#                   It can also be used to update the XML parser implementation.
-#                   Defaults to $CATALINA_HOME/endorsed.
-# -----------------------------------------------------------------------------
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false
-darwin=false
-os400=false
-case "`uname`" in
-CYGWIN*) cygwin=true;;
-Darwin*) darwin=true;;
-OS400*) os400=true;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
-  ls=`ls -ld "$PRG"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    PRG="$link"
-  else
-    PRG=`dirname "$PRG"`/"$link"
-  fi
-done
-
-# Get standard environment variables
-PRGDIR=`dirname "$PRG"`
-
-# Only set CATALINA_HOME if not already set
-[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
-
-# Ensure that any user defined CLASSPATH variables are not used on startup,
-# but allow them to be specified in setenv.sh, in rare case when it is needed.
-CLASSPATH=
-
-if [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
-  . "$CATALINA_HOME/bin/setenv.sh"
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin; then
-  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
-  [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"`
-  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# For OS400
-if $os400; then
-  # Set job priority to standard for interactive (interactive - 6) by using
-  # the interactive priority - 6, the helper threads that respond to requests
-  # will be running at the same priority as interactive jobs.
-  COMMAND='chgjob job('$JOBNAME') runpty(6)'
-  system $COMMAND
-
-  # Enable multi threading
-  export QIBM_MULTI_THREADED=Y
-fi
-
-# Get standard Java environment variables
-if $os400; then
-  # -r will Only work on the os400 if the files are:
-  # 1. owned by the user
-  # 2. owned by the PRIMARY group of the user
-  # this will not work if the user belongs in secondary groups
-  . "$CATALINA_HOME"/bin/setclasspath.sh
-else
-  if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
-    . "$CATALINA_HOME"/bin/setclasspath.sh
-  else
-    echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh"
-    echo "This file is needed to run this program"
-    exit 1
-  fi
-fi
-
-# Add on extra jar files to CLASSPATH
-if [ ! -z "$CLASSPATH" ] ; then
-  CLASSPATH="$CLASSPATH":
-fi
-CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/tomcat-juli.jar:"$CATALINA_HOME"/lib/servlet-api.jar
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
-  JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
-  CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"`
-  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
-fi
-
-JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
-
-# ----- Execute The Requested Command -----------------------------------------
-
-exec "$_RUNJAVA" $JAVA_OPTS $TOOL_OPTS \
-  -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-  -Dcatalina.home="$CATALINA_HOME" \
-  org.apache.catalina.startup.Tool "$@"

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/version.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/version.sh b/eagle-assembly/src/main/lib/tomcat/bin/version.sh
deleted file mode 100644
index 1cb19bd..0000000
--- a/eagle-assembly/src/main/lib/tomcat/bin/version.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# -----------------------------------------------------------------------------
-# Version Script for the CATALINA Server
-# -----------------------------------------------------------------------------
-
-# Better OS/400 detection: see Bugzilla 31132
-os400=false
-case "`uname`" in
-OS400*) os400=true;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ] ; do
-  ls=`ls -ld "$PRG"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    PRG="$link"
-  else
-    PRG=`dirname "$PRG"`/"$link"
-  fi
-done
-
-PRGDIR=`dirname "$PRG"`
-EXECUTABLE=catalina.sh
-
-# Check that target executable exists
-if $os400; then
-  # -x will Only work on the os400 if the files are:
-  # 1. owned by the user
-  # 2. owned by the PRIMARY group of the user
-  # this will not work if the user belongs in secondary groups
-  eval
-else
-  if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
-    echo "Cannot find $PRGDIR/$EXECUTABLE"
-    echo "The file is absent or does not have execute permission"
-    echo "This file is needed to run this program"
-    exit 1
-  fi
-fi
-
-exec "$PRGDIR"/"$EXECUTABLE" version "$@"

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/conf/catalina.policy
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/conf/catalina.policy b/eagle-assembly/src/main/lib/tomcat/conf/catalina.policy
deleted file mode 100644
index 354d7d6..0000000
--- a/eagle-assembly/src/main/lib/tomcat/conf/catalina.policy
+++ /dev/null
@@ -1,248 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements.  See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License.  You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// ============================================================================
-// catalina.policy - Security Policy Permissions for Tomcat 7
-//
-// This file contains a default set of security policies to be enforced (by the
-// JVM) when Catalina is executed with the "-security" option.  In addition
-// to the permissions granted here, the following additional permissions are
-// granted to each web application:
-//
-// * Read access to the web application's document root directory
-// * Read, write and delete access to the web application's working directory
-// ============================================================================
-
-
-// ========== SYSTEM CODE PERMISSIONS =========================================
-
-
-// These permissions apply to javac
-grant codeBase "file:${java.home}/lib/-" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to all shared system extensions
-grant codeBase "file:${java.home}/jre/lib/ext/-" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
-grant codeBase "file:${java.home}/../lib/-" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to all shared system extensions when
-// ${java.home} points at $JAVA_HOME/jre
-grant codeBase "file:${java.home}/lib/ext/-" {
-        permission java.security.AllPermission;
-};
-
-
-// ========== CATALINA CODE PERMISSIONS =======================================
-
-
-// These permissions apply to the daemon code
-grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to the logging API
-// Note: If tomcat-juli.jar is in ${catalina.base} and not in ${catalina.home},
-// update this section accordingly.
-//  grant codeBase "file:${catalina.base}/bin/tomcat-juli.jar" {..}
-grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
-        permission java.io.FilePermission
-         "${java.home}${file.separator}lib${file.separator}logging.properties", "read";
-
-        permission java.io.FilePermission
-         "${catalina.base}${file.separator}conf${file.separator}logging.properties", "read";
-        permission java.io.FilePermission
-         "${catalina.base}${file.separator}logs", "read, write";
-        permission java.io.FilePermission
-         "${catalina.base}${file.separator}logs${file.separator}*", "read, write";
-
-        permission java.lang.RuntimePermission "shutdownHooks";
-        permission java.lang.RuntimePermission "getClassLoader";
-        permission java.lang.RuntimePermission "setContextClassLoader";
-
-        permission java.util.logging.LoggingPermission "control";
-
-        permission java.util.PropertyPermission "java.util.logging.config.class", "read";
-        permission java.util.PropertyPermission "java.util.logging.config.file", "read";
-        permission java.util.PropertyPermission "org.apache.juli.ClassLoaderLogManager.debug", "read";
-        permission java.util.PropertyPermission "catalina.base", "read";
-
-        // Note: To enable per context logging configuration, permit read access to
-        // the appropriate file. Be sure that the logging configuration is
-        // secure before enabling such access.
-        // E.g. for the examples web application (uncomment and unwrap
-        // the following to be on a single line):
-        // permission java.io.FilePermission "${catalina.base}${file.separator}
-        //  webapps${file.separator}examples${file.separator}WEB-INF
-        //  ${file.separator}classes${file.separator}logging.properties", "read";
-};
-
-// These permissions apply to the server startup code
-grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to the servlet API classes
-// and those that are shared across all class loaders
-// located in the "lib" directory
-grant codeBase "file:${catalina.home}/lib/-" {
-        permission java.security.AllPermission;
-};
-
-
-// If using a per instance lib directory, i.e. ${catalina.base}/lib,
-// then the following permission will need to be uncommented
-// grant codeBase "file:${catalina.base}/lib/-" {
-//         permission java.security.AllPermission;
-// };
-
-
-// ========== WEB APPLICATION PERMISSIONS =====================================
-
-
-// These permissions are granted by default to all web applications
-// In addition, a web application will be given a read FilePermission
-// and JndiPermission for all files and directories in its document root.
-grant {
-    // Required for JNDI lookup of named JDBC DataSource's and
-    // javamail named MimePart DataSource used to send mail
-    permission java.util.PropertyPermission "java.home", "read";
-    permission java.util.PropertyPermission "java.naming.*", "read";
-    permission java.util.PropertyPermission "javax.sql.*", "read";
-
-    // OS Specific properties to allow read access
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.util.PropertyPermission "os.version", "read";
-    permission java.util.PropertyPermission "os.arch", "read";
-    permission java.util.PropertyPermission "file.separator", "read";
-    permission java.util.PropertyPermission "path.separator", "read";
-    permission java.util.PropertyPermission "line.separator", "read";
-
-    // JVM properties to allow read access
-    permission java.util.PropertyPermission "java.version", "read";
-    permission java.util.PropertyPermission "java.vendor", "read";
-    permission java.util.PropertyPermission "java.vendor.url", "read";
-    permission java.util.PropertyPermission "java.class.version", "read";
-    permission java.util.PropertyPermission "java.specification.version", "read";
-    permission java.util.PropertyPermission "java.specification.vendor", "read";
-    permission java.util.PropertyPermission "java.specification.name", "read";
-
-    permission java.util.PropertyPermission "java.vm.specification.version", "read";
-    permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
-    permission java.util.PropertyPermission "java.vm.specification.name", "read";
-    permission java.util.PropertyPermission "java.vm.version", "read";
-    permission java.util.PropertyPermission "java.vm.vendor", "read";
-    permission java.util.PropertyPermission "java.vm.name", "read";
-
-    // Required for OpenJMX
-    permission java.lang.RuntimePermission "getAttribute";
-
-    // Allow read of JAXP compliant XML parser debug
-    permission java.util.PropertyPermission "jaxp.debug", "read";
-
-    // All JSPs need to be able to read this package
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat";
-
-    // Precompiled JSPs need access to these packages.
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
-    permission java.lang.RuntimePermission
-     "accessClassInPackage.org.apache.jasper.runtime.*";
-
-    // Precompiled JSPs need access to these system properties.
-    permission java.util.PropertyPermission
-     "org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "read";
-    permission java.util.PropertyPermission
-     "org.apache.el.parser.COERCE_TO_ZERO", "read";
-
-    // The cookie code needs these.
-    permission java.util.PropertyPermission
-     "org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "read";
-    permission java.util.PropertyPermission
-     "org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING", "read";
-    permission java.util.PropertyPermission
-     "org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR", "read";
-
-    // Applications using Comet need to be able to access this package
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.comet";
-
-    // Applications using the legacy WebSocket implementation need to be able to access this package
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.websocket";
-
-    // Applications using the JSR-356 WebSocket implementation need to be able to access these packages
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket.server";
-};
-
-
-// The Manager application needs access to the following packages to support the
-// session display functionality. These settings support the following
-// configurations:
-// - default CATALINA_HOME == CATALINA_BASE
-// - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
-// - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME
-grant codeBase "file:${catalina.base}/webapps/manager/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.ha.session";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util";
-};
-grant codeBase "file:${catalina.home}/webapps/manager/-" {
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.ha.session";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util";
-};
-
-// You can assign additional permissions to particular web applications by
-// adding additional "grant" entries here, based on the code base for that
-// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files.
-//
-// Different permissions can be granted to JSP pages, classes loaded from
-// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/
-// directory, or even to individual jar files in the /WEB-INF/lib/ directory.
-//
-// For instance, assume that the standard "examples" application
-// included a JDBC driver that needed to establish a network connection to the
-// corresponding database and used the scrape taglib to get the weather from
-// the NOAA web server.  You might create a "grant" entries like this:
-//
-// The permissions granted to the context root directory apply to JSP pages.
-// grant codeBase "file:${catalina.base}/webapps/examples/-" {
-//      permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect";
-//      permission java.net.SocketPermission "*.noaa.gov:80", "connect";
-// };
-//
-// The permissions granted to the context WEB-INF/classes directory
-// grant codeBase "file:${catalina.base}/webapps/examples/WEB-INF/classes/-" {
-// };
-//
-// The permission granted to your JDBC driver
-// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar!/-" {
-//      permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect";
-// };
-// The permission granted to the scrape taglib
-// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" {
-//      permission java.net.SocketPermission "*.noaa.gov:80", "connect";
-// };
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/conf/catalina.properties
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/conf/catalina.properties b/eagle-assembly/src/main/lib/tomcat/conf/catalina.properties
deleted file mode 100644
index ef375e1..0000000
--- a/eagle-assembly/src/main/lib/tomcat/conf/catalina.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,\
-org.apache.naming.resources.,org.apache.tomcat.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
-org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
-
-#
-#
-# List of comma-separated paths defining the contents of the "common"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank,the JVM system loader will be used as Catalina's "common"
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
-
-#
-# List of comma-separated paths defining the contents of the "server"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank, the "common" loader will be used as Catalina's "server"
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-server.loader=
-
-#
-# List of comma-separated paths defining the contents of the "shared"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
-# the "common" loader will be used as Catalina's "shared" loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-# Please note that for single jars, e.g. bar.jar, you need the URL form
-# starting with file:.
-shared.loader=
-
-# List of JAR files that should not be scanned using the JarScanner
-# functionality. This is typically used to scan JARs for configuration
-# information. JARs that do not contain such information may be excluded from
-# the scan to speed up the scanning process. This is the default list. JARs on
-# this list are excluded from all scans. Scan specific lists (to exclude JARs
-# from individual scans) follow this. The list must be a comma separated list of
-# JAR file names.
-# The JARs listed below include:
-# - Tomcat Bootstrap JARs
-# - Tomcat API JARs
-# - Catalina JARs
-# - Jasper JARs
-# - Tomcat JARs
-# - Common non-Tomcat JARs
-# - Test JARs (JUnit, Cobertura and dependencies)
-tomcat.util.scan.DefaultJarScanner.jarsToSkip=\
-bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\
-annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,websocket-api.jar,\
-catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-tribes.jar,\
-jasper.jar,jasper-el.jar,ecj-*.jar,\
-tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\
-tomcat-jni.jar,tomcat-spdy.jar,\
-tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
-tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
-tomcat-jdbc.jar,\
-tools.jar,\
-commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,\
-commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\
-commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\
-commons-math*.jar,commons-pool*.jar,\
-jstl.jar,\
-geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\
-ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\
-jmx-tools.jar,jta*.jar,log4j.jar,log4j-1*.jar,mail*.jar,slf4j*.jar,\
-xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\
-junit.jar,junit-*.jar,hamcrest*.jar,org.hamcrest*.jar,ant-launcher.jar,\
-cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar,\
-jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,\
-xom-*.jar
-
-# Additional JARs (over and above the default JARs listed above) to skip when
-# scanning for Servlet 3.0 pluggability features. These features include web
-# fragments, annotations, SCIs and classes that match @HandlesTypes. The list
-# must be a comma separated list of JAR file names.
-org.apache.catalina.startup.ContextConfig.jarsToSkip=
-
-# Additional JARs (over and above the default JARs listed above) to skip when
-# scanning for TLDs. The list must be a comma separated list of JAR file names.
-org.apache.catalina.startup.TldConfig.jarsToSkip=tomcat7-websocket.jar
-
-#
-# String cache configuration.
-tomcat.util.buf.StringCache.byte.enabled=true
-#tomcat.util.buf.StringCache.char.enabled=true
-#tomcat.util.buf.StringCache.trainThreshold=500000
-#tomcat.util.buf.StringCache.cacheSize=5000

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/conf/context.xml
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/conf/context.xml b/eagle-assembly/src/main/lib/tomcat/conf/context.xml
deleted file mode 100644
index 745bf95..0000000
--- a/eagle-assembly/src/main/lib/tomcat/conf/context.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- The contents of this file will be loaded for each web application -->
-<Context>
-
-    <!-- Default set of monitored resources -->
-    <WatchedResource>WEB-INF/web.xml</WatchedResource>
-
-    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
-    <!--
-    <Manager pathname="" />
-    -->
-
-    <!-- Uncomment this to enable Comet connection tacking (provides events
-         on session expiration as well as webapp lifecycle) -->
-    <!--
-    <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
-    -->
-
-</Context>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/conf/logging.properties
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/conf/logging.properties b/eagle-assembly/src/main/lib/tomcat/conf/logging.properties
deleted file mode 100644
index 912b193..0000000
--- a/eagle-assembly/src/main/lib/tomcat/conf/logging.properties
+++ /dev/null
@@ -1,64 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-1catalina.org.apache.juli.FileHandler.level = FINE
-1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/../../logs
-1catalina.org.apache.juli.FileHandler.prefix = eagle-service.
-
-2localhost.org.apache.juli.FileHandler.level = FINE
-2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/../../logs
-2localhost.org.apache.juli.FileHandler.prefix = eagle-service.
-
-3manager.org.apache.juli.FileHandler.level = FINE
-3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/../../logs
-3manager.org.apache.juli.FileHandler.prefix = eagle-service-manager.
-
-4host-manager.org.apache.juli.FileHandler.level = FINE
-4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/../../logs
-4host-manager.org.apache.juli.FileHandler.prefix = eagle-service-host-manager.
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler
-
-# For example, set the org.apache.catalina.util.LifecycleBase logger to log
-# each component that extends LifecycleBase changing state:
-#org.apache.catalina.util.LifecycleBase.level = FINE
-
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/conf/server.xml
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/conf/server.xml b/eagle-assembly/src/main/lib/tomcat/conf/server.xml
deleted file mode 100644
index 9ca8e87..0000000
--- a/eagle-assembly/src/main/lib/tomcat/conf/server.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" at this level.
-     Documentation at /docs/config/server.html
- -->
-<Server port="9005" shutdown="SHUTDOWN">
-  <!--<Listener className="org.apache.catalina.startup.VersionLoggerListener" />-->
-  <!-- Security listener. Documentation at /docs/config/listeners.html
-  <Listener className="org.apache.catalina.security.SecurityListener" />
-  -->
-  <!--APR library loader. Documentation at /docs/apr.html -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-  <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
-  <Listener className="org.apache.catalina.core.JasperListener" />
-  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
-  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
-
-  <!-- Global JNDI resources
-       Documentation at /docs/jndi-resources-howto.html
-  -->
-  <GlobalNamingResources>
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users
-    -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-              description="User database that can be updated and saved"
-              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-              pathname="conf/tomcat-users.xml" />
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" Note:  A "Service" is not itself a "Container",
-       so you may not define subcomponents such as "Valves" at this level.
-       Documentation at /docs/config/service.html
-   -->
-  <Service name="Catalina">
-
-    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
-    <!--
-    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
-        maxThreads="150" minSpareThreads="4"/>
-    -->
-
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned. Documentation at :
-         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
-         Java AJP  Connector: /docs/config/ajp.html
-         APR (HTTP/AJP) Connector: /docs/apr.html
-         Define a non-SSL HTTP/1.1 Connector on port 8080
-    -->
-    <Connector port="9099" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" />
-    <!-- A "Connector" using the shared thread pool-->
-    <!--
-    <Connector executor="tomcatThreadPool"
-               port="9090" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="9443" />
-    -->
-    <!-- Define a SSL HTTP/1.1 Connector on port 8443
-         This connector uses the BIO implementation that requires the JSSE
-         style configuration. When using the APR/native implementation, the
-         OpenSSL style configuration is required as described in the APR/native
-         documentation -->
-    <!--
-    <Connector port="9443" protocol="org.apache.coyote.http11.Http11Protocol"
-               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS" />
-    -->
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="9009" protocol="AJP/1.3" redirectPort="9443" />
-
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host).
-         Documentation at /docs/config/engine.html -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-    -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!--For clustering, please take a look at documentation at:
-          /docs/cluster-howto.html  (simple how to)
-          /docs/config/cluster.html (reference documentation) -->
-      <!--
-      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-      -->
-
-      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
-           via a brute-force attack -->
-      <Realm className="org.apache.catalina.realm.LockOutRealm">
-        <!-- This Realm uses the UserDatabase configured in the global JNDI
-             resources under the key "UserDatabase".  Any edits
-             that are performed against this UserDatabase are immediately
-             available for use by the Realm.  -->
-        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-               resourceName="UserDatabase"/>
-      </Realm>
-
-      <Host name="localhost"  appBase="webapps"
-            unpackWARs="true" autoDeploy="true">
-
-        <!-- SingleSignOn valve, share authentication between web applications
-             Documentation at: /docs/config/valve.html -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-        -->
-
-        <!-- Access log processes all example.
-             Documentation at: /docs/config/valve.html
-             Note: The pattern used is equivalent to using pattern="common" -->
-        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="../../logs"
-               prefix="eagle-service-access-log." suffix=".txt"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
-
-      </Host>
-    </Engine>
-  </Service>
-</Server>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/conf/tomcat-users.xml
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/conf/tomcat-users.xml b/eagle-assembly/src/main/lib/tomcat/conf/tomcat-users.xml
deleted file mode 100644
index 7f022ff..0000000
--- a/eagle-assembly/src/main/lib/tomcat/conf/tomcat-users.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<tomcat-users>
-<!--
-  NOTE:  By default, no user is included in the "manager-gui" role required
-  to operate the "/manager/html" web application.  If you wish to use this app,
-  you must define such a user - the username and password are arbitrary.
--->
-<!--
-  NOTE:  The sample user and role entries below are wrapped in a comment
-  and thus are ignored when reading this file. Do not forget to remove
-  <!.. ..> that surrounds them.
--->
-<!--
-  <role rolename="tomcat"/>
-  <role rolename="role1"/>
-  <user username="tomcat" password="tomcat" roles="tomcat"/>
-  <user username="both" password="tomcat" roles="tomcat,role1"/>
-  <user username="role1" password="tomcat" roles="role1"/>
--->
-</tomcat-users>


[08/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/lib/.keepempty
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/lib/.keepempty b/eagle-assembly/src/main/lib/tomcat/lib/.keepempty
deleted file mode 100644
index 823c394..0000000
--- a/eagle-assembly/src/main/lib/tomcat/lib/.keepempty
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements.  See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License.  You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/topology/.placeholder
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/topology/.placeholder b/eagle-assembly/src/main/lib/topology/.placeholder
deleted file mode 100644
index 823c394..0000000
--- a/eagle-assembly/src/main/lib/topology/.placeholder
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements.  See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License.  You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/userprofile/.placeholder
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/userprofile/.placeholder b/eagle-assembly/src/main/lib/userprofile/.placeholder
deleted file mode 100644
index 823c394..0000000
--- a/eagle-assembly/src/main/lib/userprofile/.placeholder
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements.  See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License.  You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert-app/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-app/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert-app/pom.xml
index 400afaa..b7fd0ef 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-app/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert-app/pom.xml
@@ -15,13 +15,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.eagle</groupId>
     <artifactId>eagle-alert-parent</artifactId>
-    <version>0.5.0-incubating-SNAPSHOT</version>
+    <version>0.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>eagle-alert-app</artifactId>
   <name>Eagle::Core::Alert::App</name>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/resources/META-INF/providers/org.apache.eagle.alert.app.AlertUnitTopologyAppProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/resources/META-INF/providers/org.apache.eagle.alert.app.AlertUnitTopologyAppProvider.xml b/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/resources/META-INF/providers/org.apache.eagle.alert.app.AlertUnitTopologyAppProvider.xml
index b6ad59b..3b1591a 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/resources/META-INF/providers/org.apache.eagle.alert.app.AlertUnitTopologyAppProvider.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/resources/META-INF/providers/org.apache.eagle.alert.app.AlertUnitTopologyAppProvider.xml
@@ -20,7 +20,6 @@
     <type>ALERT_UNIT_TOPOLOGY_APP</type>
     <name>Alert Engine</name>
     <description>Real-time Alert Engine</description>
-    <version>0.5.0-incubating</version>
     <configuration>
        <!-- alert topology sizing parameters -->
         <property>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert-service/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-service/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert-service/pom.xml
index 7f1ff22..330b469 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-service/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert-service/pom.xml
@@ -16,14 +16,13 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-alert-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert/alert-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-assembly/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-assembly/pom.xml
index 3ce640e..a6fe3a5 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-assembly/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-assembly/pom.xml
@@ -10,14 +10,13 @@
 	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the
 	License for the specific language governing permissions and ~ limitations
 	under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-alert</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>alert-assembly</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert/alert-common/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/pom.xml
index 2228fc1..f5218b7 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/pom.xml
@@ -10,14 +10,13 @@
 	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the
 	License for the specific language governing permissions and ~ limitations
 	under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-alert</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/pom.xml
index 440d34a..9022843 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/pom.xml
@@ -10,14 +10,13 @@
 	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the
 	License for the specific language governing permissions and ~ limitations
 	under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-alert</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>alert-coordinator</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/pom.xml
index 798718f..2860e52 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/pom.xml
@@ -10,14 +10,13 @@
 	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the
 	License for the specific language governing permissions and ~ limitations
 	under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-alert</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>alert-devtools</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/pom.xml
index 3a548d3..78c0bc4 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/pom.xml
@@ -10,14 +10,13 @@
 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 	~ * See the License for the specific language governing permissions and ~
 	* limitations under the License. ~ */ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-alert</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/pom.xml
index cf1f0fc..26613d5 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/pom.xml
@@ -10,14 +10,13 @@
 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 	~ * See the License for the specific language governing permissions and ~ 
 	* limitations under the License. ~ */ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>alert-metadata-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>alert-metadata-service</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/pom.xml
index 1711f0a..8c2f72f 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/pom.xml
@@ -10,14 +10,13 @@
 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 	~ * See the License for the specific language governing permissions and ~ 
 	* limitations under the License. ~ */ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>alert-metadata-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>alert-metadata</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/pom.xml
index 3e3e1e4..f269b57 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/pom.xml
@@ -10,14 +10,13 @@
 	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the 
 	License for the specific language governing permissions and ~ limitations 
 	under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-alert</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>alert-metadata-parent</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert/alert-service/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/pom.xml
index 7114f58..f078d2a 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/pom.xml
@@ -10,12 +10,11 @@
 	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the 
 	License for the specific language governing permissions and ~ limitations 
 	under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-alert</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -149,10 +148,8 @@
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>shaded</shadedClassifierName>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.apache.eagle.service.app.ServiceApp</mainClass>
                                 </transformer>
                             </transformers>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
index cfec276..5726b7d 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
@@ -10,14 +10,13 @@
 	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the 
 	License for the specific language governing permissions and ~ limitations 
 	under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-alert-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>eagle-alert</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-alert-parent/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/pom.xml b/eagle-core/eagle-alert-parent/pom.xml
index 4497698..0c84b3d 100644
--- a/eagle-core/eagle-alert-parent/pom.xml
+++ b/eagle-core/eagle-alert-parent/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-core</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-app/eagle-app-base/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-app/eagle-app-base/pom.xml b/eagle-core/eagle-app/eagle-app-base/pom.xml
index 21fdfae..b614c6b 100644
--- a/eagle-core/eagle-app/eagle-app-base/pom.xml
+++ b/eagle-core/eagle-app/eagle-app-base/pom.xml
@@ -16,13 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-app-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/config/ApplicationProviderDescConfig.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/config/ApplicationProviderDescConfig.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/config/ApplicationProviderDescConfig.java
index 0a8b81f..c05b6d6 100644
--- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/config/ApplicationProviderDescConfig.java
+++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/config/ApplicationProviderDescConfig.java
@@ -17,6 +17,7 @@
 package org.apache.eagle.app.config;
 
 import org.apache.eagle.alert.engine.coordinator.StreamDefinition;
+import org.apache.eagle.common.Version;
 import org.apache.eagle.metadata.model.ApplicationDependency;
 import org.apache.eagle.metadata.model.ApplicationDocs;
 import org.apache.eagle.metadata.model.Configuration;
@@ -45,7 +46,7 @@ public class ApplicationProviderDescConfig {
     private String name;
 
     @XmlElement(required = true)
-    private String version;
+    private String version = Version.version;
 
     private String description;
     private String viewPath;

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/ApplicationProviderServiceTest.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/ApplicationProviderServiceTest.java b/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/ApplicationProviderServiceTest.java
index 57337f5..4f555bb 100644
--- a/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/ApplicationProviderServiceTest.java
+++ b/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/ApplicationProviderServiceTest.java
@@ -22,6 +22,7 @@ import com.google.inject.Inject;
 import org.apache.eagle.app.service.ApplicationProviderService;
 import org.apache.eagle.app.spi.ApplicationProvider;
 import org.apache.eagle.app.test.ApplicationTestBase;
+import org.apache.eagle.common.Version;
 import org.apache.eagle.metadata.model.ApplicationDesc;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -43,7 +44,9 @@ public class ApplicationProviderServiceTest extends ApplicationTestBase {
         applicationDescs.forEach((d)-> LOGGER.debug(d.toString()));
         applicationProviders.forEach((d)-> LOGGER.debug(d.toString()));
         assertNull(providerManager.getApplicationDescByType("TEST_APPLICATION").getViewPath());
+        assertEquals(Version.version,providerManager.getApplicationDescByType("TEST_APPLICATION").getVersion());
         assertEquals("/apps/test_web_app",providerManager.getApplicationDescByType("TEST_WEB_APPLICATION").getViewPath());
+        assertEquals("0.5.0-beta",providerManager.getApplicationDescByType("TEST_WEB_APPLICATION").getVersion());
         assertNotNull(providerManager.getApplicationDescByType("TEST_WEB_APPLICATION").getDependencies());
         assertEquals(1,providerManager.getApplicationDescByType("TEST_WEB_APPLICATION").getDependencies().size());
         assertEquals("TEST_APPLICATION",providerManager.getApplicationDescByType("TEST_WEB_APPLICATION").getDependencies().get(0).getType());

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestStormApplication$Provider.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestStormApplication$Provider.xml b/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestStormApplication$Provider.xml
index 9d33c0e..672cf2d 100644
--- a/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestStormApplication$Provider.xml
+++ b/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestStormApplication$Provider.xml
@@ -19,7 +19,6 @@
 <application>
     <type>TEST_APPLICATION</type>
     <name>Test Monitoring Application</name>
-    <version>0.5.0-incubating</version>
     <appClass>org.apache.eagle.app.TestStormApplication</appClass>
     <configuration>
         <property>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestWebApplication$Provider.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestWebApplication$Provider.xml b/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestWebApplication$Provider.xml
index 19aa5e8..ecf1d88 100644
--- a/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestWebApplication$Provider.xml
+++ b/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestWebApplication$Provider.xml
@@ -19,12 +19,11 @@
 <application>
     <type>TEST_WEB_APPLICATION</type>
     <name>Test Monitoring Web Application</name>
-    <version>0.5.0-incubating</version>
+    <version>0.5.0-beta</version>
     <viewPath>/apps/test_web_app</viewPath>
     <dependencies>
         <dependency>
             <type>TEST_APPLICATION</type>
-            <version>0.5.0-incubating</version>
         </dependency>
     </dependencies>
     <docs>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-app/eagle-app-utils/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-app/eagle-app-utils/pom.xml b/eagle-core/eagle-app/eagle-app-utils/pom.xml
index 9671da1..09ae636 100644
--- a/eagle-core/eagle-app/eagle-app-utils/pom.xml
+++ b/eagle-core/eagle-app/eagle-app-utils/pom.xml
@@ -17,13 +17,11 @@
   ~  limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-app-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-app/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-app/pom.xml b/eagle-core/eagle-app/pom.xml
index d6f8925..b37c31f 100644
--- a/eagle-core/eagle-app/pom.xml
+++ b/eagle-core/eagle-app/pom.xml
@@ -17,12 +17,11 @@
   ~
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-core</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-common/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-common/pom.xml b/eagle-core/eagle-common/pom.xml
index d86e09f..6e94fb2 100644
--- a/eagle-core/eagle-common/pom.xml
+++ b/eagle-core/eagle-common/pom.xml
@@ -16,14 +16,13 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-core</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,6 +34,12 @@
         <dependency>
             <groupId>org.wso2.siddhi</groupId>
             <artifactId>siddhi-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-configuration</groupId>
@@ -44,7 +49,6 @@
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-client</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-common/src/main/java-templates/org/apache/eagle/common/Version.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-common/src/main/java-templates/org/apache/eagle/common/Version.java b/eagle-core/eagle-common/src/main/java-templates/org/apache/eagle/common/Version.java
index 0b84211..845d159 100644
--- a/eagle-core/eagle-common/src/main/java-templates/org/apache/eagle/common/Version.java
+++ b/eagle-core/eagle-common/src/main/java-templates/org/apache/eagle/common/Version.java
@@ -24,7 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public final class Version {
-    public static final String projectName = "Eagle";
+    public static final String projectName = "Apache Eagle";
     public static final String moduleName = "${project.name}";
     public static final String version = "${project.version}";
     public static final String buildNumber = "${buildNumber}";
@@ -43,13 +43,13 @@ public final class Version {
         } catch (IOException e) {
             LOG.error(e.getMessage(),e);
         } finally {
-            LOG.info("Eagle {} {}",Version.version, DateTimeUtil.millisecondsToHumanDateWithSeconds(Long.parseLong(Version.timestamp)));
+            LOG.info("{} {} ({}, {})", projectName,Version.version,gitRevision,DateTimeUtil.millisecondsToHumanDateWithSecondsAndTimezone(Long.parseLong(Version.timestamp)));
         }
     }
 
     @Override
     public String toString() {
-        return String.format("%s version=%s buildNumber=%s gitRevision=%s built by %s on %s",
+        return String.format("%s %s buildNumber=%s gitRevision=%s built by %s on %s",
             projectName, version, buildNumber, gitRevision, userName, new Date(Long.parseLong(timestamp)));
     }
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/DateTimeUtil.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/DateTimeUtil.java b/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/DateTimeUtil.java
index 98a5a4b..c8dfb1f 100644
--- a/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/DateTimeUtil.java
+++ b/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/DateTimeUtil.java
@@ -85,6 +85,14 @@ public class DateTimeUtil {
         return sdf.format(t);
     }
 
+    public static String millisecondsToHumanDateWithSecondsAndTimezone(long milliseconds) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
+        sdf.setTimeZone(CURRENT_TIME_ZONE);
+        Date t = new Date();
+        t.setTime(milliseconds);
+        return sdf.format(t);
+    }
+
     public static long humanDateToSeconds(String date) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(CURRENT_TIME_ZONE);

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-data-process/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-data-process/pom.xml b/eagle-core/eagle-data-process/pom.xml
index fcf05e8..8e5f9b9 100644
--- a/eagle-core/eagle-data-process/pom.xml
+++ b/eagle-core/eagle-data-process/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-core</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>eagle-data-process</artifactId>
     <name>Eagle::Core::DataProcess</name>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-embed/eagle-embed-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-embed/eagle-embed-hbase/pom.xml b/eagle-core/eagle-embed/eagle-embed-hbase/pom.xml
index 53df04f..5c5f37d 100644
--- a/eagle-core/eagle-embed/eagle-embed-hbase/pom.xml
+++ b/eagle-core/eagle-embed/eagle-embed-hbase/pom.xml
@@ -16,12 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-embed-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-embed/eagle-embed-server/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-embed/eagle-embed-server/pom.xml b/eagle-core/eagle-embed/eagle-embed-server/pom.xml
index 3c90d63..de7ebe2 100644
--- a/eagle-core/eagle-embed/eagle-embed-server/pom.xml
+++ b/eagle-core/eagle-embed/eagle-embed-server/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-embed-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>eagle-embed-server</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-embed/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-embed/pom.xml b/eagle-core/eagle-embed/pom.xml
index 5f9365e..b008150 100644
--- a/eagle-core/eagle-embed/pom.xml
+++ b/eagle-core/eagle-embed/pom.xml
@@ -16,12 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-core</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-metadata/eagle-metadata-base/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-metadata/eagle-metadata-base/pom.xml b/eagle-core/eagle-metadata/eagle-metadata-base/pom.xml
index f58c34c..ff3db18 100644
--- a/eagle-core/eagle-metadata/eagle-metadata-base/pom.xml
+++ b/eagle-core/eagle-metadata/eagle-metadata-base/pom.xml
@@ -16,13 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-metadata</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationDependency.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationDependency.java b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationDependency.java
index 91d197f..80efa1d 100644
--- a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationDependency.java
+++ b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationDependency.java
@@ -16,12 +16,14 @@
  */
 package org.apache.eagle.metadata.model;
 
+import org.apache.eagle.common.Version;
+
 import javax.xml.bind.annotation.XmlElement;
 
 public class ApplicationDependency {
     private String type;
 
-    private String version;
+    private String version = Version.version;
     private boolean required = true;
 
     public String getVersion() {

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-metadata/eagle-metadata-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-metadata/eagle-metadata-jdbc/pom.xml b/eagle-core/eagle-metadata/eagle-metadata-jdbc/pom.xml
index 62ccdb8..aafaa34 100644
--- a/eagle-core/eagle-metadata/eagle-metadata-jdbc/pom.xml
+++ b/eagle-core/eagle-metadata/eagle-metadata-jdbc/pom.xml
@@ -16,13 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-metadata</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-metadata/eagle-metadata-jdbc/src/test/resources/META-INF/providers/org.apache.eagle.metadata.store.jdbc.TestStaticApplication$Provider.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-metadata/eagle-metadata-jdbc/src/test/resources/META-INF/providers/org.apache.eagle.metadata.store.jdbc.TestStaticApplication$Provider.xml b/eagle-core/eagle-metadata/eagle-metadata-jdbc/src/test/resources/META-INF/providers/org.apache.eagle.metadata.store.jdbc.TestStaticApplication$Provider.xml
index ec38d0b..049c3be 100644
--- a/eagle-core/eagle-metadata/eagle-metadata-jdbc/src/test/resources/META-INF/providers/org.apache.eagle.metadata.store.jdbc.TestStaticApplication$Provider.xml
+++ b/eagle-core/eagle-metadata/eagle-metadata-jdbc/src/test/resources/META-INF/providers/org.apache.eagle.metadata.store.jdbc.TestStaticApplication$Provider.xml
@@ -19,7 +19,6 @@
 <application>
     <type>TEST_APP</type>
     <name>Test app</name>
-    <version>0.5.0-incubating</version>
     <configuration>
         <!-- org.apache.eagle.jpm.mr.history.MRHistoryJobConfig -->
         <property>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-metadata/eagle-metadata-mongo/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-metadata/eagle-metadata-mongo/pom.xml b/eagle-core/eagle-metadata/eagle-metadata-mongo/pom.xml
index fb0456f..c86df51 100644
--- a/eagle-core/eagle-metadata/eagle-metadata-mongo/pom.xml
+++ b/eagle-core/eagle-metadata/eagle-metadata-mongo/pom.xml
@@ -15,13 +15,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-metadata</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-metadata/pom.xml b/eagle-core/eagle-metadata/pom.xml
index e7561a5..a285668 100644
--- a/eagle-core/eagle-metadata/pom.xml
+++ b/eagle-core/eagle-metadata/pom.xml
@@ -16,13 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-core</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-metric/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-metric/pom.xml b/eagle-core/eagle-metric/pom.xml
index f2b125d..0208f98 100644
--- a/eagle-core/eagle-metric/pom.xml
+++ b/eagle-core/eagle-metric/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-core</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-query/eagle-antlr/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-antlr/pom.xml b/eagle-core/eagle-query/eagle-antlr/pom.xml
index fa6eb12..e4318c9 100644
--- a/eagle-core/eagle-query/eagle-antlr/pom.xml
+++ b/eagle-core/eagle-query/eagle-antlr/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-query-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-query/eagle-audit-base/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-audit-base/pom.xml b/eagle-core/eagle-query/eagle-audit-base/pom.xml
index cdcdfc5..8dc0a50 100755
--- a/eagle-core/eagle-query/eagle-audit-base/pom.xml
+++ b/eagle-core/eagle-query/eagle-audit-base/pom.xml
@@ -17,14 +17,13 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-query-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-query/eagle-client-base/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/pom.xml b/eagle-core/eagle-query/eagle-client-base/pom.xml
index c5d33a1..b61bc48 100644
--- a/eagle-core/eagle-query/eagle-client-base/pom.xml
+++ b/eagle-core/eagle-query/eagle-client-base/pom.xml
@@ -16,14 +16,13 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-query-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-query/eagle-entity-base/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/pom.xml b/eagle-core/eagle-query/eagle-entity-base/pom.xml
index bed3bb1..f887714 100755
--- a/eagle-core/eagle-query/eagle-entity-base/pom.xml
+++ b/eagle-core/eagle-query/eagle-entity-base/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-query-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-query/eagle-query-base/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-query-base/pom.xml b/eagle-core/eagle-query/eagle-query-base/pom.xml
index f9512b7..8e1b7b1 100644
--- a/eagle-core/eagle-query/eagle-query-base/pom.xml
+++ b/eagle-core/eagle-query/eagle-query-base/pom.xml
@@ -16,12 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-query-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-query/eagle-service-base/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-service-base/pom.xml b/eagle-core/eagle-query/eagle-service-base/pom.xml
index 74f635e..91cb3a9 100755
--- a/eagle-core/eagle-query/eagle-service-base/pom.xml
+++ b/eagle-core/eagle-query/eagle-service-base/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-query-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-query/eagle-storage-base/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-storage-base/pom.xml b/eagle-core/eagle-query/eagle-storage-base/pom.xml
index 23ce217..78a6dfc 100644
--- a/eagle-core/eagle-query/eagle-storage-base/pom.xml
+++ b/eagle-core/eagle-query/eagle-storage-base/pom.xml
@@ -15,12 +15,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-query-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-query/eagle-storage-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-storage-hbase/pom.xml b/eagle-core/eagle-query/eagle-storage-hbase/pom.xml
index bcd78bb..21ca32c 100644
--- a/eagle-core/eagle-query/eagle-storage-hbase/pom.xml
+++ b/eagle-core/eagle-query/eagle-storage-hbase/pom.xml
@@ -16,12 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-query-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-query/eagle-storage-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-storage-jdbc/pom.xml b/eagle-core/eagle-query/eagle-storage-jdbc/pom.xml
index 3271273..6c89b07 100644
--- a/eagle-core/eagle-query/eagle-storage-jdbc/pom.xml
+++ b/eagle-core/eagle-query/eagle-storage-jdbc/pom.xml
@@ -16,12 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-query-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/eagle-query/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/pom.xml b/eagle-core/eagle-query/pom.xml
index ae91780..3e8ef67 100644
--- a/eagle-core/eagle-query/pom.xml
+++ b/eagle-core/eagle-query/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-core</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-core/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/pom.xml b/eagle-core/pom.xml
index dc8a3f5..c7d77b2 100644
--- a/eagle-core/pom.xml
+++ b/eagle-core/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-examples/eagle-app-example/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-examples/eagle-app-example/pom.xml b/eagle-examples/eagle-app-example/pom.xml
index c21ccac..fe00661 100644
--- a/eagle-examples/eagle-app-example/pom.xml
+++ b/eagle-examples/eagle-app-example/pom.xml
@@ -15,13 +15,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-examples</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>eagle-app-example</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-examples/eagle-app-example/src/main/resources/META-INF/providers/org.apache.eagle.app.example.ExampleApplicationProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-examples/eagle-app-example/src/main/resources/META-INF/providers/org.apache.eagle.app.example.ExampleApplicationProvider.xml b/eagle-examples/eagle-app-example/src/main/resources/META-INF/providers/org.apache.eagle.app.example.ExampleApplicationProvider.xml
index c1e8711..a76dbe6 100644
--- a/eagle-examples/eagle-app-example/src/main/resources/META-INF/providers/org.apache.eagle.app.example.ExampleApplicationProvider.xml
+++ b/eagle-examples/eagle-app-example/src/main/resources/META-INF/providers/org.apache.eagle.app.example.ExampleApplicationProvider.xml
@@ -19,7 +19,6 @@
 <application>
     <type>EXAMPLE_APPLICATION</type>
     <name>Example Monitor APP</name>
-    <version>0.5.0-incubating</version>
     <viewPath>/apps/example</viewPath>
     <configuration>
         <property>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-examples/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-examples/pom.xml b/eagle-examples/pom.xml
index 64faef8..e352ace 100644
--- a/eagle-examples/pom.xml
+++ b/eagle-examples/pom.xml
@@ -15,12 +15,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-external/eagle-docker/LICENSE
----------------------------------------------------------------------
diff --git a/eagle-external/eagle-docker/LICENSE b/eagle-external/eagle-docker/LICENSE
index b9c8eef..dfb7773 100644
--- a/eagle-external/eagle-docker/LICENSE
+++ b/eagle-external/eagle-docker/LICENSE
@@ -201,9 +201,9 @@
    limitations under the License.
 
 ==============================================================================
-Apache Eagle (incubating) Subcomponents:
+Apache Eagle Sub-components:
 
-The Apache Eagle project contains subcomponents with separate copyright
+The Apache Eagle project contains sub-components with separate copyright
 notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
+sub-components is subject to the terms and conditions of the following
 licenses.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-external/eagle-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-external/eagle-kafka/pom.xml b/eagle-external/eagle-kafka/pom.xml
index 3f78d5c..3db70ab 100644
--- a/eagle-external/eagle-kafka/pom.xml
+++ b/eagle-external/eagle-kafka/pom.xml
@@ -15,12 +15,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-external-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-external/eagle-log4jkafka/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-external/eagle-log4jkafka/pom.xml b/eagle-external/eagle-log4jkafka/pom.xml
index 1c6d9e2..9bd2983 100644
--- a/eagle-external/eagle-log4jkafka/pom.xml
+++ b/eagle-external/eagle-log4jkafka/pom.xml
@@ -16,12 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-external-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-external/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-external/pom.xml b/eagle-external/pom.xml
index 558964a..9b1a850 100644
--- a/eagle-external/pom.xml
+++ b/eagle-external/pom.xml
@@ -16,12 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-gc/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-gc/pom.xml b/eagle-gc/pom.xml
index 972b45f..6834a6e 100644
--- a/eagle-gc/pom.xml
+++ b/eagle-gc/pom.xml
@@ -18,13 +18,12 @@
   ~  */
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>eagle-gc</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-gc/src/main/resources/META-INF/providers/org.apache.eagle.gc.GCLogApplicationProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-gc/src/main/resources/META-INF/providers/org.apache.eagle.gc.GCLogApplicationProvider.xml b/eagle-gc/src/main/resources/META-INF/providers/org.apache.eagle.gc.GCLogApplicationProvider.xml
index c5f9732..49d5441 100644
--- a/eagle-gc/src/main/resources/META-INF/providers/org.apache.eagle.gc.GCLogApplicationProvider.xml
+++ b/eagle-gc/src/main/resources/META-INF/providers/org.apache.eagle.gc.GCLogApplicationProvider.xml
@@ -23,7 +23,6 @@
 <application>
     <type>GC_LOG_MONITOR</type>
     <name>GC Log Monitor</name>
-    <version>0.5.0-incubating</version>
     <configuration>
         <!-- topology level configurations -->
         <property>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-hadoop-metric/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-hadoop-metric/pom.xml b/eagle-hadoop-metric/pom.xml
index 47a80e2..b8bfd6f 100644
--- a/eagle-hadoop-metric/pom.xml
+++ b/eagle-hadoop-metric/pom.xml
@@ -15,12 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-hadoop-metric/src/main/resources/META-INF/providers/org.apache.eagle.metric.HadoopMetricMonitorAppProdiver.xml
----------------------------------------------------------------------
diff --git a/eagle-hadoop-metric/src/main/resources/META-INF/providers/org.apache.eagle.metric.HadoopMetricMonitorAppProdiver.xml b/eagle-hadoop-metric/src/main/resources/META-INF/providers/org.apache.eagle.metric.HadoopMetricMonitorAppProdiver.xml
index b832b48..9a32eda 100644
--- a/eagle-hadoop-metric/src/main/resources/META-INF/providers/org.apache.eagle.metric.HadoopMetricMonitorAppProdiver.xml
+++ b/eagle-hadoop-metric/src/main/resources/META-INF/providers/org.apache.eagle.metric.HadoopMetricMonitorAppProdiver.xml
@@ -19,7 +19,6 @@
 <application>
     <type>HADOOP_METRIC_MONITOR</type>
     <name>Hadoop Metrics Monitor</name>
-    <version>0.5.0-incubating</version>
     <viewPath>/apps/hadoop_metric</viewPath>
     <configuration>
         <!-- data fromStream configurations -->

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-hadoop-queue/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-hadoop-queue/pom.xml b/eagle-jpm/eagle-hadoop-queue/pom.xml
index b4b2c46..164ae0d 100644
--- a/eagle-jpm/eagle-hadoop-queue/pom.xml
+++ b/eagle-jpm/eagle-hadoop-queue/pom.xml
@@ -17,13 +17,11 @@
   ~
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-jpm-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-hadoop-queue/src/main/resources/META-INF/providers/org.apache.eagle.hadoop.queue.HadoopQueueRunningAppProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/resources/META-INF/providers/org.apache.eagle.hadoop.queue.HadoopQueueRunningAppProvider.xml b/eagle-jpm/eagle-hadoop-queue/src/main/resources/META-INF/providers/org.apache.eagle.hadoop.queue.HadoopQueueRunningAppProvider.xml
index 7d614dc..4984b43 100644
--- a/eagle-jpm/eagle-hadoop-queue/src/main/resources/META-INF/providers/org.apache.eagle.hadoop.queue.HadoopQueueRunningAppProvider.xml
+++ b/eagle-jpm/eagle-hadoop-queue/src/main/resources/META-INF/providers/org.apache.eagle.hadoop.queue.HadoopQueueRunningAppProvider.xml
@@ -19,7 +19,6 @@
 <application>
   <type>HADOOP_QUEUE_RUNNING_APP</type>
   <name>Hadoop Queue Monitor</name>
-  <version>0.5.0-incubating</version>
   <configuration>
     <!-- org.apache.eagle.hadoop.queue.HadoopQueueRunningAppConfig -->
     <property>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-aggregation/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-aggregation/pom.xml b/eagle-jpm/eagle-jpm-aggregation/pom.xml
index e2b4a76..27d363b 100644
--- a/eagle-jpm/eagle-jpm-aggregation/pom.xml
+++ b/eagle-jpm/eagle-jpm-aggregation/pom.xml
@@ -17,13 +17,11 @@
  limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-jpm-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-aggregation/src/main/resources/META-INF/providers/org.apache.eagle.jpm.aggregation.AggregationApplicationProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-aggregation/src/main/resources/META-INF/providers/org.apache.eagle.jpm.aggregation.AggregationApplicationProvider.xml b/eagle-jpm/eagle-jpm-aggregation/src/main/resources/META-INF/providers/org.apache.eagle.jpm.aggregation.AggregationApplicationProvider.xml
index 2c8d60c..c25e7ff 100644
--- a/eagle-jpm/eagle-jpm-aggregation/src/main/resources/META-INF/providers/org.apache.eagle.jpm.aggregation.AggregationApplicationProvider.xml
+++ b/eagle-jpm/eagle-jpm-aggregation/src/main/resources/META-INF/providers/org.apache.eagle.jpm.aggregation.AggregationApplicationProvider.xml
@@ -19,7 +19,6 @@
 <application>
     <type>MR_JPM_AGGREGATION_APP</type>
     <name>MR Metrics Aggregation</name>
-    <version>0.5.0-incubating</version>
     <configuration>
         <property>
             <name>workers</name>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-entity/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-entity/pom.xml b/eagle-jpm/eagle-jpm-entity/pom.xml
index 06fdf64..98982f9 100644
--- a/eagle-jpm/eagle-jpm-entity/pom.xml
+++ b/eagle-jpm/eagle-jpm-entity/pom.xml
@@ -16,12 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-jpm-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-mr-history/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/pom.xml b/eagle-jpm/eagle-jpm-mr-history/pom.xml
index feaf8dc..349c489 100644
--- a/eagle-jpm/eagle-jpm-mr-history/pom.xml
+++ b/eagle-jpm/eagle-jpm-mr-history/pom.xml
@@ -17,13 +17,11 @@
  limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-jpm-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-mr-history/src/main/resources/META-INF/providers/org.apache.eagle.jpm.mr.history.MRHistoryJobApplicationProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/resources/META-INF/providers/org.apache.eagle.jpm.mr.history.MRHistoryJobApplicationProvider.xml b/eagle-jpm/eagle-jpm-mr-history/src/main/resources/META-INF/providers/org.apache.eagle.jpm.mr.history.MRHistoryJobApplicationProvider.xml
index 1ff9b85..e5c001a 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/resources/META-INF/providers/org.apache.eagle.jpm.mr.history.MRHistoryJobApplicationProvider.xml
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/resources/META-INF/providers/org.apache.eagle.jpm.mr.history.MRHistoryJobApplicationProvider.xml
@@ -19,7 +19,6 @@
 <application>
     <type>MR_HISTORY_JOB_APP</type>
     <name>Map Reduce History Job</name>
-    <version>0.5.0-incubating</version>
     <configuration>
         <!-- org.apache.eagle.jpm.mr.history.MRHistoryJobConfig -->
         <property>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-mr-running/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-running/pom.xml b/eagle-jpm/eagle-jpm-mr-running/pom.xml
index b4db22b..f6f1be5 100644
--- a/eagle-jpm/eagle-jpm-mr-running/pom.xml
+++ b/eagle-jpm/eagle-jpm-mr-running/pom.xml
@@ -16,13 +16,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-jpm-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-mr-running/src/main/resources/META-INF/providers/org.apache.eagle.jpm.mr.running.MRRunningJobApplicationProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/resources/META-INF/providers/org.apache.eagle.jpm.mr.running.MRRunningJobApplicationProvider.xml b/eagle-jpm/eagle-jpm-mr-running/src/main/resources/META-INF/providers/org.apache.eagle.jpm.mr.running.MRRunningJobApplicationProvider.xml
index caa6f3e..99a6613 100644
--- a/eagle-jpm/eagle-jpm-mr-running/src/main/resources/META-INF/providers/org.apache.eagle.jpm.mr.running.MRRunningJobApplicationProvider.xml
+++ b/eagle-jpm/eagle-jpm-mr-running/src/main/resources/META-INF/providers/org.apache.eagle.jpm.mr.running.MRRunningJobApplicationProvider.xml
@@ -19,7 +19,6 @@
 <application>
     <type>MR_RUNNING_JOB_APP</type>
     <name>Map Reduce Running Job</name>
-    <version>0.5.0-incubating</version>
     <configuration>
         <property>
             <name>workers</name>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-service/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-service/pom.xml b/eagle-jpm/eagle-jpm-service/pom.xml
index 9857bb3..d6807bd 100644
--- a/eagle-jpm/eagle-jpm-service/pom.xml
+++ b/eagle-jpm/eagle-jpm-service/pom.xml
@@ -16,13 +16,11 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-jpm-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-spark-history/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-spark-history/pom.xml b/eagle-jpm/eagle-jpm-spark-history/pom.xml
index c8fdbbb..0f65d7ff 100644
--- a/eagle-jpm/eagle-jpm-spark-history/pom.xml
+++ b/eagle-jpm/eagle-jpm-spark-history/pom.xml
@@ -16,14 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-jpm-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>eagle-jpm-spark-history</artifactId>


[03/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/metrics/controller.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/metrics/controller.js b/eagle-webservice/src/main/webapp/_app/public/feature/metrics/controller.js
deleted file mode 100644
index d717ad1..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/metrics/controller.js
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var featureControllers = angular.module('featureControllers');
-	var feature = featureControllers.register("metrics");
-
-	// ==============================================================
-	// =                       Initialization                       =
-	// ==============================================================
-
-	// ==============================================================
-	// =                          Function                          =
-	// ==============================================================
-	// Format dashboard unit. Will adjust format with old version and add miss attributes.
-	feature.service("DashboardFormatter", function() {
-		return {
-			parse: function(unit) {
-				unit = unit || {};
-				unit.groups = unit.groups || [];
-
-				$.each(unit.groups, function (i, group) {
-					group.charts = group.charts || [];
-					$.each(group.charts, function (i, chart) {
-						if (!chart.metrics && chart.metric) {
-							chart.metrics = [{
-								aggregations: chart.aggregations,
-								dataSource: chart.dataSource,
-								metric: chart.metric
-							}];
-
-							delete chart.aggregations;
-							delete chart.dataSource;
-							delete chart.metric;
-						} else if (!chart.metrics) {
-							chart.metrics = [];
-						}
-					});
-				});
-
-				return unit;
-			}
-		};
-	});
-
-	// ==============================================================
-	// =                         Controller                         =
-	// ==============================================================
-
-	// ========================= Dashboard ==========================
-	feature.navItem("dashboard", "Metrics", "line-chart");
-
-	feature.controller('dashboard', function(PageConfig, $scope, $http, $q, UI, Site, Authorization, Application, Entities, DashboardFormatter) {
-		var _siteApp = Site.currentSiteApplication();
-		var _druidConfig = _siteApp.configObj.getValueByPath("web.druid");
-		var _refreshInterval;
-
-		var _menu_newChart;
-
-		$scope.lock = false;
-
-		$scope.dataSourceListReady = false;
-		$scope.dataSourceList = [];
-		$scope.dashboard = {
-			groups: []
-		};
-		$scope.dashboardEntity = null;
-		$scope.dashboardReady = false;
-
-		$scope._newMetricFilter = "";
-		$scope._newMetricDataSrc = null;
-		$scope._newMetricDataMetric = null;
-
-		$scope.tabHolder = {};
-
-		$scope.endTime = app.time.now();
-		$scope.startTime = $scope.endTime.clone();
-
-		// =================== Initialization ===================
-		if(!_druidConfig || !_druidConfig.coordinator || !_druidConfig.broker) {
-			$.dialog({
-				title: "OPS",
-				content: "Druid configuration can't be empty!"
-			});
-			return;
-		}
-
-		$scope.autoRefreshList = [
-			{title: "Last 1 Month", timeDes: "day", getStartTime: function(endTime) {return endTime.clone().subtract(1, "month");}},
-			{title: "Last 1 Day", timeDes: "thirty_minute", getStartTime: function(endTime) {return endTime.clone().subtract(1, "day");}},
-			{title: "Last 6 Hour", timeDes: "fifteen_minute", getStartTime: function(endTime) {return endTime.clone().subtract(6, "hour");}},
-			{title: "Last 2 Hour", timeDes: "fifteen_minute", getStartTime: function(endTime) {return endTime.clone().subtract(2, "hour");}},
-			{title: "Last 1 Hour", timeDes: "minute", getStartTime: function(endTime) {return endTime.clone().subtract(1, "hour");}}
-		];
-		$scope.autoRefreshSelect = $scope.autoRefreshList[2];
-
-		// ====================== Function ======================
-		$scope.setAuthRefresh = function(item) {
-			$scope.autoRefreshSelect = item;
-			$scope.refreshAllChart(true);
-		};
-
-		$scope.refreshTimeDisplay = function() {
-			PageConfig.pageSubTitle = common.format.date($scope.startTime) + " ~ " + common.format.date($scope.endTime) + " [refresh interval: 30s]";
-		};
-		$scope.refreshTimeDisplay();
-
-		// ======================= Metric =======================
-		// Fetch metric data
-		$http.get(_druidConfig.coordinator + "/druid/coordinator/v1/metadata/datasources", {withCredentials: false}).then(function(data) {
-			var _endTime = new moment();
-			var _startTime = _endTime.clone().subtract(1, "day");
-			var _intervals = _startTime.toISOString() + "/" + _endTime.toISOString();
-
-			$scope.dataSourceList = $.map(data.data, function(dataSrc) {
-				return {
-					dataSource: dataSrc,
-					metricList: []
-				};
-			});
-
-			// List dataSource metrics
-			var _metrixList_promiseList = $.map($scope.dataSourceList, function(dataSrc) {
-				var _data = JSON.stringify({
-					"queryType": "groupBy",
-					"dataSource": dataSrc.dataSource,
-					"granularity": "all",
-					"dimensions": ["metric"],
-					"aggregations": [
-						{
-							"type":"count",
-							"name":"count"
-						}
-					],
-					"intervals": [_intervals]
-				});
-
-				return $http.post(_druidConfig.broker + "/druid/v2", _data, {withCredentials: false}).then(function(response) {
-					dataSrc.metricList = $.map(response.data, function(entity) {
-						return entity.event.metric;
-					});
-				});
-			});
-
-			$q.all(_metrixList_promiseList).finally(function() {
-				$scope.dataSourceListReady = true;
-
-				$scope._newMetricDataSrc = $scope.dataSourceList[0];
-				$scope._newMetricDataMetric = common.getValueByPath($scope._newMetricDataSrc, "metricList.0");
-			});
-		}, function() {
-			$.dialog({
-				title: "OPS",
-				content: "Fetch data source failed. Please check Site Application Metrics configuration."
-			});
-		});
-
-		// Filter data source
-		$scope.dataSourceMetricList = function(dataSrc, filter) {
-			filter = (filter || "").toLowerCase().trim().split(/\s+/);
-			return $.grep((dataSrc && dataSrc.metricList) || [], function(metric) {
-				for(var i = 0 ; i < filter.length ; i += 1) {
-					if(metric.toLowerCase().indexOf(filter[i]) === -1) return false;
-				}
-				return true;
-			});
-		};
-
-		// New metric select
-		$scope.newMetricSelectDataSource = function(dataSrc) {
-			if(dataSrc !== $scope._newMetricDataMetric) $scope._newMetricDataMetric = dataSrc.metricList[0];
-			$scope._newMetricDataSrc = dataSrc;
-		};
-		$scope.newMetricSelectMetric = function(metric) {
-			$scope._newMetricDataMetric = metric;
-		};
-
-		// Confirm new metric
-		$scope.confirmSelectMetric = function() {
-			var group = $scope.tabHolder.selectedPane.data;
-			var metric = {
-				dataSource: $scope._newMetricDataSrc.dataSource,
-				metric: $scope._newMetricDataMetric,
-				aggregations: ["max"]
-			};
-			$("#metricMDL").modal('hide');
-
-			if($scope.metricForConfigChart) {
-				$scope.configPreviewChart.metrics.push(metric);
-				$scope.refreshChart($scope.configPreviewChart, true, true);
-			} else {
-				group.charts.push({
-					chart: "line",
-					metrics: [metric]
-				});
-				$scope.refreshAllChart();
-			}
-		};
-
-		// ======================== Menu ========================
-		function _checkGroupName(entity) {
-			if(common.array.find(entity.name, $scope.dashboard.groups, "name")) {
-				return "Group name conflict";
-			}
-		}
-
-		$scope.newGroup = function() {
-			if($scope.lock) return;
-
-			UI.createConfirm("Group", {}, [{field: "name"}], _checkGroupName).then(null, null, function(holder) {
-				$scope.dashboard.groups.push({
-					name: holder.entity.name,
-					charts: []
-				});
-				holder.closeFunc();
-
-				setTimeout(function() {
-					$scope.tabHolder.setSelect(holder.entity.name);
-				}, 0);
-			});
-		};
-
-		function renameGroup() {
-			var group = $scope.tabHolder.selectedPane.data;
-			UI.updateConfirm("Group", {}, [{field: "name", name: "New Name"}], _checkGroupName).then(null, null, function(holder) {
-				group.name = holder.entity.name;
-				holder.closeFunc();
-			});
-		}
-
-		function deleteGroup() {
-			var group = $scope.tabHolder.selectedPane.data;
-			UI.deleteConfirm(group.name).then(null, null, function(holder) {
-				common.array.remove(group, $scope.dashboard.groups);
-				holder.closeFunc();
-			});
-		}
-
-		_menu_newChart = {title: "Add Metric", func: function() {$scope.newChart();}};
-		Object.defineProperties(_menu_newChart, {
-			icon: {
-				get: function() {return $scope.dataSourceListReady ? 'plus' : 'refresh fa-spin';}
-			},
-			disabled: {
-				get: function() {return !$scope.dataSourceListReady;}
-			}
-		});
-
-		$scope.menu = Authorization.isRole('ROLE_ADMIN') ? [
-			{icon: "cog", title: "Configuration", list: [
-				_menu_newChart,
-				{icon: "pencil", title: "Rename Group", func: renameGroup},
-				{icon: "trash", title: "Delete Group", danger: true, func: deleteGroup}
-			]},
-			{icon: "plus", title: "New Group", func: $scope.newGroup}
-		] : [];
-
-		// ===================== Dashboard ======================
-		$scope.dashboardList = Entities.queryEntities("GenericResourceService", {
-			site: Site.current().tags.site,
-			application: Application.current().tags.application
-		});
-		$scope.dashboardList._promise.then(function(list) {
-			$scope.dashboardEntity = list[0];
-			$scope.dashboard = DashboardFormatter.parse(common.parseJSON($scope.dashboardEntity.value));
-			$scope.refreshAllChart();
-		}).finally(function() {
-			$scope.dashboardReady = true;
-		});
-
-		$scope.saveDashboard = function() {
-			$scope.lock = true;
-
-			if(!$scope.dashboardEntity) {
-				$scope.dashboardEntity = {
-					tags: {
-						site: Site.current().tags.site,
-						application: Application.current().tags.application,
-						name: "/metric_dashboard/dashboard/default"
-					}
-				};
-			}
-			$scope.dashboardEntity.value = common.stringify($scope.dashboard);
-
-			Entities.updateEntity("GenericResourceService", $scope.dashboardEntity)._promise.then(function() {
-				$.dialog({
-					title: "Done",
-					content: "Save success!"
-				});
-			}, function() {
-				$.dialog({
-					title: "POS",
-					content: "Save failed. Please retry."
-				});
-			}).finally(function() {
-				$scope.lock = false;
-			});
-		};
-
-		// ======================= Chart ========================
-		$scope.configTargetChart = null;
-		$scope.configPreviewChart = null;
-		$scope.metricForConfigChart = false;
-		$scope.viewChart = null;
-
-		$scope.chartConfig = {
-			xType: "time"
-		};
-
-		$scope.chartTypeList = [
-			{icon: "line-chart", chart: "line"},
-			{icon: "area-chart", chart: "area"},
-			{icon: "bar-chart", chart: "column"},
-			{icon: "pie-chart", chart: "pie"}
-		];
-
-		$scope.chartSeriesList = [
-			{name: "Min", series: "min"},
-			{name: "Max", series: "max"},
-			{name: "Avg", series: "avg"},
-			{name: "Count", series: "count"},
-			{name: "Sum", series: "sum"}
-		];
-
-		$scope.newChart = function() {
-			$scope.metricForConfigChart = false;
-			$("#metricMDL").modal();
-		};
-
-		$scope.configPreviewChartMinimumCheck = function() {
-			$scope.configPreviewChart.min = $scope.configPreviewChart.min === 0 ? undefined : 0;
-		};
-
-		$scope.seriesChecked = function(metric, series) {
-			if(!metric) return false;
-			return $.inArray(series, metric.aggregations || []) !== -1;
-		};
-		$scope.seriesCheckClick = function(metric, series, chart) {
-			if(!metric || !chart) return;
-			if($scope.seriesChecked(metric, series)) {
-				common.array.remove(series, metric.aggregations);
-			} else {
-				metric.aggregations.push(series);
-			}
-			$scope.chartSeriesUpdate(chart);
-		};
-
-		$scope.chartSeriesUpdate = function(chart) {
-			chart._data = $.map(chart._oriData, function(groupData, i) {
-				var metric = chart.metrics[i];
-				return $.map(groupData, function(series) {
-					if($.inArray(series._key, metric.aggregations) !== -1) return series;
-				});
-			});
-		};
-
-		$scope.configAddMetric = function() {
-			$scope.metricForConfigChart = true;
-			$("#metricMDL").modal();
-		};
-
-		$scope.configRemoveMetric = function(metric) {
-			common.array.remove(metric, $scope.configPreviewChart.metrics);
-		};
-
-		$scope.getChartConfig = function(chart) {
-			if(!chart) return null;
-
-			var _config = chart._config = chart._config || $.extend({}, $scope.chartConfig);
-			_config.yMin = chart.min;
-
-			return _config;
-		};
-
-		$scope.configChart = function(chart) {
-			$scope.configTargetChart = chart;
-			$scope.configPreviewChart = $.extend({}, chart);
-			$scope.configPreviewChart.metrics = $.map(chart.metrics, function(metric) {
-				return $.extend({}, metric, {aggregations: (metric.aggregations || []).slice()});
-			});
-			delete $scope.configPreviewChart._config;
-			$("#chartMDL").modal();
-			setTimeout(function() {
-				$(window).resize();
-			}, 200);
-		};
-
-		$scope.confirmUpdateChart = function() {
-			$("#chartMDL").modal('hide');
-			$.extend($scope.configTargetChart, $scope.configPreviewChart);
-			$scope.chartSeriesUpdate($scope.configTargetChart);
-			if($scope.configTargetChart._holder) $scope.configTargetChart._holder.refreshAll();
-			$scope.configPreviewChart = null;
-		};
-
-		$scope.deleteChart = function(group, chart) {
-			UI.deleteConfirm(chart.metric).then(null, null, function(holder) {
-				common.array.remove(chart, group.charts);
-				holder.closeFunc();
-				$scope.refreshAllChart(false, true);
-			});
-		};
-
-		$scope.showChart = function(chart) {
-			$scope.viewChart = chart;
-			$("#chartViewMDL").modal();
-			setTimeout(function() {
-				$(window).resize();
-			}, 200);
-		};
-
-		$scope.refreshChart = function(chart, forceRefresh, refreshAll) {
-			var _intervals = $scope.startTime.toISOString() + "/" + $scope.endTime.toISOString();
-
-			function _refreshChart() {
-				if (chart._holder) {
-					if (refreshAll) {
-						chart._holder.refreshAll();
-					} else {
-						chart._holder.refresh();
-					}
-				}
-			}
-
-			var _tmpData, _metricPromiseList;
-
-			if (chart._data && !forceRefresh) {
-				// Refresh chart without reload
-				_refreshChart();
-			} else {
-				// Refresh chart with reload
-				_tmpData = [];
-				_metricPromiseList = $.map(chart.metrics, function (metric, k) {
-					// Each Metric
-					var _query = JSON.stringify({
-						"queryType": "groupBy",
-						"dataSource": metric.dataSource,
-						"granularity": $scope.autoRefreshSelect.timeDes,
-						"dimensions": ["metric"],
-						"filter": {"type": "selector", "dimension": "metric", "value": metric.metric},
-						"aggregations": [
-							{
-								"type": "max",
-								"name": "max",
-								"fieldName": "maxValue"
-							},
-							{
-								"type": "min",
-								"name": "min",
-								"fieldName": "maxValue"
-							},
-							{
-								"type": "count",
-								"name": "count",
-								"fieldName": "maxValue"
-							},
-							{
-								"type": "longSum",
-								"name": "sum",
-								"fieldName": "maxValue"
-							}
-						],
-						"postAggregations" : [
-							{
-								"type": "javascript",
-								"name": "avg",
-								"fieldNames": ["sum", "count"],
-								"function": "function(sum, cnt) { return sum / cnt;}"
-							}
-						],
-						"intervals": [_intervals]
-					});
-
-					return $http.post(_druidConfig.broker + "/druid/v2", _query, {withCredentials: false}).then(function (response) {
-						var _data = nvd3.convert.druid([response.data]);
-						_tmpData[k] = _data;
-
-						// Process series name
-						$.each(_data, function(i, series) {
-							series._key = series.key;
-							if(chart.metrics.length > 1) {
-								series.key = metric.metric.replace(/^.*\./, "") + "-" +series._key;
-							}
-						});
-					});
-				});
-
-				$q.all(_metricPromiseList).then(function() {
-					chart._oriData = _tmpData;
-					$scope.chartSeriesUpdate(chart);
-					_refreshChart();
-				});
-			}
-		};
-
-		$scope.refreshAllChart = function(forceRefresh, refreshAll) {
-			setTimeout(function() {
-				$scope.endTime = app.time.now();
-				$scope.startTime = $scope.autoRefreshSelect.getStartTime($scope.endTime);
-
-				$scope.refreshTimeDisplay();
-
-				$.each($scope.dashboard.groups, function (i, group) {
-					$.each(group.charts, function (j, chart) {
-						$scope.refreshChart(chart, forceRefresh, refreshAll);
-					});
-				});
-
-				$(window).resize();
-			}, 0);
-		};
-
-		$scope.chartSwitchRefresh = function(source, target) {
-			var _oriSize = source.size;
-			source.size = target.size;
-			target.size = _oriSize;
-
-			if(source._holder) source._holder.refreshAll();
-			if(target._holder) target._holder.refreshAll();
-
-		};
-
-		_refreshInterval = setInterval(function() {
-			if(!$scope.dashboardReady) return;
-			$scope.refreshAllChart(true);
-		}, 1000 * 30);
-
-		// > Chart UI
-		$scope.configChartSize = function(chart, sizeOffset) {
-			chart.size = (chart.size || 6) + sizeOffset;
-			if(chart.size <= 0) chart.size = 1;
-			if(chart.size > 12) chart.size = 12;
-			setTimeout(function() {
-				$(window).resize();
-			}, 1);
-		};
-
-		// ========================= UI =========================
-		$("#metricMDL").on('hidden.bs.modal', function () {
-			if($(".modal-backdrop").length) {
-				$("body").addClass("modal-open");
-			}
-		});
-
-		$("#chartViewMDL").on('hidden.bs.modal', function () {
-			$scope.viewChart = null;
-		});
-
-		// ====================== Clean Up ======================
-		$scope.$on('$destroy', function() {
-			clearInterval(_refreshInterval);
-		});
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/metrics/page/dashboard.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/metrics/page/dashboard.html b/eagle-webservice/src/main/webapp/_app/public/feature/metrics/page/dashboard.html
deleted file mode 100644
index 2acb954..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/metrics/page/dashboard.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<div class="page-fixed">
-	<div class="dropdown inline">
-		<button data-toggle="dropdown" class="btn btn-primary">
-			<span class="fa fa-clock-o"></span> {{autoRefreshSelect.title}}
-		</button>
-		<ul class="dropdown-menu left">
-			<li ng-repeat="item in autoRefreshList track by $index">
-				<a ng-click="setAuthRefresh(item)">
-					<span class="fa fa-clock-o"></span>
-					<span ng-class="{'text-bold': item === autoRefreshSelect}">{{item.title}}</span>
-				</a>
-			</li>
-		</ul>
-	</div>
-
-	<button class="btn btn-primary" ng-if="Auth.isRole('ROLE_ADMIN')"
-			ng-click="saveDashboard()" ng-disabled="lock">
-		<span class="fa fa-floppy-o"></span> Save
-	</button>
-</div>
-
-<div class="box box-default" ng-if="!dashboard.groups.length">
-	<div class="box-header with-border">
-		<h3 class="box-title">Empty Dashboard</h3>
-	</div>
-	<div class="box-body">
-		<div ng-show="!dashboardReady">
-			Loading...
-		</div>
-		<div ng-show="dashboardReady">
-			Current dashboard is empty.
-			<span ng-if="Auth.isRole('ROLE_ADMIN')">Click <a ng-click="newGroup()">here</a> to create a new group.</span>
-		</div>
-	</div>
-	<div class="overlay" ng-show="!dashboardReady">
-		<i class="fa fa-refresh fa-spin"></i>
-	</div>
-</div>
-
-<div tabs menu="menu" holder="tabHolder" ng-show="dashboard.groups.length" data-sortable-model="Auth.isRole('ROLE_ADMIN') ? dashboard.groups : null">
-	<pane ng-repeat="group in dashboard.groups" data-data="group" data-title="{{group.name}}">
-		<div uie-sortable ng-model="group.charts" class="row narrow" sortable-update-func="chartSwitchRefresh" ng-show="group.charts.length">
-			<div ng-repeat="chart in group.charts track by $index" class="col-md-{{chart.size || 6}}">
-				<div class="nvd3-chart-wrapper">
-					<div nvd3="chart._data" data-holder="chart._holder" data-title="{{chart.title || chart.metrics[0].metric}}" data-watching="false"
-						 data-chart="{{chart.chart || 'line'}}" data-config="getChartConfig(chart)" class="nvd3-chart-cntr"></div>
-					<div class="nvd3-chart-config">
-						<a class="fa fa-expand" ng-click="showChart(chart, -1)"></a>
-						<span ng-if="Auth.isRole('ROLE_ADMIN')">
-							<a class="fa fa-minus" ng-click="configChartSize(chart, -1)"></a>
-							<a class="fa fa-plus" ng-click="configChartSize(chart, 1)"></a>
-							<a class="fa fa-cog" ng-click="configChart(chart)"></a>
-							<a class="fa fa-trash" ng-click="deleteChart(group, chart)"></a>
-						</span>
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<p ng-if="!group.charts.length">
-			Empty group.
-			<span ng-if="Auth.isRole('ROLE_ADMIN')">
-				Click
-				<span ng-hide="dataSourceListReady" class="fa fa-refresh fa-spin"></span>
-				<a ng-show="dataSourceListReady" ng-click="newChart()">here</a>
-				to add metric.
-			</span>
-		</p>
-	</pane>
-</div>
-
-
-
-<!-- Modal: Chart configuration -->
-<div class="modal fade" id="chartMDL" tabindex="-1" role="dialog">
-	<div class="modal-dialog modal-lg" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true">&times;</span>
-				</button>
-				<h4 class="modal-title">Chart Configuration</h4>
-			</div>
-			<div class="modal-body">
-				<div class="row">
-					<div class="col-md-6">
-						<div class="nvd3-chart-wrapper">
-							<div nvd3="configPreviewChart._data" data-title="{{configPreviewChart.title || configPreviewChart.metrics[0].metric}}"
-								 data-watching="true" data-chart="{{configPreviewChart.chart || 'line'}}" data-config="getChartConfig(configPreviewChart)" class="nvd3-chart-cntr"></div>
-						</div>
-					</div>
-					<div class="col-md-6">
-						<!-- Chart Configuration -->
-						<table class="table">
-							<tbody>
-							<tr>
-								<th width="100">Name</th>
-								<td><input type="text" class="form-control input-xs" ng-model="configPreviewChart.title" placeholder="Default: {{configPreviewChart.metrics[0].metric}}" /></td>
-							</tr>
-							<tr>
-								<th>Chart Type</th>
-								<td>
-									<div class="btn-group" data-toggle="buttons">
-										<label class="btn btn-default btn-xs" ng-class="{active: (configPreviewChart.chart || 'line') === type.chart}"
-											   ng-repeat="type in chartTypeList track by $index" ng-click="configPreviewChart.chart = type.chart;">
-											<input type="radio" name="chartType" autocomplete="off"
-												   ng-checked="(configPreviewChart.chart || 'line') === type.chart">
-											<span class="fa fa-{{type.icon}}"></span>
-										</label>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<th>Minimum</th>
-								<td><input type="checkbox" ng-checked="configPreviewChart.min === 0" ng-disabled="configPreviewChart.chart === 'area' || configPreviewChart.chart === 'pie'"
-										   ng-click="configPreviewChartMinimumCheck()" /></td>
-							</tr>
-							<tr>
-								<th>Metrics</th>
-								<td>
-									<div ng-repeat="metric in configPreviewChart.metrics" class="box inner-box">
-										<div class="box-tools">
-											<button class="btn btn-box-tool" ng-click="configRemoveMetric(metric)">
-												<span class="fa fa-times"></span>
-											</button>
-										</div>
-
-										<h3 class="box-title">{{metric.metric}}</h3>
-										<div class="checkbox noMargin" ng-repeat="series in chartSeriesList track by $index">
-											<label>
-												<input type="checkbox" ng-checked="seriesChecked(metric, series.series)"
-													   ng-click="seriesCheckClick(metric, series.series, configPreviewChart)" />
-												{{series.name}}
-											</label>
-										</div>
-									</div>
-									<a ng-click="configAddMetric()">+ Add Metric</a>
-								</td>
-							</tr>
-							</tbody>
-						</table>
-					</div>
-				</div>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-default" data-dismiss="modal">
-					Close
-				</button>
-				<button type="button" class="btn btn-primary" ng-click="confirmUpdateChart()">
-					Confirm
-				</button>
-			</div>
-		</div>
-	</div>
-</div>
-
-
-
-<!-- Modal: Metric selector -->
-<div class="modal fade" id="metricMDL" tabindex="-1" role="dialog">
-	<div class="modal-dialog modal-lg" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true">&times;</span>
-				</button>
-				<h4 class="modal-title">Select Metric</h4>
-			</div>
-			<div class="modal-body">
-				<div class="input-group" style="margin-bottom: 10px;">
-					<input type="text" class="form-control" placeholder="Filter..." ng-model="_newMetricFilter" />
-					<span class="input-group-btn">
-						<button class="btn btn-default btn-flat" ng-click="_newMetricFilter = '';"><span class="fa fa-times"></span></button>
-					</span>
-				</div>
-
-				<div class="row">
-					<div class="col-md-4">
-						<ul class="nav nav-pills nav-stacked fixed-height">
-							<li class="disabled"><a>Data Source</a></li>
-							<li ng-repeat="dataSrc in dataSourceList track by $index" ng-class="{active: _newMetricDataSrc === dataSrc}">
-								<a ng-click="newMetricSelectDataSource(dataSrc)">{{dataSrc.dataSource}}</a>
-							</li>
-						</ul>
-					</div>
-					<div class="col-md-8">
-						<ul class="nav nav-pills nav-stacked fixed-height">
-							<li class="disabled"><a>Metric</a></li>
-							<li ng-repeat="metric in dataSourceMetricList(_newMetricDataSrc, _newMetricFilter) track by $index" ng-class="{active: _newMetricDataMetric === metric}">
-								<a ng-click="newMetricSelectMetric(metric)">{{metric}}</a>
-							</li>
-						</ul>
-					</div>
-				</div>
-			</div>
-			<div class="modal-footer">
-				<span class="text-primary pull-left">{{_newMetricDataSrc.dataSource}} <span class="fa fa-arrow-right"></span> {{_newMetricDataMetric}}</span>
-				<button type="button" class="btn btn-default" data-dismiss="modal">
-					Close
-				</button>
-				<button type="button" class="btn btn-primary" ng-click="confirmSelectMetric()">
-					Select
-				</button>
-			</div>
-		</div>
-	</div>
-</div>
-
-
-
-<!-- Modal: Chart View -->
-<div class="modal fade" id="chartViewMDL" tabindex="-1" role="dialog">
-	<div class="modal-dialog modal-lg" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true">&times;</span>
-				</button>
-				<h4 class="modal-title">{{viewChart.title || viewChart.metrics[0].metric}}</h4>
-			</div>
-			<div class="modal-body">
-				<div nvd3="viewChart._data" data-title="{{viewChart.title || viewChart.metrics[0].metric}}"
-					 data-watching="true" data-chart="{{viewChart.chart || 'line'}}" data-config="getChartConfig(viewChart)" class="nvd3-chart-cntr lg"></div>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-default" data-dismiss="modal">
-					Close
-				</button>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/topology/controller.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/topology/controller.js b/eagle-webservice/src/main/webapp/_app/public/feature/topology/controller.js
deleted file mode 100644
index 94886c9..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/topology/controller.js
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var featureControllers = angular.module('featureControllers');
-	var feature = featureControllers.register("topology", {
-		global: true	// Global Feature needn't add to applications
-	});
-
-	// ==============================================================
-	// =                       Initialization                       =
-	// ==============================================================
-
-	// ==============================================================
-	// =                          Function                          =
-	// ==============================================================
-	//feature.service("DashboardFormatter", function() {
-	//});
-
-	// ==============================================================
-	// =                         Controller                         =
-	// ==============================================================
-	feature.configNavItem("monitoring", "Topology", "usb");
-
-	// ========================= Monitoring =========================
-	feature.configController('monitoring', function(PageConfig, $scope, $interval, Entities, UI, Site, Application) {
-		var topologyRefreshInterval;
-
-		PageConfig.hideApplication = true;
-		PageConfig.hideSite = true;
-		PageConfig.pageTitle = "Topology Execution";
-
-		$scope.topologyExecutionList = null;
-
-		$scope.currentTopologyExecution = null;
-		$scope.currentTopologyExecutionOptList = [];
-
-		// ======================= Function =======================
-		function refreshExecutionList() {
-			var _list = Entities.queryEntities("TopologyExecutionService");
-			_list._promise.then(function () {
-				$scope.topologyExecutionList = _list;
-			});
-		}
-
-		$scope.showTopologyDetail = function (topologyExecution) {
-			$scope.currentTopologyExecution = topologyExecution;
-			$("#topologyMDL").modal();
-
-			$scope.currentTopologyExecutionOptList = Entities.queryEntities("TopologyOperationService", {
-				site: topologyExecution.tags.site,
-				application: topologyExecution.tags.application,
-				topology: topologyExecution.tags.topology,
-				_pageSize: 10,
-				_duration: 1000 * 60 * 60 * 24 * 30
-			});
-		};
-
-		$scope.getStatusClass = function (status) {
-			switch (status) {
-				case "NEW":
-					return "info";
-				case "STARTING":
-				case "STOPPING":
-					return "warning";
-				case "STARTED":
-					return "success";
-				case "STOPPED":
-					return "danger";
-				default:
-					return "default";
-			}
-		};
-
-		// ==================== Initialization ====================
-		refreshExecutionList();
-		topologyRefreshInterval = $interval(refreshExecutionList, 10 * 1000);
-
-		$scope.topologyList = Entities.queryEntities("TopologyDescriptionService");
-		$scope.topologyList._promise.then(function () {
-			$scope.topologyList = $.map($scope.topologyList, function (topology) {
-				return topology.tags.topology;
-			});
-		});
-
-		$scope.applicationList = $.map(Application.list, function (application) {
-			return application.tags.application;
-		});
-
-		$scope.siteList = $.map(Site.list, function (site) {
-			return site.tags.site;
-		});
-
-		// ================== Topology Execution ==================
-		$scope.newTopologyExecution = function () {
-			UI.createConfirm("Topology", {}, [
-				{field: "site", type: "select", valueList: $scope.siteList},
-				{field: "application", type: "select", valueList: $scope.applicationList},
-				{field: "topology", type: "select", valueList: $scope.topologyList}
-			], function (entity) {
-				for(var i = 0 ; i < $scope.topologyExecutionList.length; i += 1) {
-					var _entity = $scope.topologyExecutionList[i].tags;
-					if(_entity.site === entity.site && _entity.application === entity.application && _entity.topology === entity.topology) {
-						return "Topology already exist!";
-					}
-				}
-			}).then(null, null, function(holder) {
-				var _entity = {
-					tags: {
-						site: holder.entity.site,
-						application: holder.entity.application,
-						topology: holder.entity.topology
-					},
-					status: "NEW"
-				};
-				Entities.updateEntity("TopologyExecutionService", _entity)._promise.then(function() {
-					holder.closeFunc();
-					$scope.topologyExecutionList.push(_entity);
-					refreshExecutionList();
-				});
-			});
-		};
-
-		$scope.deleteTopologyExecution = function (topologyExecution) {
-			UI.deleteConfirm(topologyExecution.tags.topology).then(null, null, function(holder) {
-				Entities.deleteEntities("TopologyExecutionService", topologyExecution.tags)._promise.then(function() {
-					holder.closeFunc();
-					common.array.remove(topologyExecution, $scope.topologyExecutionList);
-				});
-			});
-		};
-
-		// ================== Topology Operation ==================
-		$scope.doTopologyOperation = function (topologyExecution, operation) {
-			$.dialog({
-				title: operation + " Confirm",
-				content: "Do you want to " + operation + " '" + topologyExecution.tags.topology + "'?",
-				confirm: true
-			}, function (ret) {
-				if(!ret) return;
-
-				var list = Entities.queryEntities("TopologyOperationService", {
-					site: topologyExecution.tags.site,
-					application: topologyExecution.tags.application,
-					topology: topologyExecution.tags.topology,
-					_pageSize: 20
-				});
-
-				list._promise.then(function () {
-					var lastOperation = common.array.find(operation, list, "tags.operation");
-					if(lastOperation && (lastOperation.status === "INITIALIZED" || lastOperation.status === "PENDING")) {
-						refreshExecutionList();
-						return;
-					}
-
-					Entities.updateEntity("rest/app/operation", {
-						tags: {
-							site: topologyExecution.tags.site,
-							application: topologyExecution.tags.application,
-							topology: topologyExecution.tags.topology,
-							operation: operation
-						},
-						status: "INITIALIZED"
-					}, {timestamp: false, hook: true});
-				});
-			});
-		};
-
-		$scope.startTopologyOperation = function (topologyExecution) {
-			$scope.doTopologyOperation(topologyExecution, "START");
-		};
-		$scope.stopTopologyOperation = function (topologyExecution) {
-			$scope.doTopologyOperation(topologyExecution, "STOP");
-		};
-
-		// ======================= Clean Up =======================
-		$scope.$on('$destroy', function() {
-			$interval.cancel(topologyRefreshInterval);
-		});
-	});
-
-	// ========================= Management =========================
-	feature.configController('management', function(PageConfig, $scope, Entities, UI) {
-		PageConfig.hideApplication = true;
-		PageConfig.hideSite = true;
-		PageConfig.pageTitle = "Topology";
-
-		var typeList = ["CLASS", "DYNAMIC"];
-		var topologyDefineAttrs = [
-			{field: "topology", name: "name"},
-			{field: "type", type: "select", valueList: typeList},
-			{field: "exeClass", name: "execution entry", description: function (entity) {
-				if(entity.type === "CLASS") return "Class implements interface TopologyExecutable";
-				if(entity.type === "DYNAMIC") return "DSL based topology definition";
-			}, type: "blob", rows: 5},
-			{field: "version", optional: true},
-			{field: "description", optional: true, type: "blob"}
-		];
-		var topologyUpdateAttrs = $.extend(topologyDefineAttrs.concat(), [{field: "topology", name: "name", readonly: true}]);
-
-		$scope.topologyList = Entities.queryEntities("TopologyDescriptionService");
-
-		$scope.newTopology = function () {
-			UI.createConfirm("Topology", {}, topologyDefineAttrs, function (entity) {
-				if(common.array.find(entity.topology, $scope.topologyList, "tags.topology", false, false)) {
-					return "Topology name conflict!";
-				}
-			}).then(null, null, function(holder) {
-				holder.entity.tags = {
-					topology: holder.entity.topology
-				};
-				Entities.updateEntity("TopologyDescriptionService", holder.entity, {timestamp: false})._promise.then(function() {
-					holder.closeFunc();
-					$scope.topologyList.push(holder.entity);
-				});
-			});
-		};
-
-		$scope.updateTopology = function (topology) {
-			UI.updateConfirm("Topology", $.extend({}, topology, {topology: topology.tags.topology}), topologyUpdateAttrs).then(null, null, function(holder) {
-				holder.entity.tags = {
-					topology: holder.entity.topology
-				};
-				Entities.updateEntity("TopologyDescriptionService", holder.entity, {timestamp: false})._promise.then(function() {
-					holder.closeFunc();
-					$.extend(topology, holder.entity);
-				});
-			});
-		};
-
-		$scope.deleteTopology = function (topology) {
-			UI.deleteConfirm(topology.tags.topology).then(null, null, function(holder) {
-				Entities.delete("TopologyDescriptionService", {topology: topology.tags.topology})._promise.then(function() {
-					holder.closeFunc();
-					common.array.remove(topology, $scope.topologyList);
-				});
-			});
-		};
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/topology/page/management.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/topology/page/management.html b/eagle-webservice/src/main/webapp/_app/public/feature/topology/page/management.html
deleted file mode 100644
index 9e22c84..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/topology/page/management.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class="box box-primary">
-	<div class="box-header with-border">
-		<i class="fa fa-cog"></i>
-		<a class="pull-right" href="#/config/topology/monitoring"><span class="fa fa-angle-right"></span> Monitoring</a>
-		<h3 class="box-title">
-			Management
-		</h3>
-	</div>
-	<div class="box-body">
-		<table class="table table-bordered">
-			<thead>
-				<tr>
-					<th>Name</th>
-					<th width="20%">Execution Class</th>
-					<th>Type</th>
-					<th width="50%">Description</th>
-					<th>Version</th>
-					<th width="70"></th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr ng-repeat="item in topologyList">
-					<td>{{item.tags.topology}}</td>
-					<td><pre class="noWrap">{{item.exeClass}}</pre></td>
-					<td>{{item.type}}</td>
-					<td>{{item.description}}</td>
-					<td>{{item.version}}</td>
-					<td class="text-center">
-						<button class="rm fa fa-pencil btn btn-default btn-xs" uib-tooltip="Edit" tooltip-animation="false" ng-click="updateTopology(item)"> </button>
-						<button class="rm fa fa-trash-o btn btn-danger btn-xs" uib-tooltip="Delete" tooltip-animation="false" ng-click="deleteTopology(item)"> </button>
-					</td>
-				</tr>
-				<tr ng-if="topologyList.length === 0">
-					<td colspan="6">
-						<span class="text-muted">Empty list</span>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-
-	<div class="box-footer">
-		<button class="btn btn-primary pull-right" ng-click="newTopology()">
-			New Topology
-			<i class="fa fa-plus-circle"> </i>
-		</button>
-	</div>
-
-	<div class="overlay" ng-hide="topologyList._promise.$$state.status === 1;">
-		<i class="fa fa-refresh fa-spin"></i>
-	</div>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/topology/page/monitoring.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/topology/page/monitoring.html b/eagle-webservice/src/main/webapp/_app/public/feature/topology/page/monitoring.html
deleted file mode 100644
index 0acb2c1..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/topology/page/monitoring.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<div class="box box-primary">
-	<div class="box-header with-border">
-		<i class="fa fa-eye"></i>
-		<a class="pull-right" href="#/config/topology/management"><span class="fa fa-angle-right"></span> Management</a>
-		<h3 class="box-title">
-			Monitoring
-		</h3>
-	</div>
-	<div class="box-body">
-		<div sorttable source="topologyExecutionList">
-			<table class="table table-bordered" ng-non-bindable>
-				<thead>
-				<tr>
-					<th width="70" sortpath="status">Status</th>
-					<th width="90" sortpath="tags.topology">Topology</th>
-					<th width="60" sortpath="tags.site">Site</th>
-					<th width="100" sortpath="tags.application">Application</th>
-					<th width="60" sortpath="mode">Mode</th>
-					<th sortpath="description">Description</th>
-					<th width="70" style="min-width: 70px;"></th>
-				</tr>
-				</thead>
-				<tbody>
-				<tr>
-					<td class="text-center">
-						<span class="label label-{{_parent.getStatusClass(item.status)}}">{{item.status}}</span>
-					</td>
-					<td><a ng-click="_parent.showTopologyDetail(item)">{{item.tags.topology}}</a></td>
-					<td>{{item.tags.site}}</td>
-					<td>{{item.tags.application}}</td>
-					<td>{{item.mode}}</td>
-					<td>{{item.description}}</td>
-					<td class="text-center">
-						<button ng-if="item.status === 'NEW' || item.status === 'STOPPED'" class="fa fa-play sm btn btn-default btn-xs" uib-tooltip="Start" tooltip-animation="false" ng-click="_parent.startTopologyOperation(item)"> </button>
-						<button ng-if="item.status === 'STARTED'" class="fa fa-stop sm btn btn-default btn-xs" uib-tooltip="Stop" tooltip-animation="false" ng-click="_parent.stopTopologyOperation(item)"> </button>
-						<button ng-if="item.status !== 'NEW' && item.status !== 'STARTED' && item.status !== 'STOPPED'" class="fa fa-ban sm btn btn-default btn-xs" disabled="disabled"> </button>
-						<button class="rm fa fa-trash-o btn btn-danger btn-xs" uib-tooltip="Delete" tooltip-animation="false" ng-click="_parent.deleteTopologyExecution(item)"> </button>
-					</td>
-				</tr>
-				</tbody>
-			</table>
-		</div>
-	</div>
-
-	<div class="box-footer">
-		<button class="btn btn-primary pull-right" ng-click="newTopologyExecution()">
-			New Topology Execution
-			<i class="fa fa-plus-circle"> </i>
-		</button>
-	</div>
-
-	<div class="overlay" ng-hide="topologyExecutionList._promise.$$state.status === 1;">
-		<i class="fa fa-refresh fa-spin"></i>
-	</div>
-</div>
-
-
-
-
-<!-- Modal: Topology Detail -->
-<div class="modal fade" id="topologyMDL" tabindex="-1" role="dialog">
-	<div class="modal-dialog modal-lg" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true">&times;</span>
-				</button>
-				<h4 class="modal-title">Topology Detail</h4>
-			</div>
-			<div class="modal-body">
-				<h3>Detail</h3>
-				<table class="table">
-					<tbody>
-						<tr>
-							<th>Site</th>
-							<td>{{currentTopologyExecution.tags.site}}</td>
-						</tr>
-						<tr>
-							<th>Application</th>
-							<td>{{currentTopologyExecution.tags.application}}</td>
-						</tr>
-						<tr>
-							<th>Topology</th>
-							<td>{{currentTopologyExecution.tags.topology}}</td>
-						</tr>
-						<tr>
-							<th>Full Name</th>
-							<td>{{currentTopologyExecution.fullName || "-"}}</td>
-						</tr>
-						<tr>
-							<th>Status</th>
-							<td>
-								<span class="label label-{{getStatusClass(currentTopologyExecution.status)}}">{{currentTopologyExecution.status}}</span>
-							</td>
-						</tr>
-						<tr>
-							<th>Mode</th>
-							<td>{{currentTopologyExecution.mode || "-"}}</td>
-						</tr>
-						<tr>
-							<th>Environment</th>
-							<td>{{currentTopologyExecution.environment || "-"}}</td>
-						</tr>
-						<tr>
-							<th>Url</th>
-							<td>
-								<a ng-if="currentTopologyExecution.url" href="{{currentTopologyExecution.url}}" target="_blank">{{currentTopologyExecution.url}}</a>
-								<span ng-if="!currentTopologyExecution.url">-</span>
-							</td>
-						</tr>
-						<tr>
-							<th>Description</th>
-							<td>{{currentTopologyExecution.description || "-"}}</td>
-						</tr>
-						<tr>
-							<th>Last Modified Date</th>
-							<td>{{common.format.date(currentTopologyExecution.lastModifiedDate) || "-"}}</td>
-						</tr>
-					</tbody>
-				</table>
-
-				<h3>Latest Operations</h3>
-				<div class="table-responsive">
-					<table class="table table-bordered table-sm margin-bottom-none">
-						<thead>
-							<tr>
-								<th>Date Time</th>
-								<th>Operation</th>
-								<th>Status</th>
-								<th>Message</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr ng-repeat="action in currentTopologyExecutionOptList track by $index">
-								<td>{{common.format.date(action.lastModifiedDate) || "-"}}</td>
-								<td>{{action.tags.operation}}</td>
-								<td>{{action.status}}</td>
-								<td><pre class="noWrap">{{action.message}}</pre></td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-default" data-dismiss="modal">
-					Close
-				</button>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/controller.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/controller.js b/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/controller.js
deleted file mode 100644
index ed619d3..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/controller.js
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var featureControllers = angular.module('featureControllers');
-	var feature = featureControllers.register("userProfile");
-
-	// ==============================================================
-	// =                          Function                          =
-	// ==============================================================
-
-	// ==============================================================
-	// =                        User Profile                        =
-	// ==============================================================
-
-	// ======================== Profile List ========================
-	//feature.navItem("list", "User Profiles", "graduation-cap");
-	feature.controller('list', function(PageConfig, Site, $scope, $interval, Entities) {
-		PageConfig.pageSubTitle = Site.current().tags.site;
-
-		$scope.common = common;
-		$scope.algorithms = [];
-
-		// ======================================== Algorithms ========================================
-		$scope.algorithmEntity = {};
-		Entities.queryEntities("AlertDefinitionService", {site: Site.current().tags.site, application: "userProfile"})._promise.then(function(data) {
-			$scope.algorithmEntity = common.getValueByPath(data, "obj[0]");
-			$scope.algorithmEntity.policy = common.parseJSON($scope.algorithmEntity.policyDef);
-		});
-
-		// ======================================= User profile =======================================
-		$scope.profileList = Entities.queryEntities("MLModelService", {site: Site.current().tags.site}, ["user", "algorithm", "content", "version"]);
-		$scope.profileList._promise.then(function() {
-			var _algorithms = {};
-			var _users = {};
-
-			// Map user
-			$.each($scope.profileList, function(i, unit) {
-				_algorithms[unit.tags.algorithm] = unit.tags.algorithm;
-				var _user = _users[unit.tags.user] = _users[unit.tags.user] || {user: unit.tags.user};
-				_user[unit.tags.algorithm] = {
-					version: unit.version
-				};
-
-				// DE
-				if(unit.tags.algorithm === "DE") {
-					var _statistics = common.parseJSON(unit.content);
-					_statistics = common.getValueByPath(_statistics, "statistics", []);
-					_user[unit.tags.algorithm].topCommands = $.map(common.array.top(_statistics, "mean"), function(command) {
-						return command.commandName;
-					});
-				}
-			});
-
-			// Map algorithms
-			$scope.algorithms = $.map(_algorithms, function(algorithm) {
-				return algorithm;
-			}).sort();
-
-			$scope.profileList.splice(0);
-			$scope.profileList.push.apply($scope.profileList, common.map.toArray(_users));
-		});
-
-		// =========================================== Task ===========================================
-		$scope.tasks = [];
-		function _loadTasks() {
-			var _tasks = Entities.queryEntities("ScheduleTaskService", {
-				site: Site.current().tags.site,
-				_pageSize: 100,
-				_duration: 1000 * 60 * 60 * 24 * 14,
-				__ETD: 1000 * 60 * 60 * 24
-			});
-			_tasks._promise.then(function() {
-				$scope.tasks.splice(0);
-				$scope.tasks.push.apply($scope.tasks, _tasks);
-
-				// Duration
-				$.each($scope.tasks, function(i, data) {
-					if(data.timestamp && data.updateTime) {
-						var _ms = (new moment(data.updateTime)).diff(new moment(data.timestamp));
-						var _d = moment.duration(_ms);
-						data._duration = Math.floor(_d.asHours()) + moment.utc(_ms).format(":mm:ss");
-						data.duration = _ms;
-					} else {
-						data._duration = "--";
-					}
-				});
-			});
-		}
-
-		$scope.runningTaskCount = function () {
-			return common.array.count($scope.tasks, "INITIALIZED", "status") +
-				common.array.count($scope.tasks, "PENDING", "status") +
-				common.array.count($scope.tasks, "EXECUTING", "status");
-		};
-
-		// Create task
-		$scope.updateTask = function() {
-			$.dialog({
-				title: "Confirm",
-				content: "Do you want to update now?",
-				confirm: true
-			}, function(ret) {
-				if(!ret) return;
-
-				var _entity = {
-					status: "INITIALIZED",
-					detail: "Newly created command",
-					tags: {
-						site: Site.current().tags.site,
-						type: "USER_PROFILE_TRAINING"
-					},
-					timestamp: +new Date()
-				};
-				Entities.updateEntity("ScheduleTaskService", _entity, {timestamp: false})._promise.success(function(data) {
-					if(!Entities.dialog(data)) {
-						_loadTasks();
-					}
-				});
-			});
-		};
-
-		// Show detail
-		$scope.showTaskDetail = function(task) {
-			var _content = $("<pre>").text(task.detail);
-
-			var $mdl = $.dialog({
-				title: "Detail",
-				content: _content
-			});
-
-			_content.click(function(e) {
-				if(!e.ctrlKey) return;
-
-				$.dialog({
-					title: "Confirm",
-					content: "Remove this task?",
-					confirm: true
-				}, function(ret) {
-					if(!ret) return;
-
-					$mdl.modal('hide');
-					Entities.deleteEntity("ScheduleTaskService", task)._promise.then(function() {
-						_loadTasks();
-					});
-				});
-			});
-		};
-
-		_loadTasks();
-		var _loadInterval = $interval(_loadTasks, app.time.refreshInterval);
-		$scope.$on('$destroy',function(){
-			$interval.cancel(_loadInterval);
-		});
-	});
-
-	// ======================= Profile Detail =======================
-	feature.controller('detail', function(PageConfig, Site, $scope, $wrapState, Entities) {
-		PageConfig.pageTitle = "User Profile";
-		PageConfig.pageSubTitle = Site.current().tags.site;
-		PageConfig
-			.addNavPath("User Profile", "/userProfile/list")
-			.addNavPath("Detail");
-
-		$scope.user = $wrapState.param.filter;
-
-		// User profile
-		$scope.profiles = {};
-		$scope.profileList = Entities.queryEntities("MLModelService", {site: Site.current().tags.site, user: $scope.user});
-		$scope.profileList._promise.then(function() {
-			$.each($scope.profileList, function(i, unit) {
-				unit._content = common.parseJSON(unit.content);
-				$scope.profiles[unit.tags.algorithm] = unit;
-			});
-
-			// DE
-			if($scope.profiles.DE) {
-				console.log($scope.profiles.DE);
-
-				$scope.profiles.DE._chart = {};
-
-				$scope.profiles.DE.estimates = {};
-				$.each($scope.profiles.DE._content, function(key, value) {
-					if(key !== "statistics") {
-						$scope.profiles.DE.estimates[key] = value;
-					}
-				});
-
-				var _meanList = [];
-				var _stddevList = [];
-
-				$.each($scope.profiles.DE._content.statistics, function(i, unit) {
-					_meanList[i] = {
-						x: unit.commandName,
-						y: unit.mean
-					};
-					_stddevList[i] = {
-						x: unit.commandName,
-						y: unit.stddev
-					};
-				});
-				$scope.profiles.DE._chart.series = [
-					{
-						key: "mean",
-						values: _meanList
-					},
-					{
-						key: "stddev",
-						values: _stddevList
-					}
-				];
-
-				// Percentage table list
-				$scope.profiles.DE.meanList = [];
-				var _total = common.array.sum($scope.profiles.DE._content.statistics, "mean");
-				$.each($scope.profiles.DE._content.statistics, function(i, unit) {
-					$scope.profiles.DE.meanList.push({
-						command: unit.commandName,
-						percentage: unit.mean / _total
-					});
-				});
-			}
-
-			// EigenDecomposition
-			if($scope.profiles.EigenDecomposition && $scope.profiles.EigenDecomposition._content.principalComponents) {
-				$scope.profiles.EigenDecomposition._chart = {
-					series: [],
-				};
-
-				$.each($scope.profiles.EigenDecomposition._content.principalComponents, function(z, grp) {
-					var _line = [];
-					$.each(grp, function(x, y) {
-						_line.push([x,y,z]);
-					});
-
-					$scope.profiles.EigenDecomposition._chart.series.push({
-						data: _line
-					});
-				});
-			}
-		});
-
-		// UI
-		$scope.showRawData = function(content) {
-			$.dialog({
-				title: "Raw Data",
-				content: $("<pre>").text(content)
-			});
-		};
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/page/detail.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/page/detail.html b/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/page/detail.html
deleted file mode 100644
index 0f94e03..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/page/detail.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<div class="box box-primary">
-	<div class="box-header with-border">
-		<i class="fa fa-user"> </i>
-		<h3 class="box-title">
-			{{user}}
-		</h3>
-	</div>
-	<div class="box-body">
-		<div>
-			<div class="inline-group">
-				<dl><dt>User</dt><dd>{{user}}</dd></dl>
-				<dl><dt>Site</dt><dd>{{Site.current().tags.site}}</dd></dl>
-			</div>
-			<div class="inline-group">
-				<dl><dt>Other Info</dt><dd class="text-muted">N/A</dd></dl>
-			</div>
-		</div>
-
-		<div class="overlay" ng-hide="profileList._promise.$$state.status === 1;">
-			<span class="fa fa-refresh fa-spin"></span>
-		</div>
-	</div>
-</div>
-
-<!-- Analysis -->
-<div class="nav-tabs-custom">
-	<ul class="nav nav-tabs">
-		<li class="active">
-			<a href="[data-id='DE']" data-toggle="tab" ng-click=" currentTab='DE'">DE</a>
-		</li>
-		<li>
-			<a href="[data-id='EigenDecomposition']" data-toggle="tab" ng-click=" currentTab='EigenDecomposition'">EigenDecomposition</a>
-		</li>
-		<li class="pull-right">
-			<button class="btn btn-primary" ng-click="showRawData(currentTab === 'EigenDecomposition' ? profiles.EigenDecomposition.content : profiles.DE.content)">Raw Data</button>
-		</li>
-	</ul>
-	<div class="tab-content">
-		<div class="tab-pane active" data-id="DE">
-			<div class="row">
-				<div class="col-md-9">
-					<div nvd3="profiles.DE._chart.series" data-config="{chart: 'column', xType: 'text', height: 400}" class="nvd3-chart-cntr" height="400"></div>
-					<div class="inline-group text-center">
-						<dl ng-repeat="(key, value) in profiles.DE.estimates"><dt>{{key}}</dt><dd>{{value}}</dd></dl>
-					</div>
-				</div>
-
-				<div class="col-md-3">
-					<table class="table table-bordered">
-						<thead>
-							<tr>
-								<th>Command</th>
-								<th>Percentage</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr ng-repeat="unit in profiles.DE.meanList">
-								<td>{{unit.command}}</td>
-								<td class="text-right">{{(unit.percentage*100).toFixed(2)}}%</td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-			</div>
-		</div><!-- /.tab-pane -->
-		<div class="tab-pane" data-id="EigenDecomposition">
-			<div line3d-chart height="400" data="profiles.EigenDecomposition._chart.series"> </div>
-		</div><!-- /.tab-pane -->
-	</div><!-- /.tab-content -->
-</div>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/page/list.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/page/list.html b/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/page/list.html
deleted file mode 100644
index 2f14479..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/userProfile/page/list.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<div class="box box-primary">
-	<div class="box-header with-border">
-		<i class="fa fa-list-alt"> </i>
-		<h3 class="box-title">
-			User Profiles
-			<small><a data-toggle="collapse" href="[data-id='algorithms']">Detail</a></small>
-		</h3>
-		<div class="pull-right">
-			<a class="label label-primary" ng-class="runningTaskCount() ? 'label-primary' : 'label-default'" data-toggle="modal" data-target="#taskMDL">Update</a>
-		</div>
-	</div>
-	<div class="box-body">
-		<!-- Algorithms -->
-		<div data-id="algorithms" class="collapse">
-			<table class="table table-bordered">
-				<thead>
-					<tr>
-						<th>Name</th>
-						<td>Feature</td>
-					</tr>
-				</thead>
-				<tbody>
-					<tr ng-repeat="algorithm in algorithmEntity.policy.algorithms">
-						<td>{{algorithm.name}}</td>
-						<td>{{algorithm.features}}</td>
-					</tr>
-				</tbody>
-			</table>
-			<hr/>
-		</div>
-
-		<!-- User Profile List -->
-		<p ng-show="profileList._promise.$$state.status !== 1">
-			<span class="fa fa-refresh fa-spin"> </span>
-			Loading...
-		</p>
-
-		<div sorttable source="profileList" ng-show="profileList._promise.$$state.status === 1">
-			<table class="table table-bordered" ng-non-bindable>
-				<thead>
-					<tr>
-						<th width="10%" sortpath="user">User</th>
-						<th>Most Predominat Feature</th>
-						<th width="10"></th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>
-							<a href="#/userProfile/detail/{{item.user}}">{{item.user}}</a>
-						</td>
-						<td>
-							{{item.DE.topCommands.slice(0,3).join(", ")}}
-						</td>
-						<td>
-							<a href="#/userProfile/detail/{{item.user}}">Detail</a>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<!-- Modal: User profile Schedule Task -->
-<div class="modal fade" id="taskMDL" tabindex="-1" role="dialog">
-	<div class="modal-dialog modal-lg" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true">&times;</span>
-				</button>
-				<h4 class="modal-title">Training History</h4>
-			</div>
-			<div class="modal-body">
-				<div sorttable source="tasks">
-					<table class="table table-bordered" ng-non-bindable>
-						<thead>
-							<tr>
-								<th sortpath="tags.type">Command</th>
-								<th sortpath="timestamp">Start Time</th>
-								<th sortpath="updateTime">Update Time</th>
-								<th sortpath="duration">Duration</th>
-								<th sortpath="status">Status</th>
-								<th width="10"> </th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr>
-								<td>{{item.tags.type}}</td>
-								<td>{{common.format.date(item.timestamp) || "--"}}</td>
-								<td>{{common.format.date(item.updateTime) || "--"}}</td>
-								<td>{{item._duration}}</td>
-								<td class="text-nowrap">
-									<span class="fa fa-hourglass-start text-muted" ng-show="item.status === 'INITIALIZED'"></span>
-									<span class="fa fa-hourglass-half text-info" ng-show="item.status === 'PENDING'"></span>
-									<span class="fa fa-circle-o-notch text-primary" ng-show="item.status === 'EXECUTING'"></span>
-									<span class="fa fa-check-circle text-success" ng-show="item.status === 'SUCCEEDED'"></span>
-									<span class="fa fa-exclamation-circle text-danger" ng-show="item.status === 'FAILED'"></span>
-									<span class="fa fa-ban text-muted" ng-show="item.status === 'CANCELED'"></span>
-									{{item.status}}
-								</td>
-								<td>
-									<a ng-click="_parent.showTaskDetail(item)">Detail</a>
-								</td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-primary pull-left" ng-click="updateTask()" ng-show="Auth.isRole('ROLE_ADMIN')">
-					Update Now
-				</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">
-					Close
-				</button>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/images/favicon.png
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/images/favicon.png b/eagle-webservice/src/main/webapp/_app/public/images/favicon.png
deleted file mode 100644
index 3bede2a..0000000
Binary files a/eagle-webservice/src/main/webapp/_app/public/images/favicon.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/images/favicon_white.png
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/images/favicon_white.png b/eagle-webservice/src/main/webapp/_app/public/images/favicon_white.png
deleted file mode 100644
index 9879e92..0000000
Binary files a/eagle-webservice/src/main/webapp/_app/public/images/favicon_white.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/app.config.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/app.config.js b/eagle-webservice/src/main/webapp/_app/public/js/app.config.js
deleted file mode 100644
index d7c4be9..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/app.config.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	app.config = {
-		// ============================================================================
-		// =                                   URLs                                   =
-		// ============================================================================
-		urls: {
-			HOST: '..',
-
-			updateEntity: 'rest/entities?serviceName=${serviceName}',
-			queryEntity: 'rest/entities/rowkey?serviceName=${serviceName}&value=${encodedRowkey}',
-			queryEntities: 'rest/entities?query=${serviceName}[${condition}]{${values}}&pageSize=100000',
-			deleteEntity: 'rest/entities/delete?serviceName=${serviceName}&byId=true',
-			deleteEntities: 'rest/entities?query=${serviceName}[${condition}]{*}&pageSize=100000',
-
-			queryGroup: 'rest/entities?query=${serviceName}[${condition}]<${groupBy}>{${values}}&pageSize=100000',
-			querySeries: 'rest/entities?query=${serviceName}[${condition}]<${groupBy}>{${values}}&pageSize=100000&timeSeries=true&intervalmin=${intervalmin}',
-
-			query: 'rest/',
-
-			userProfile: 'rest/authentication',
-			logout: 'logout',
-
-			maprNameResolver: '../rest/maprNameResolver',
-
-			DELETE_HOOK: {
-				FeatureDescService: 'rest/module/feature?feature=${feature}',
-				ApplicationDescService: 'rest/module/application?application=${application}',
-				SiteDescService: 'rest/module/site?site=${site}',
-				TopologyDescriptionService: 'rest/app/topology?topology=${topology}'
-			},
-			UPDATE_HOOK: {
-				SiteDescService: 'rest/module/siteApplication'
-			}
-		},
-	};
-
-	// ============================================================================
-	// =                                   URLs                                   =
-	// ============================================================================
-	app.getURL = function(name, kvs) {
-		var _path = app.config.urls[name];
-		if(!_path) throw "URL:'" + name + "' not exist!";
-		var _url = app.packageURL(_path);
-		if(kvs !== undefined) {
-			_url = common.template(_url, kvs);
-		}
-		return _url;
-	};
-
-	app.getMapRNameResolverURL = function(name,value, site) {
-		var key = "maprNameResolver";
-		var _path = app.config.urls[key];
-		if(!_path) throw "URL:'" + name + "' not exist!";
-		var _url = _path;
-		if(name == "fNameResolver") {
-			_url +=  "/" + name + "?fName=" + value + "&site=" + site;
-		} else if(name == "sNameResolver") {
-			_url +=  "/" + name + "?sName=" + value + "&site=" + site;
-		} else if (name == "vNameResolver") {
-			_url += "/" + name + "?vName=" + value + "&site=" + site;
-		} else{
-			throw "resolver:'" + name + "' not exist!";
-		}
-		return _url;
-	};
-
-	function getHookURL(hookType, serviceName) {
-		var _path = app.config.urls[hookType][serviceName];
-		if(!_path) return null;
-
-		return app.packageURL(_path);
-	}
-
-	/***
-	 * Eagle support delete function to process special entity delete. Which will delete all the relative entity.
-	 * @param serviceName
-	 */
-	app.getDeleteURL = function(serviceName) {
-		return getHookURL('DELETE_HOOK', serviceName);
-	};
-
-	/***
-	 * Eagle support update function to process special entity update. Which will update all the relative entity.
-	 * @param serviceName
-	 */
-	app.getUpdateURL = function(serviceName) {
-		return getHookURL('UPDATE_HOOK', serviceName);
-	};
-
-	app.packageURL = function (path) {
-		var _host = localStorage.getItem("HOST") || app.config.urls.HOST;
-		return (_host ? _host + "/" : '') + path;
-	};
-
-	app._Host = function(host) {
-		if(host) {
-			localStorage.setItem("HOST", host);
-			return app;
-		}
-		return localStorage.getItem("HOST");
-	};
-	app._Host.clear = function() {
-		localStorage.removeItem("HOST");
-	};
-	app._Host.sample = "http://localhost:9099/eagle-service";
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/app.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/app.js b/eagle-webservice/src/main/webapp/_app/public/js/app.js
deleted file mode 100644
index 70b4afe..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/app.js
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var app = {};
-
-(function() {
-	'use strict';
-
-	/* App Module */
-	var eagleApp = angular.module('eagleApp', ['ngRoute', 'ngAnimate', 'ui.router', 'eagleControllers', 'featureControllers', 'eagle.service']);
-
-	// GRUNT REPLACEMENT: eagleApp.buildTimestamp = TIMESTAMP
-	eagleApp._TRS = function() {
-		return eagleApp.buildTimestamp || Math.random();
-	};
-
-	// ======================================================================================
-	// =                                   Feature Module                                   =
-	// ======================================================================================
-	var FN_ARGS = /^[^\(]*\(\s*([^\)]*)\)/m;
-	var FN_ARG_SPLIT = /,/;
-	var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
-	var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
-
-	var featureControllers = angular.module('featureControllers', ['ui.bootstrap', 'eagle.components']);
-	var featureControllerCustomizeHtmlTemplate = {};
-	var featureControllerProvider;
-	var featureProvider;
-
-	featureControllers.config(function ($controllerProvider, $provide) {
-		featureControllerProvider = $controllerProvider;
-		featureProvider = $provide;
-	});
-
-	featureControllers.service("Feature", function($wrapState, PageConfig, ConfigPageConfig, FeaturePageConfig) {
-		var _features = {};
-		var _services = {};
-
-		var Feature = function(name, config) {
-			this.name = name;
-			this.config = config || {};
-			this.features = {};
-		};
-
-		/***
-		 * Inner function. Replace the dependency of constructor.
-		 * @param constructor
-		 * @private
-		 */
-		Feature.prototype._replaceDependencies = function(constructor) {
-			var i, srvName;
-			var _constructor, _$inject;
-			var fnText, argDecl;
-
-			if($.isArray(constructor)) {
-				_constructor = constructor[constructor.length - 1];
-				_$inject = constructor.slice(0, -1);
-			} else if(constructor.$inject) {
-				_constructor = constructor;
-				_$inject = constructor.$inject;
-			} else {
-				_$inject = [];
-				_constructor = constructor;
-				fnText = constructor.toString().replace(STRIP_COMMENTS, '');
-				argDecl = fnText.match(FN_ARGS);
-				$.each(argDecl[1].split(FN_ARG_SPLIT), function(i, arg) {
-					arg.replace(FN_ARG, function(all, underscore, name) {
-						_$inject.push(name);
-					});
-				});
-			}
-			_constructor.$inject = _$inject;
-
-			for(i = 0 ; i < _$inject.length ; i += 1) {
-				srvName = _$inject[i];
-				_$inject[i] = this.features[srvName] || _$inject[i];
-			}
-
-			return _constructor;
-		};
-
-		/***
-		 * Register a common service for feature usage. Common service will share between the feature. If you are coding customize feature, use 'Feature.service' is the better way.
-		 * @param name
-		 * @param constructor
-		 */
-		Feature.prototype.commonService = function(name, constructor) {
-			if(!_services[name]) {
-				featureProvider.service(name, constructor);
-				_services[name] = this.name;
-			} else {
-				throw "Service '" + name + "' has already be registered by feature '" + _services[name] + "'";
-			}
-		};
-
-		/***
-		 * Register a service for feature usage.
-		 * @param name
-		 * @param constructor
-		 */
-		Feature.prototype.service = function(name, constructor) {
-			var _serviceName;
-			if(!this.features[name]) {
-				_serviceName = "__FEATURE_" + this.name + "_" + name;
-				featureProvider.service(_serviceName, this._replaceDependencies(constructor));
-				this.features[name] = _serviceName;
-			} else {
-				console.warn("Service '" + name + "' has already be registered.");
-			}
-		};
-
-		/***
-		 * Create an navigation item in left navigation bar
-		 * @param path
-		 * @param title
-		 * @param icon use Font Awesome. Needn't with 'fa fa-'.
-		 */
-		Feature.prototype.navItem = function(path, title, icon) {
-			title = title || path;
-			icon = icon || "question";
-
-			FeaturePageConfig.addNavItem(this.name, {
-				icon: icon,
-				title: title,
-				url: "#/" + this.name + "/" + path
-			});
-		};
-
-		/***
-		 * Register a controller.
-		 * @param name
-		 * @param constructor
-		 */
-		Feature.prototype.controller = function(name, constructor, htmlTemplatePath) {
-			var _name = this.name + "_" + name;
-
-			// Replace feature registered service
-			constructor = this._replaceDependencies(constructor);
-
-			// Register controller
-			featureControllerProvider.register(_name, constructor);
-			if(htmlTemplatePath) {
-				featureControllerCustomizeHtmlTemplate[_name] = htmlTemplatePath;
-			}
-
-			return _name;
-		};
-
-		/***
-		 * Register a configuration controller for admin usage.
-		 * @param name
-		 * @param constructor
-		 */
-		Feature.prototype.configController = function(name, constructor, htmlTemplatePath) {
-			var _name = "config_" + this.name + "_" + name;
-
-			// Replace feature registered service
-			constructor = this._replaceDependencies(constructor);
-
-			// Register controller
-			featureControllerProvider.register(_name, constructor);
-			if(htmlTemplatePath) {
-				featureControllerCustomizeHtmlTemplate[_name] = htmlTemplatePath;
-			}
-
-			return _name;
-		};
-
-		/***
-		 * Create an navigation item in left navigation bar for admin configuraion page
-		 * @param path
-		 * @param title
-		 * @param icon use Font Awesome. Needn't with 'fa fa-'.
-		 */
-		Feature.prototype.configNavItem = function(path, title, icon) {
-			title = title || path;
-			icon = icon || "question";
-
-			ConfigPageConfig.addNavItem(this.name, {
-				icon: icon,
-				title: title,
-				url: "#/config/" + this.name + "/" + path
-			});
-		};
-
-		// Register
-		featureControllers.register = Feature.register = function(featureName, config) {
-			_features[featureName] = _features[featureName] || new Feature(featureName, config);
-			return _features[featureName];
-		};
-
-		// Page go
-		Feature.go = function(feature, page, filter) {
-			if(!filter) {
-				$wrapState.go("page", {
-					feature: feature,
-					page: page
-				}, 2);
-			} else {
-				$wrapState.go("pageFilter", {
-					feature: feature,
-					page: page,
-					filter: filter
-				}, 2);
-			}
-		};
-
-		// Get feature by name
-		Feature.get = function (featureName) {
-			return _features[featureName];
-		};
-
-		return Feature;
-	});
-
-	// ======================================================================================
-	// =                                   Router config                                    =
-	// ======================================================================================
-	eagleApp.config(function ($stateProvider, $urlRouterProvider, $animateProvider) {
-		// Resolve
-		function _resolve(config) {
-			config = config || {};
-
-			var resolve = {
-				Site: function (Site) {
-					return Site._promise();
-				},
-				Authorization: function (Authorization) {
-					if(!config.roleType) {
-						return Authorization._promise();
-					} else {
-						return Authorization.rolePromise(config.roleType);
-					}
-				},
-				Application: function (Application) {
-					return Application._promise();
-				}
-			};
-
-			if(config.featureCheck) {
-				resolve._navigationCheck = function($q, $wrapState, Site, Application) {
-					var _deferred = $q.defer();
-
-					$q.all(Site._promise(), Application._promise()).then(function() {
-						var _match, i, tmpApp;
-						var _site = Site.current();
-						var _app = Application.current();
-
-						// Check application
-						if(_site && (
-							!_app ||
-							!_site.applicationList.set[_app.tags.application] ||
-							!_site.applicationList.set[_app.tags.application].enabled
-							)
-						) {
-							_match = false;
-
-							for(i = 0 ; i < _site.applicationGroupList.length ; i += 1) {
-								tmpApp = _site.applicationGroupList[i].enabledList[0];
-								if(tmpApp) {
-									_app = Application.current(tmpApp);
-									_match = true;
-									break;
-								}
-							}
-
-							if(!_match) {
-								_app = null;
-								Application.current(null);
-							}
-						}
-					}).finally(function() {
-						_deferred.resolve();
-					});
-
-					return _deferred.promise;
-				};
-			}
-
-			return resolve;
-		}
-
-		// Router
-		var _featureBase = {
-			templateUrl: function ($stateParams) {
-				var _htmlTemplate = featureControllerCustomizeHtmlTemplate[$stateParams.feature + "_" + $stateParams.page];
-				return  "public/feature/" + $stateParams.feature + "/page/" + (_htmlTemplate ||  $stateParams.page) + ".html?_=" + eagleApp._TRS();
-			},
-			controllerProvider: function ($stateParams) {
-				return $stateParams.feature + "_" + $stateParams.page;
-			},
-			resolve: _resolve({featureCheck: true}),
-			pageConfig: "FeaturePageConfig"
-		};
-
-		$urlRouterProvider.otherwise("/landing");
-		$stateProvider
-			// =================== Landing ===================
-			.state('landing', {
-				url: "/landing",
-				templateUrl: "partials/landing.html?_=" + eagleApp._TRS(),
-				controller: "landingCtrl",
-				resolve: _resolve({featureCheck: true})
-			})
-
-			// ================ Authorization ================
-			.state('login', {
-				url: "/login",
-				templateUrl: "partials/login.html?_=" + eagleApp._TRS(),
-				controller: "authLoginCtrl",
-				access: {skipCheck: true}
-			})
-
-			// ================ Configuration ================
-			// Site
-			.state('configSite', {
-				url: "/config/site",
-				templateUrl: "partials/config/site.html?_=" + eagleApp._TRS(),
-				controller: "configSiteCtrl",
-				pageConfig: "ConfigPageConfig",
-				resolve: _resolve({roleType: 'ROLE_ADMIN'})
-			})
-
-			// Application
-			.state('configApplication', {
-				url: "/config/application",
-				templateUrl: "partials/config/application.html?_=" + eagleApp._TRS(),
-				controller: "configApplicationCtrl",
-				pageConfig: "ConfigPageConfig",
-				resolve: _resolve({roleType: 'ROLE_ADMIN'})
-			})
-
-			// Feature
-			.state('configFeature', {
-				url: "/config/feature",
-				templateUrl: "partials/config/feature.html?_=" + eagleApp._TRS(),
-				controller: "configFeatureCtrl",
-				pageConfig: "ConfigPageConfig",
-				resolve: _resolve({roleType: 'ROLE_ADMIN'})
-			})
-
-			// Feature configuration page
-			.state('configFeatureDetail', $.extend({url: "/config/:feature/:page"}, {
-				templateUrl: function ($stateParams) {
-					var _htmlTemplate = featureControllerCustomizeHtmlTemplate[$stateParams.feature + "_" + $stateParams.page];
-					return  "public/feature/" + $stateParams.feature + "/page/" + (_htmlTemplate ||  $stateParams.page) + ".html?_=" + eagleApp._TRS();
-				},
-				controllerProvider: function ($stateParams) {
-					return "config_" + $stateParams.feature + "_" + $stateParams.page;
-				},
-				pageConfig: "ConfigPageConfig",
-				resolve: _resolve({roleType: 'ROLE_ADMIN'})
-			}))
-
-			// =================== Feature ===================
-			// Dynamic feature page
-			.state('page', $.extend({url: "/:feature/:page"}, _featureBase))
-			.state('pageFilter', $.extend({url: "/:feature/:page/:filter"}, _featureBase))
-		;
-
-		// Animation
-		$animateProvider.classNameFilter(/^((?!(fa-spin)).)*$/);
-		$animateProvider.classNameFilter(/^((?!(tab-pane)).)*$/);
-	});
-
-	eagleApp.filter('parseJSON', function () {
-		return function (input, defaultVal) {
-			return common.parseJSON(input, defaultVal);
-		};
-	});
-
-	eagleApp.filter('split', function () {
-		return function (input, regex) {
-			return input.split(regex);
-		};
-	});
-
-	eagleApp.filter('reverse', function () {
-		return function (items) {
-			return items.slice().reverse();
-		};
-	});
-
-	// ======================================================================================
-	// =                                   Main Controller                                  =
-	// ======================================================================================
-	eagleApp.controller('MainCtrl', function ($scope, $wrapState, $http, $injector, ServiceError, PageConfig, FeaturePageConfig, Site, Authorization, Entities, nvd3, Application, Feature, UI) {
-		window.serviceError = $scope.ServiceError = ServiceError;
-		window.site = $scope.Site = Site;
-		window.auth = $scope.Auth = Authorization;
-		window.entities = $scope.Entities = Entities;
-		window.application = $scope.Application = Application;
-		window.pageConfig = $scope.PageConfig = PageConfig;
-		window.featurePageConfig = $scope.FeaturePageConfig = FeaturePageConfig;
-		window.feature = $scope.Feature = Feature;
-		window.ui = $scope.UI = UI;
-		window.nvd3 = nvd3;
-		$scope.app = app;
-		$scope.common = common;
-
-		Object.defineProperty(window, "scope",{
-			get: function() {
-				return angular.element("[ui-view]").scope();
-			}
-		});
-
-		// Clean up
-		$scope.$on('$stateChangeStart', function (event, next, nextParam, current, currentParam) {
-			console.log("[Switch] current ->", current, currentParam);
-			console.log("[Switch] next ->", next, nextParam);
-			// Page initialization
-			PageConfig.reset();
-
-			// Dynamic navigation list
-			if(next.pageConfig) {
-				$scope.PageConfig.navConfig = $injector.get(next.pageConfig);
-			} else {
-				$scope.PageConfig.navConfig = {};
-			}
-
-			// Authorization
-			// > Login check
-			if (!common.getValueByPath(next, "access.skipCheck", false)) {
-				if (!Authorization.isLogin) {
-					console.log("[Authorization] Need access. Redirect...");
-					$wrapState.go("login");
-				}
-			}
-
-			// > Role control
-			/*var _roles = common.getValueByPath(next, "access.roles", []);
-			if (_roles.length && Authorization.userProfile.roles) {
-				var _roleMatch = false;
-				$.each(_roles, function (i, roleName) {
-					if (Authorization.isRole(roleName)) {
-						_roleMatch = true;
-						return false;
-					}
-				});
-
-				if (!_roleMatch) {
-					$wrapState.path("/dam");
-				}
-			}*/
-		});
-
-		$scope.$on('$stateChangeError', function (event, next, nextParam, current, currentParam, error) {
-			console.error("[Switch] Error", arguments);
-		});
-
-		// Get side bar navigation item class
-		$scope.getNavClass = function (page) {
-			var path = page.url.replace(/^#/, '');
-
-			if ($wrapState.path() === path) {
-				PageConfig.pageTitle = PageConfig.pageTitle || page.title;
-				return "active";
-			} else {
-				return "";
-			}
-		};
-
-		// Get side bar navigation item class visible
-		$scope.getNavVisible = function (page) {
-			if (!page.roles) return true;
-
-			for (var i = 0; i < page.roles.length; i += 1) {
-				var roleName = page.roles[i];
-				if (Authorization.isRole(roleName)) {
-					return true;
-				}
-			}
-
-			return false;
-		};
-
-		// Authorization
-		$scope.logout = function () {
-			console.log("[Authorization] Logout. Redirect...");
-			Authorization.logout();
-			$wrapState.go("login");
-		};
-	});
-})();
\ No newline at end of file


[02/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/app.time.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/app.time.js b/eagle-webservice/src/main/webapp/_app/public/js/app.time.js
deleted file mode 100644
index f5f41c1..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/app.time.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Time Zone
-(function() {
-	"use strict";
-
-	app.time = {
-		UTC_OFFSET: 0,
-		now: function() {
-			return app.time.offset();
-		},
-		offset: function(time) {
-			// Parse string number
-			if(typeof time === "string" && !isNaN(+time)) {
-				time = +time;
-			}
-
-			var _mom = new moment(time);
-			_mom.utcOffset(app.time.UTC_OFFSET);
-			return _mom;
-		},
-		/*
-		 * Return the moment object which use server time zone and keep the time.
-		 */
-		srvZone: function(time) {
-			var _timezone = time._isAMomentObject ? time.utcOffset() : new moment().utcOffset();
-			var _mom = app.time.offset(time);
-			_mom.subtract(app.time.UTC_OFFSET, "m").add(_timezone, "m");
-			return _mom;
-		},
-
-		refreshInterval: 1000 * 10
-	};
-
-	// Moment update
-	moment.fn.toISO = function() {
-		return this.format("YYYY-MM-DDTHH:mm:ss.000Z");
-	};
-
-	// Force convert date
-	var _toDate = moment.fn.toDate;
-	moment.fn.toDate = function(ignoreTimeZone) {
-		if(!ignoreTimeZone) return _toDate.bind(this)();
-		return new Date(
-			this.year(),
-			this.month(),
-			this.date(),
-			this.hour(),
-			this.minute(),
-			this.second(),
-			this.millisecond()
-		);
-	};
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/app.ui.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/app.ui.js b/eagle-webservice/src/main/webapp/_app/public/js/app.ui.js
deleted file mode 100644
index ca494d3..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/app.ui.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-(function() {
-	// ================== AdminLTE Update ==================
-	var _boxSelect = $.AdminLTE.options.boxWidgetOptions.boxWidgetSelectors;
-
-	// Box collapse
-	$(document).on("click", _boxSelect.collapse, function(e) {
-		if(common.getValueByPath($._data(this), "events.click")) return;
-
-		e.preventDefault();
-		$.AdminLTE.boxWidget.collapse($(this));
-	});
-
-	// Box remove
-	$(document).on("click", _boxSelect.remove, function(e) {
-		if(common.getValueByPath($._data(this), "events.click")) return;
-
-		e.preventDefault();
-		$.AdminLTE.boxWidget.remove($(this));
-	});
-
-	// =================== jQuery Update ===================
-	// Slide Toggle
-	var _slideToggle = $.fn.slideToggle;
-	$.fn.slideToggle = function(showOrHide) {
-		if(arguments.length === 1 && typeof showOrHide === "boolean") {
-			if(showOrHide) {
-				this.slideDown();
-			} else {
-				this.slideUp();
-			}
-		} else {
-			_slideToggle.apply(this, arguments);
-		}
-	};
-
-	// Fade Toggle
-	var _fadeToggle = $.fn.fadeToggle;
-	$.fn.fadeToggle = function(showOrHide) {
-		if(arguments.length === 1 && typeof showOrHide === "boolean") {
-			if(showOrHide) {
-				this.fadeIn();
-			} else {
-				this.fadeOut();
-			}
-		} else {
-			_fadeToggle.apply(this, arguments);
-		}
-	};
-
-	// Modal
-	var _modal = $.fn.modal;
-	$.fn.modal = function() {
-		setTimeout(function() {
-			$(this).find("input[type='text'], textarea").filter(':not([readonly]):enabled:visible:first').focus();
-		}.bind(this), 500);
-		_modal.apply(this, arguments);
-		return this;
-	};
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/common.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/common.js b/eagle-webservice/src/main/webapp/_app/public/js/common.js
deleted file mode 100644
index 4c5e82f..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/common.js
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var common = {};
-
-common.template = function (str, list) {
-	$.each(list, function(key, value) {
-		var _regex = new RegExp("\\$\\{" + key + "\\}", "g");
-		str = str.replace(_regex, value);
-	});
-	return str;
-};
-
-common.getValueByPath = function (unit, path, defaultValue) {
-	if(unit === null || unit === undefined) throw "Unit or path can't be empty!";
-	if(path === "" || path === null || path === undefined) return unit;
-
-	path = path.replace(/\[(\d+)\]/g, ".$1").replace(/^\./, "").split(/\./);
-	$.each(path, function(i, path) {
-		unit = unit[path];
-		if(unit === null || unit === undefined) {
-			unit = null;
-			return false;
-		}
-	});
-	if(unit === null && defaultValue !== undefined) {
-		unit = defaultValue;
-	}
-	return unit;
-};
-
-common.setValueByPath = function(unit, path, value) {
-	if(!unit || typeof path !== "string" || path === "") throw "Unit or path can't be empty!";
-
-	var _inArray = false;
-	var _end = 0;
-	var _start = 0;
-	var _unit = unit;
-
-	function _nextPath(array) {
-		var _key = path.slice(_start, _end);
-		if(_inArray) {
-			_key = _key.slice(0, -1);
-		}
-		if(!_unit[_key]) {
-			if(array) {
-				_unit[_key] = [];
-			} else {
-				_unit[_key] = {};
-			}
-		}
-		_unit = _unit[_key];
-	}
-
-	for(; _end < path.length ; _end += 1) {
-		if(path[_end] === ".") {
-			_nextPath(false);
-			_start = _end + 1;
-			_inArray = false;
-		} else if(path[_end] === "[") {
-			_nextPath(true);
-			_start = _end + 1;
-			_inArray = true;
-		}
-	}
-
-	_unit[path.slice(_start, _inArray ? -1 : _end)] = value;
-
-	return unit;
-};
-
-common.parseJSON = function (str, defaultVal) {
-	try {
-		str = (str + "").trim();
-		if(Number(str).toString() === str) throw "Number format";
-		return JSON.parse(str);
-	} catch(err) {
-		if(defaultVal === undefined) {
-			console.warn("Can't parse JSON: " + str);
-		}
-	}
-	return defaultVal === undefined ? null : defaultVal;
-};
-
-common.stringify = function(json) {
-	return JSON.stringify(json, function(key, value) {
-		if(/^(_|\$)/.test(key)) return undefined;
-		return value;
-	});
-};
-
-common.isEmpty = function(val) {
-	if($.isArray(val)) {
-		return val.length === 0;
-	} else {
-		return val === null || val === undefined;
-	}
-};
-
-common.extend = function(target, origin) {
-	$.each(origin, function(key, value) {
-		if(/^(_|\$)/.test(key)) return;
-
-		target[key] = value;
-	});
-	return target;
-};
-
-// ====================== Format ======================
-common.format = {};
-
-/*
- * Format date to string. Support number, string, Date instance. Will auto convert time zone offset(Moment instance will keep time zone).
- */
-common.format.date = function(val, type) {
-	if(val === undefined || val === null) return "";
-
-	if(typeof val === "number" || typeof val === "string" || val instanceof Date) {
-		val = app.time.offset(val);
-	}
-	switch(type) {
-	case 'date':
-		return val.format("YYYY-MM-DD");
-	case 'time':
-		return val.format("HH:mm:ss");
-	case 'datetime':
-		return val.format("YYYY-MM-DD HH:mm:ss");
-	case 'mixed':
-		return val.format("YYYY-MM-DD HH:mm");
-	default:
-		return val.format("YYYY-MM-DD HH:mm:ss") + (val.utcOffset() === 0 ? '[UTC]' : '');
-	}
-};
-
-// ===================== Property =====================
-common.properties = {};
-
-common.properties.parse = function (str, defaultValue) {
-	var regex = /\s*([\w\.]+)\s*=\s*(.*?)\s*([\r\n]+|$)/g;
-	var match, props = {};
-	var hasValue = false;
-	while((match = regex.exec(str)) !== null) {
-		props[match[1]] = match[2];
-		hasValue = true;
-	}
-	props = hasValue ? props : defaultValue;
-	props.getValueByPath = function (path) {
-		if(props[path] !== undefined) return props[path];
-		var subProps = {};
-		var prefixPath = path + ".";
-		$.each(props, function (key, value) {
-			if(typeof value === "string" && key.indexOf(prefixPath) === 0) {
-				subProps[key.replace(prefixPath, "")] = value;
-			}
-		});
-		return subProps;
-	};
-
-	return props;
-};
-
-common.properties.check = function (str) {
-	var pass = true;
-	var regex = /^\s*[\w\.]+\s*=(.*)$/;
-	$.each((str || "").trim().split(/[\r\n\s]+/g), function (i, line) {
-		if(!regex.test(line)) {
-			pass = false;
-			return false;
-		}
-	});
-	return pass;
-};
-
-// ====================== Array =======================
-common.array = {};
-
-common.array.sum = function(list, path) {
-	var _sum = 0;
-	if(list) {
-		$.each(list, function(i, unit) {
-			var _val = common.getValueByPath(unit, path);
-			if(typeof _val === "number") {
-				_sum += _val;
-			}
-		});
-	}
-	return _sum;
-};
-
-common.array.max = function(list, path) {
-	var _max = null;
-	if(list) {
-		$.each(list, function(i, unit) {
-			var _val = common.getValueByPath(unit, path);
-			if(typeof _val === "number" && (_max === null || _max < _val)) {
-				_max = _val;
-			}
-		});
-	}
-	return _max;
-};
-
-common.array.bottom = function(list, path, count) {
-	var _list = list.slice();
-
-	_list.sort(function(a, b) {
-		var _a = common.getValueByPath(a, path, null);
-		var _b = common.getValueByPath(b, path, null);
-
-		if(_a === _b) return 0;
-		if(_a < _b || _a === null) {
-			return -1;
-		} else {
-			return 1;
-		}
-	});
-	return !count ? _list : _list.slice(0, count);
-};
-common.array.top = function(list, path, count) {
-	var _list = common.array.bottom(list, path);
-	_list.reverse();
-	return !count ? _list : _list.slice(0, count);
-};
-
-common.array.find = function(val, list, path, findAll, caseSensitive) {
-	path = path || "";
-	val = caseSensitive === false ? (val || "").toUpperCase() : val;
-
-	var _list = $.grep(list, function(unit) {
-		if(caseSensitive === false) {
-			return val === (common.getValueByPath(unit, path) || "").toUpperCase();
-		} else {
-			return val === common.getValueByPath(unit, path);
-		}
-	});
-	return findAll ? _list : (_list.length === 0 ? null : _list[0]);
-};
-
-common.array.filter = function(val, list, path) {
-	return common.array.find(val, list, path, true);
-};
-
-common.array.count = function(list, val, path) {
-	if(arguments.length === 1) {
-		return list.length;
-	} else {
-		return common.array.find(val, list, path, true).length;
-	}
-};
-
-common.array.remove = function(val, list) {
-	for(var i = 0 ; i < list.length ; i += 1) {
-		if(list[i] === val) {
-			list.splice(i, 1);
-			i -= 1;
-		}
-	}
-};
-
-common.array.insert = function(val, list, index) {
-	list.splice(index, 0, val);
-};
-
-common.array.moveOffset = function(item, list, offset) {
-	var _index = $.inArray(item, list);
-	var _tgtPos = _index + offset;
-	if(_tgtPos < 0 || _tgtPos >= list.length) return;
-
-	common.array.remove(item, list);
-	common.array.insert(item, list, _index + offset);
-};
-
-// ======================= Map ========================
-common.map = {};
-
-common.map.toArray = function(map) {
-	return $.map(map, function(unit) {
-		return unit;
-	});
-};
-
-// ======================= Math =======================
-common.math = {};
-
-common.math.distance = function(x1,y1,x2,y2) {
-	var a = x1 - x2;
-	var b = y1 - y2;
-	return Math.sqrt(a * a + b * b);
-};

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/components/charts/line3d.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/components/charts/line3d.js b/eagle-webservice/src/main/webapp/_app/public/js/components/charts/line3d.js
deleted file mode 100644
index c2bf23b..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/components/charts/line3d.js
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-eagleComponents.directive('line3dChart', function($compile) {
-	'use strict';
-
-	return {
-		restrict : 'AE',
-		scope : {
-			title : "@",
-			data : "=",
-
-			height : "=?height"
-		},
-		controller : function(line3dCharts, $scope, $element, $attrs) {
-			$scope.height = $scope.height || 200;
-
-			var _chart = line3dCharts($scope);
-
-			var _chartBody = $element.find(".chart-body");
-			_chartBody.height($scope.height);
-
-			_chart.gen($element.find(".chart-body"), $attrs.data, {
-				height : $scope.height,
-			});
-		},
-		template : '<div class="chart">' + '<div class="chart-header">' + '<h3>{{title}}</h3>' + '</div>' + '<div class="chart-body">' + '</div>' + '</div>',
-		replace : true
-	};
-});
-
-eagleComponents.service('line3dCharts', function() {
-	'use strict';
-
-	var charts = function($scope) {
-		return {
-			gen : function(ele, series, config) {
-				// ======================= Initialization =======================
-				ele = $(ele);
-
-				series = series || [];
-				config = config || {};
-
-				var _bounds = [{min:-10, max: 10},{min:-10, max: 10},{min:-10, max: 10}];
-				var _scale = 1;
-
-				// ======================= Set Up D3 View =======================
-				var width = ele.innerWidth(), height = config.height;
-
-				var color = ["#7cb5ec", "#f7a35c", "#90ee7e", "#7798BF", "#aaeeee"];
-
-				var svg = d3.select(ele[0]).append("svg").attr("width", width).attr("height", height);
-
-				// ========================== Function ==========================
-				var yaw=0.5,pitch=0.5,drag;
-				var transformPrecalc = [];
-
-				var offsetPoint = function(point) {
-					var _point = [
-						+point[0] - (_bounds[0].max + _bounds[0].min) / 2,
-						-point[1] + (_bounds[1].max + _bounds[1].min) / 2,
-						-point[2] + (_bounds[2].max + _bounds[2].min) / 2
-					];
-					return [_point[0] * _scale, _point[1] * _scale, _point[2] * _scale];
-				};
-
-				var transfromPointX = function(point) {
-					point = offsetPoint(point);
-					return transformPrecalc[0] * point[0] + transformPrecalc[1] * point[1] + transformPrecalc[2] * point[2] + width / 2;
-				};
-				var transfromPointY = function(point) {
-					point = offsetPoint(point);
-					return transformPrecalc[3] * point[0] + transformPrecalc[4] * point[1] + transformPrecalc[5] * point[2] + height / 2;
-				};
-				var transfromPointZ = function(point) {
-					point = offsetPoint(point);
-					return transformPrecalc[6] * point[0] + transformPrecalc[7] * point[1] + transformPrecalc[8] * point[2];
-				};
-				var transformPoint2D = function(point) {
-					var _point = [point[0], point[1], point[2]];
-					return transfromPointX(_point).toFixed(10) + "," + transfromPointY(_point).toFixed(10);
-				};
-
-				var setTurtable = function(yaw, pitch, update) {
-					var cosA = Math.cos(pitch);
-					var sinA = Math.sin(pitch);
-					var cosB = Math.cos(yaw);
-					var sinB = Math.sin(yaw);
-					transformPrecalc[0] = cosB;
-					transformPrecalc[1] = 0;
-					transformPrecalc[2] = sinB;
-					transformPrecalc[3] = sinA * sinB;
-					transformPrecalc[4] = cosA;
-					transformPrecalc[5] = -sinA * cosB;
-					transformPrecalc[6] = -sinB * cosA;
-					transformPrecalc[7] = sinA;
-					transformPrecalc[8] = cosA * cosB;
-
-					if(update) _update();
-				};
-				setTurtable(0.4,0.4);
-
-				// =========================== Redraw ===========================
-				var _coordinateList = [];
-				var _axisText = [];
-				var coordinate = svg.selectAll(".axis");
-				var axisText = svg.selectAll(".axis-text");
-				var lineList = svg.selectAll(".line");
-
-				function _redraw(series) {
-					var _desX, _desY, _desZ, _step;
-
-					// Bounds
-					if(series) {
-						_bounds = [{},{},{}];
-						$.each(series, function(j, series) {
-							// Points
-							$.each(series.data, function(k, point) {
-								for(var i = 0 ; i < 3 ; i += 1) {
-									// Minimum
-									if(_bounds[i].min === undefined || point[i] < _bounds[i].min) {
-										_bounds[i].min = point[i];
-									}
-									// Maximum
-									if(_bounds[i].max === undefined || _bounds[i].max < point[i]) {
-										_bounds[i].max = point[i];
-									}
-								}
-							});
-						});
-					}
-
-					_desX = _bounds[0].max - _bounds[0].min;
-					_desY = _bounds[1].max - _bounds[1].min;
-					_desZ = _bounds[2].max - _bounds[2].min;
-
-					// Step
-					(function() {
-						var _stepX = _desX / 10;
-						var _stepY = _desY / 10;
-						var _stepZ = _desZ / 10;
-
-						_step = Math.min(_stepX, _stepY, _stepZ);
-						_step = Math.max(_step, 0.5);
-						_step = 0.5;
-					})();
-
-					// Scale
-					(function() {
-						var _scaleX = width / _desX;
-						var _scaleY = height / _desY / 2;
-						var _scaleZ = width / _desZ;
-						_scale = Math.min(_scaleX, _scaleY, _scaleZ) / 2;
-					})();
-
-					// Coordinate
-					// > Basic
-					_coordinateList = [
-						{color: "rgba(0,0,0,0.1)", data: [[0,0,-100],[0,0,100]]},
-						{color: "rgba(0,0,0,0.1)", data: [[0,-100,0],[0,100,0]]},
-						{color: "rgba(0,0,0,0.1)", data: [[-100,0,0],[100,0,0]]},
-
-						{color: "rgba(0,0,255,0.3)", data: [[_bounds[0].min,_bounds[1].min,_bounds[2].min],[_bounds[0].max,_bounds[1].min,_bounds[2].min]]},
-						{color: "rgba(0,0,255,0.3)", data: [[_bounds[0].min,_bounds[1].min,_bounds[2].min],[_bounds[0].min,_bounds[1].min,_bounds[2].max]]},
-
-						{color: "rgba(0,0,255,0.3)", data: [[_bounds[0].min,_bounds[1].min,_bounds[2].max],[_bounds[0].max,_bounds[1].min,_bounds[2].max]]},
-						{color: "rgba(0,0,255,0.3)", data: [[_bounds[0].max,_bounds[1].min,_bounds[2].min],[_bounds[0].max,_bounds[1].min,_bounds[2].max]]},
-
-						{color: "rgba(0,0,255,0.3)", data: [[_bounds[0].min,_bounds[1].max,_bounds[2].min],[_bounds[0].max,_bounds[1].max,_bounds[2].min]]},
-						{color: "rgba(0,0,255,0.3)", data: [[_bounds[0].min,_bounds[1].max,_bounds[2].min],[_bounds[0].min,_bounds[1].max,_bounds[2].max]]},
-
-						{color: "rgba(0,0,255,0.3)", data: [[_bounds[0].min,_bounds[1].min,_bounds[2].min],[_bounds[0].min,_bounds[1].max,_bounds[2].min]]},
-						{color: "rgba(0,0,255,0.3)", data: [[_bounds[0].max,_bounds[1].min,_bounds[2].min],[_bounds[0].max,_bounds[1].max,_bounds[2].min]]},
-						{color: "rgba(0,0,255,0.3)", data: [[_bounds[0].min,_bounds[1].min,_bounds[2].max],[_bounds[0].min,_bounds[1].max,_bounds[2].max]]},
-					];
-
-					_axisText = [];
-					function _axisPoint(point, dimension, number) {
-						// Coordinate
-						if(dimension === 1) {
-							_coordinateList.push({
-								color: "rgba(0,0,0,0.2)",
-								data:[[_step/5,point[1],0],[0,point[1],0],[0,point[1],_step/5]]
-							});
-						} else {
-							_coordinateList.push({
-								color: "rgba(0,0,0,0.2)",
-								data:[[point[0],-_step/8,point[2]], [point[0],_step/8,point[2]]]
-							});
-						}
-
-						// Axis Text
-						if(number.toFixed(0) == number + "") {
-							point.text = number;
-							point.dimension = dimension;
-							_axisText.push(point);
-						}
-					}
-					function _axisPoints(dimension, bound) {
-						var i, _unit;
-						for(i = _step ; i < bound.max + _step ; i += _step) {
-							_unit = [0,0,0];
-							_unit[dimension] = i;
-							_axisPoint(_unit, dimension, i);
-						}
-						for(i = -_step ; i > bound.min - _step ; i -= _step) {
-							_unit = [0,0,0];
-							_unit[dimension] = i;
-							_axisPoint(_unit, dimension, i);
-						}
-					}
-					// > Steps
-					_axisPoint([0,0,0],1,0);
-					_axisPoints(0, _bounds[0]);
-					_axisPoints(1, _bounds[1]);
-					_axisPoints(2, _bounds[2]);
-
-					// > Draw
-					coordinate = coordinate.data(_coordinateList);
-					coordinate.enter()
-					.append("path")
-						.attr("fill", "none")
-						.attr("stroke", function(d) {return d.color;});
-					coordinate.exit().remove();
-
-					// Axis Text
-					axisText = axisText.data(_axisText);
-					axisText.enter()
-						.append("text")
-						.classed("noSelect", true)
-						.attr("fill", "rgba(0,0,0,0.5)")
-						.attr("text-anchor", function(d) {return d.dimension === 1 ? "start" : "middle";})
-						.text(function(d) {return d.text;});
-					axisText.transition()
-						.attr("text-anchor", function(d) {return d.dimension === 1 ? "end" : "middle";})
-						.text(function(d) {return d.text;});
-					axisText.exit().remove();
-
-					// Lines
-					lineList = lineList.data(series || []);
-					lineList.enter()
-						.append("path")
-							.attr("fill", "none")
-							.attr("stroke", function(d) {return d.color;});
-					lineList.exit().remove();
-
-					_update();
-				}
-
-				function _update() {
-					coordinate
-						.attr("d", function(d) {
-						var path = "";
-						$.each(d.data, function(i, point) {
-							path += (i === 0 ? "M" : "L") + transformPoint2D(point);
-						});
-						return path;
-						});
-
-					axisText
-						.attr("x", function(d) {return transfromPointX(d) + (d.dimension === 1 ? -3 : 0);})
-						.attr("y", function(d) {return transfromPointY(d) + (d.dimension === 1 ? 0 : -5);});
-
-					lineList
-						.attr("d", function(d, index) {
-							var path = "";
-							$.each(d.data, function(i, point) {
-								path += (i === 0 ? "M" : "L") + transformPoint2D(point);
-							});
-							return path;
-						});
-				}
-
-
-				svg.on("mousedown", function() {
-					drag = [d3.mouse(this), yaw, pitch];
-				}).on("mouseup", function() {
-					drag = false;
-				}).on("mousemove", function() {
-					if (drag) {
-						var mouse = d3.mouse(this);
-						yaw = drag[1] - (mouse[0] - drag[0][0]) / 50;
-						pitch = drag[2] + (mouse[1] - drag[0][1]) / 50;
-						pitch = Math.max(-Math.PI / 2, Math.min(Math.PI / 2, pitch));
-						setTurtable(yaw, pitch, true);
-					}
-				});
-
-				// =========================== Render ===========================
-				_redraw();
-
-				function _render() {
-					// ======== Parse Data ========
-					var _series = typeof series === "string" ? $scope.data : series;
-					if(!_series) return;
-
-					// Clone
-					_series = $.map(_series, function(series) {
-						return {
-							name: series.name,
-							color: series.color,
-							data: series.data
-						};
-					});
-
-					// Colors
-					$.each(_series, function(i, series) {
-						series.color = series.color || color[i % color.length];
-					});
-
-					// Render
-					_redraw(_series);
-				}
-
-				// ======================= Dynamic Detect =======================
-				if(typeof series === "string") {
-					$scope.$parent.$watch(series, function() {
-						_render();
-					}, true);
-				} else {
-					_render();
-				}
-
-
-				// ========================== Clean Up ==========================
-				$scope.$on('$destroy', function() {
-					svg.remove();
-				});
-			},
-		};
-	};
-	return charts;
-});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/components/file.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/components/file.js b/eagle-webservice/src/main/webapp/_app/public/js/components/file.js
deleted file mode 100644
index a8d78db..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/components/file.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-eagleComponents.directive('file', function($compile) {
-	'use strict';
-
-	return {
-		restrict : 'A',
-		scope: {
-			filepath: "=?filepath",
-		},
-		controller: function($scope, $element, $attrs) {
-			// Watch change(Only support clean the data)
-			if($attrs.filepath) {
-				$scope.$parent.$watch($attrs.filepath, function(value) {
-					if(!value) $element.val(value);
-				});
-			}
-
-			// Bind changed value
-			$element.on("change", function() {
-				var _path = $(this).val();
-				if($attrs.filepath) {
-					common.setValueByPath($scope.$parent, $attrs.filepath, _path);
-					$scope.$parent.$apply();
-				}
-			});
-
-			$scope.$on('$destroy',function(){
-				$element.off("change");
-			});
-		},
-		replace: false
-	};
-});

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/components/main.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/components/main.js b/eagle-webservice/src/main/webapp/_app/public/js/components/main.js
deleted file mode 100644
index a0d9f9f..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/components/main.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var eagleComponents = angular.module('eagle.components', []);

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/components/nvd3.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/components/nvd3.js b/eagle-webservice/src/main/webapp/_app/public/js/components/nvd3.js
deleted file mode 100644
index 8687c78..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/components/nvd3.js
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-eagleComponents.service('nvd3', function() {
-	var nvd3 = {
-		charts: [],
-		colors: [
-			"#7CB5EC", "#F7A35C", "#90EE7E", "#7798BF", "#AAEEEE"
-		]
-	};
-
-	// ============================================
-	// =              Format Convert              =
-	// ============================================
-
-	/***
-	 * Format: [series:{key:name, value: [{x, y}]}]
-	 */
-
-	nvd3.convert = {};
-	nvd3.convert.eagle = function(seriesList) {
-		return $.map(seriesList, function(series) {
-			var seriesObj = $.isArray(series) ? {values: series} : series;
-			if(!seriesObj.key) seriesObj.key = "value";
-			return seriesObj;
-		});
-	};
-
-	nvd3.convert.druid = function(seriesList) {
-		var _seriesList = [];
-
-		$.each(seriesList, function(i, series) {
-			if(!series.length) return;
-
-			// Fetch keys
-			var _measure = series[0];
-			var _keys = $.map(_measure.event, function(value, key) {
-				return key !== "metric" ? key : null;
-			});
-
-			// Parse series
-			_seriesList.push.apply(_seriesList, $.map(_keys, function(key) {
-				return {
-					key: key,
-					values: $.map(series, function(unit) {
-						return {
-							x: new moment(unit.timestamp).valueOf(),
-							y: unit.event[key]
-						};
-					})
-				};
-			}));
-		});
-
-		return _seriesList;
-	};
-
-	// ============================================
-	// =                    UI                    =
-	// ============================================
-	// Resize with refresh
-	function chartResize() {
-		$.each(nvd3.charts, function(i, chart) {
-			if(chart) chart.nvd3Update();
-		});
-	}
-	$(window).on("resize.components.nvd3", chartResize);
-	$("body").on("collapsed.pushMenu expanded.pushMenu", function() {
-		setTimeout(chartResize, 300);
-	});
-
-	return nvd3;
-});
-
-/**
- * config:
- * 		chart:			Defined chart type: line, column, area
- * 		xTitle:			Defined x axis title.
- * 		yTitle:			Defined y axis title.
- * 		xType:			Defined x axis label type: number, decimal, time
- * 		yType:			Defined y axis label type
- * 		yMin:			Defined minimum of y axis
- * 		yMax:			Defined maximum of y axis
- * 		displayType:	Defined the chart display type. Each chart has own type.
- */
-eagleComponents.directive('nvd3', function(nvd3) {
-	'use strict';
-
-	return {
-		restrict: 'AE',
-		scope: {
-			nvd3: "=",
-			title: "@?title",				// title
-			chart: "@?chart",				// Same as config.chart
-			config: "=?config",
-			watching: "@?watching",			// Default watching data(nvd3) only. true will also watching chart & config. false do not watching.
-
-			holder: "=?holder"				// Container for holder to call the chart function
-		},
-		controller: function($scope, $element, $attrs, $timeout) {
-			var _config, _chartType;
-			var _chart;
-			var _chartCntr;
-			var _holder, _holder_updateTimes;
-
-			// Destroy
-			function destroy() {
-				var _index = $.inArray(_chart, nvd3.charts);
-				if(!_chartCntr) return _index;
-
-				// Clean events
-				d3.select(_chartCntr)
-					.on("touchmove",null)
-					.on("mousemove",null, true)
-					.on("mouseout" ,null,true)
-					.on("dblclick" ,null)
-					.on("click", null);
-
-				// Clean elements
-				d3.select(_chartCntr).selectAll("*").remove();
-				$element.find(".nvtooltip").remove();
-				$(_chartCntr).remove();
-
-				// Clean chart in nvd3 pool
-				nvd3.charts[_index] = null;
-				_chart = null;
-
-				return _index;
-			}
-
-			// Setup chart environment. Will clean old chart and build new chart if recall.
-			function initChart() {
-				// Clean up if already have chart
-				var _preIndex = destroy();
-
-				// Initialize
-				_config = $.extend({}, $scope.config);
-				_chartType = $scope.chart || _config.chart;
-				_chartCntr = $(document.createElementNS("http://www.w3.org/2000/svg", "svg"))
-					.css("min-height", 50)
-					.attr("_rnd", Math.random())
-					.appendTo($element)[0];
-
-				// Size
-				if(_config.height) {
-					$(_chartCntr).css("height", _config.height);
-				}
-
-				switch(_chartType) {
-					case "line":
-						_chart = nv.models.lineChart()
-							.useInteractiveGuideline(true)
-							.showLegend(true)
-							.showYAxis(true)
-							.showXAxis(true)
-							.options({
-								duration: 350
-							});
-						break;
-					case "column":
-						_chart = nv.models.multiBarChart()
-							.groupSpacing(0.1)
-							.options({
-								duration: 350
-							});
-						break;
-					case "area":
-						_chart = nv.models.stackedAreaChart()
-							.useInteractiveGuideline(true)
-							.showLegend(true)
-							.showYAxis(true)
-							.showXAxis(true)
-							.options({
-								duration: 350
-							});
-						break;
-					case "pie":
-						_chart = nv.models.dimensionalPieChart()
-							.x(function(d) { return d.key; })
-							.y(function(d) { return d.values[d.values.length - 1].y; });
-						break;
-					default :
-						throw "Type not defined: " + _chartType;
-				}
-
-				// nvd3 display Type
-				// TODO: support type define
-
-				// Define title
-				if(_chartType !== 'pie') {
-					if(_config.xTitle) _chart.xAxis.axisLabel(_config.xTitle);
-					if(_config.yTitle) _chart.yAxis.axisLabel(_config.yTitle);
-				}
-
-				// Define label type
-				var _tickMultiFormat = d3.time.format.multi([
-					["%-I:%M%p", function(d) { return d.getMinutes(); }],
-					["%-I%p", function(d) { return d.getHours(); }],
-					["%b %-d", function(d) { return d.getDate() != 1; }],
-					["%b %-d", function(d) { return d.getMonth(); }],
-					["%Y", function() { return true; }]
-				]);
-
-				function _defineLabelType(axis, type) {
-					if(!_chart) return;
-
-					var _axis = _chart[axis + "Axis"];
-					if(!_axis) return;
-
-					switch(type) {
-						case "decimal":
-						case "decimals":
-							_axis.tickFormat(d3.format('.02f'));
-							break;
-						case "text":
-							if(axis === "x") {
-								_chart.rotateLabels(10);
-								_chart.reduceXTicks(false).staggerLabels(true);
-							}
-							_axis.tickFormat(function(d) {
-								return d;
-							});
-							break;
-						case "time":
-							if(_chartType !== 'column') {
-								_chart[axis + "Scale"](d3.time.scale());
-								(function () {
-									var measureSeries = null;
-									$.each($scope.nvd3 || [], function(i, series) {
-										var _len = (series.values || []).length;
-										if(_len === 0) return;
-										if(measureSeries === null || measureSeries.values.length < _len) measureSeries = series;
-									});
-
-									var width = $element.width() - 35;// Use default nvd3 margin. Hard code.
-									if(!measureSeries || width <= 0) return;
-									var count = Math.floor(width / 80);
-									var countDes = Math.floor(measureSeries.values.length / count);
-									var tickValues = [];
-									for(var loc = 0 ; loc < measureSeries.values.length ; loc += countDes) {
-										tickValues.push(measureSeries.values[loc].x);
-									}
-									_chart[axis + "Axis"].tickValues(tickValues);
-								})();
-							}
-							_axis.tickFormat(function(d) {
-								return _tickMultiFormat(app.time.offset(d).toDate(true));
-							});
-							break;
-						case "number":
-						/* falls through */
-						default:
-							_axis.tickFormat(d3.format(',r'));
-					}
-				}
-
-				if(_chartType !== 'pie') {
-					_defineLabelType("x", _config.xType || "number");
-					_defineLabelType("y", _config.yType || "decimal");
-				}
-
-				// Global chart list update
-				if(_preIndex === -1) {
-					nvd3.charts.push(_chart);
-				} else {
-					nvd3.charts[_preIndex] = _chart;
-				}
-
-				// Use customize update function to update the view
-				_chart.nvd3Update = function() {
-					if(_config.xType === "time") _defineLabelType("x", _config.xType);
-					_chart.update();
-				};
-
-				updateData();
-			}
-
-			// Update chart data
-			function updateData() {
-				var _min = null, _max = null;
-
-				// Copy series to prevent Angular loop watching
-				var _data = $.map($scope.nvd3 || [], function(series, i) {
-					var _series = $.extend(true, {}, series);
-					_series.color = _series.color || nvd3.colors[i % nvd3.colors.length];
-					return _series;
-				});
-
-				// Chart Y value
-				if(($scope.chart || _config.chart) !== "pie") {
-					$.each(_data, function(i, series) {
-						$.each(series.values, function(j, unit) {
-							if(_min === null || unit.y < _min) _min = unit.y;
-							if(_max === null || unit.y > _max) _max = unit.y;
-						});
-					});
-
-					if(_min === 0 && _max === 0) {
-						_chart.forceY([0, 10]);
-					} else if(_config.yMin !== undefined || _config.yMax !== undefined) {
-						_chart.forceY([_config.yMin, _config.yMax]);
-					} else {
-						_chart.forceY([]);
-					}
-				}
-
-				// Update data
-				d3.select(_chartCntr)						//Select the <svg> element you want to render the chart in.
-					.datum(_data)							//Populate the <svg> element with chart data...
-					.call(_chart);							//Finally, render the chart!
-
-				setTimeout(_chart.nvd3Update, 10);
-			}
-
-			// ================================================================
-			// =                           Watching                           =
-			// ================================================================
-			// Ignore initial checking
-			$timeout(function() {
-				if ($scope.watching !== "false") {
-					$scope.$watch(function() {
-						if(!$scope.nvd3) return [];
-
-						var _hashList = $.map($scope.nvd3, function(series) {
-							if(!series.values) return 0;
-							var unit = {
-								x: 0,
-								y: 0
-							};
-
-							$.each(series.values, function(j, item) {
-								unit.x += item.x;
-								unit.y += item.y;
-							});
-
-							return unit;
-						});
-
-						return _hashList;
-					}, function() {
-						updateData();
-					}, true);
-
-					// All watching mode
-					if ($scope.watching === "true") {
-						$scope.$watch("[chart, config]", function(newValue, oldValue) {
-							if(angular.equals(newValue, oldValue)) return;
-							initChart();
-						}, true);
-					}
-				}
-			});
-
-			// Holder inject
-			_holder_updateTimes = 0;
-			_holder = {
-				element: $element,
-				refresh: function() {
-					setTimeout(function() {
-						updateData();
-					}, 0);
-				},
-				refreshAll: function() {
-					setTimeout(function() {
-						initChart();
-					}, 0);
-				}
-			};
-
-			Object.defineProperty(_holder, 'chart', {
-				get: function() {return _chart;}
-			});
-
-			$scope.$watch("holder", function() {
-				// Holder times update
-				setTimeout(function() {
-					_holder_updateTimes = 0;
-				}, 0);
-				_holder_updateTimes += 1;
-				if(_holder_updateTimes > 100) throw "Holder conflict";
-
-				$scope.holder = _holder;
-			});
-
-			// ================================================================
-			// =                           Start Up                           =
-			// ================================================================
-			initChart();
-
-			// ================================================================
-			// =                           Clean Up                           =
-			// ================================================================
-			$scope.$on('$destroy', function() {
-				destroy();
-			});
-		},
-		template :
-		'<div>' +
-			'<h3 title="{{title || config.title}}">{{title || config.title}}</h3>' +
-		'</div>',
-		replace: true
-	};
-});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/components/sortTable.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/components/sortTable.js b/eagle-webservice/src/main/webapp/_app/public/js/components/sortTable.js
deleted file mode 100644
index bdcbca4..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/components/sortTable.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-eagleComponents.directive('sorttable', function($compile) {
-	'use strict';
-
-	return {
-		restrict : 'AE',
-		scope: {
-			source: '=',
-			search: '=?search',
-			searchfunc: "=?searchfunc",
-
-			orderKey: "@?sort",
-
-			maxSize: "=?maxSize",
-		},
-		controller: function($scope, $element, $attrs) {
-			// Initialization
-			$scope.app = app;
-			$scope.common = common;
-			$scope._parent = $scope.$parent;
-
-			$scope.pageNumber = $scope.pageNumber || 1;
-			$scope.pageSize = $scope.pageSize || 10;
-
-			$scope.maxSize = $scope.maxSize || 10;
-
-			// Search box
-			if($scope.search !== false) {
-				var $search = $(
-					'<div style="overflow:hidden;">' +
-						'<div class="row">' +
-							'<div class="col-xs-4">' +
-								'<div class="search-box">' +
-									'<input type="search" class="form-control input-sm" placeholder="Search" ng-model="search" />' +
-									'<span class="fa fa-search"></span>' +
-								'</div>' +
-							'</div>' +
-						'</div>' +
-					'</div>'
-				).prependTo($element);
-				$compile($search)($scope);
-			}
-
-			// List head
-			$scope.doSort = function(path) {
-				if($scope.orderKey === path) {
-					$scope.orderKey = "-" + path;
-				} else {
-					$scope.orderKey = path;
-				}
-			};
-			$scope.checkSortClass = function(key) {
-				if($scope.orderKey === key) {
-					return "fa fa-sort-asc";
-				} else if($scope.orderKey === "-" + key) {
-					return "fa fa-sort-desc";
-				}
-				return "fa fa-sort";
-			};
-
-			var $listHead = $element.find("thead > tr");
-			$listHead.find("> th").each(function() {
-				var $th = $(this);
-				$th.addClass("noSelect");
-
-				var _sortpath = $th.attr("sortpath");
-				if(_sortpath) {
-					$th.attr("ng-click", "doSort('" + _sortpath + "')");
-					$th.prepend('<span ng-class="checkSortClass(\'' + _sortpath + '\')"></span>');
-				}
-			});
-			$compile($listHead)($scope);
-
-			// List body
-			var $listBody = $element.find("tbody > tr");
-			$listBody.attr("ng-repeat", 'item in (filteredList = (source | filter: ' + ($scope.searchfunc ? 'searchfunc' : 'search') + ' | orderBy: orderKey)).slice((pageNumber - 1) * pageSize, pageNumber * pageSize)');
-			$compile($listBody)($scope);
-
-			// Navigation
-			var $navigation = $(
-				'<div style="overflow:hidden;">' +
-					'<div class="row">' +
-						'<div class="col-xs-5">' +
-							'show {{(pageNumber - 1) * pageSize + 1}} to {{pageNumber * pageSize}} of {{filteredList.length}} items' +
-						'</div>' +
-						'<div class="col-xs-7 text-right">' +
-							'<uib-pagination total-items="filteredList.length" ng-model="pageNumber" boundary-links="true" items-per-page="pageSize" num-pages="numPages" max-size="maxSize"></uib-pagination>' +
-						'</div>' +
-					'</div>' +
-				'</div>'
-			).appendTo($element);
-			$compile($navigation)($scope);
-		},
-		replace: false
-	};
-});

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/components/sortable.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/components/sortable.js b/eagle-webservice/src/main/webapp/_app/public/js/components/sortable.js
deleted file mode 100644
index c98c732..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/components/sortable.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-eagleComponents.directive('uieSortable', function($rootScope) {
-	'use strict';
-
-	var COLLECTION_MATCH = /^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/;
-
-	var _move = false;
-	var _selectElement;
-	var _overElement;
-	var _mockElement;
-	var _offsetX, _offsetY;
-	var _mouseDownPageX, _mouseDownPageY;
-
-	function doMock(element, event) {
-		var _offset = element.offset();
-		if(_mockElement) _mockElement.remove();
-
-		// Create mock element
-		_mockElement = element.clone(false).appendTo("body");
-		_mockElement.addClass("sortable-mock-element");
-		_mockElement.css({
-			display: "block",
-			position: "absolute",
-			"pointer-events": "none",
-			"z-index": 10001,
-			padding: element.css("padding"),
-			margin: element.css("margin")
-		});
-		_mockElement.width(element.width());
-		_mockElement.height(element.height());
-
-		_mockElement.offset(_offset);
-		_offsetX = event.pageX - _offset.left;
-		_offsetY = event.pageY - _offset.top;
-	}
-
-	$(window).on("mousemove", function(event) {
-		if(!_move) return;
-		event.preventDefault();
-
-		_mockElement.offset({
-			left: event.pageX - _offsetX,
-			top: event.pageY - _offsetY
-		});
-	});
-
-	$(window).on("mouseup", function() {
-		if(!_move) {
-			_overElement = null;
-			_selectElement = null;
-			_mockElement = null;
-			return;
-		}
-		_move = false;
-
-		if(_overElement) {
-			_overElement.removeClass("sortable-enter");
-
-			if(_overElement[0] !== _selectElement[0]) {
-				// Process switch
-				var _oriHolder = _selectElement.holder;
-				var _tgtHolder = _overElement.holder;
-				var _oriSortableScope = _oriHolder.scope;
-				var _tgtSortableScope = _tgtHolder.scope;
-				var _oriScope = angular.element(_selectElement).scope();
-				var _tgtScope = angular.element(_overElement).scope();
-
-				var _oriRepeat = _selectElement.closest("[ng-repeat]").attr("ng-repeat");
-				var _tgtRepeat = _overElement.closest("[ng-repeat]").attr("ng-repeat");
-				var _oriMatch = _oriRepeat.match(COLLECTION_MATCH)[2];
-				var _tgtMatch = _tgtRepeat.match(COLLECTION_MATCH)[2];
-				var _oriCollection = _oriScope.$parent.$eval(_oriMatch);
-				var _tgtCollection = _tgtScope.$parent.$eval(_tgtMatch);
-				var _oriIndex = $.inArray(_oriCollection[_oriScope.$index], _oriSortableScope.ngModel);
-				var _tgtIndex = $.inArray(_tgtCollection[_tgtScope.$index], _tgtSortableScope.ngModel);
-
-				var _oriUnit = _oriSortableScope.ngModel[_oriIndex];
-				var _tgtUnit = _tgtSortableScope.ngModel[_tgtIndex];
-				_oriSortableScope.ngModel[_oriIndex] = _tgtUnit;
-				_tgtSortableScope.ngModel[_tgtIndex] = _oriUnit;
-
-				// Trigger event
-				_oriHolder.change(_oriUnit, _tgtUnit);
-				if (_oriHolder !== _tgtHolder) _tgtHolder.change(_oriUnit, _tgtUnit);
-
-				$rootScope.$apply();
-			}
-		}
-
-		if(_mockElement) _mockElement.remove();
-
-		_overElement = null;
-		_selectElement = null;
-		_mockElement = null;
-	});
-
-	return {
-		require: 'ngModel',
-		restrict : 'AE',
-		scope: {
-			ngModel: "=",
-			sortableEnabled: "=?sortableEnabled",
-			sortableUpdateFunc: "=?sortableUpdateFunc"
-		},
-		link: function($scope, $element, $attrs, $ctrl) {
-			var _holder = {
-				scope: $scope,
-				change: function(source, target) {
-					if($scope.sortableUpdateFunc) $scope.sortableUpdateFunc(source, target);
-				}
-			};
-
-			$element.on("mousedown", ">", function(event) {
-				if($scope.sortableEnabled === false) return;
-
-				_selectElement = $(this);
-				_selectElement.holder = _holder;
-
-				_mouseDownPageX = event.pageX;
-				_mouseDownPageY = event.pageY;
-
-				event.preventDefault();
-			});
-
-			$element.on("mousemove", ">", function(event) {
-				if(_selectElement && !_move && common.math.distance(_mouseDownPageX, _mouseDownPageY, event.pageX, event.pageY) > 10) {
-					_move = true;
-					_overElement = _selectElement;
-					_overElement.addClass("sortable-enter");
-
-					doMock(_selectElement, event);
-				}
-			});
-
-			$element.on("mouseenter", ">", function() {
-				if(!_move) return;
-				_overElement = $(this);
-				_overElement.holder = _holder;
-				_overElement.addClass("sortable-enter");
-			});
-			$element.on("mouseleave", ">", function() {
-				if(!_move) return;
-				$(this).removeClass("sortable-enter");
-				_overElement = null;
-			});
-		},
-		replace: false
-	};
-});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/components/tabs.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/components/tabs.js b/eagle-webservice/src/main/webapp/_app/public/js/components/tabs.js
deleted file mode 100644
index 21c4a4a..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/components/tabs.js
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-eagleComponents.directive('tabs', function() {
-	'use strict';
-
-	return {
-		restrict: 'AE',
-		transclude: {
-			'header': '?header',
-			'pane': 'pane',
-			'footer': '?footer'
-		},
-		scope : {
-			title: "@?title",
-			icon: "@",
-			selected: "@?selected",
-			holder: "=?holder",
-			sortableModel: "=?sortableModel",
-
-			menuList: "=?menu"
-		},
-
-		controller: function($scope, $element, $attrs, $timeout) {
-			var transDuration = $.fn.tab.Constructor.TRANSITION_DURATION;
-			var transTimer = null;
-			var _holder, _holder_updateTimes;
-
-			var $header, $footer;
-
-			$scope.paneList = [];
-			$scope.selectedPane = null;
-			$scope.inPane = null;
-			$scope.activePane = null;
-
-			// ================== Function ==================
-			$scope.getPaneList = function() {
-				return !$scope.title ? $scope.paneList : $scope.paneList.slice().reverse();
-			};
-
-			$scope.setSelect = function(pane) {
-				if(typeof pane === "string") {
-					pane = common.array.find(pane, $scope.paneList, "title");
-				} else if(typeof pane === "number") {
-					pane = (pane + $scope.paneList.length) % $scope.paneList.length;
-					pane = $scope.paneList[pane];
-				}
-
-				$scope.activePane = $scope.selectedPane || pane;
-				$scope.selectedPane = pane;
-				$scope.inPane = null;
-
-				if(transTimer) $timeout.cancel(transTimer);
-				transTimer = $timeout(function() {
-					$scope.activePane = $scope.selectedPane;
-					$scope.inPane = $scope.selectedPane;
-				}, transDuration);
-			};
-
-			$scope.getMenuList = function() {
-				if($scope.selectedPane && $scope.selectedPane.menuList) {
-					return $scope.selectedPane.menuList;
-				}
-				return $scope.menuList;
-			};
-
-			$scope.tabSwitchUpdate = function (src, tgt) {
-				var _srcIndex = $.inArray(src.data, $scope.sortableModel);
-				var _tgtIndex = $.inArray(tgt.data, $scope.sortableModel);
-
-				if(_srcIndex !== -1 && _tgtIndex !== -1) {
-					$scope.sortableModel[_srcIndex] = tgt.data;
-					$scope.sortableModel[_tgtIndex] = src.data;
-				}
-			};
-
-			// =================== Linker ===================
-			function _linkerProperties(pane) {
-				Object.defineProperties(pane, {
-					selected: {
-						get: function () {
-							return $scope.selectedPane === this;
-						}
-					},
-					active: {
-						get: function () {
-							return $scope.activePane === this;
-						}
-					},
-					in: {
-						get: function () {
-							return $scope.inPane === this;
-						}
-					}
-				});
-			}
-
-			this.addPane = function(pane) {
-				$scope.paneList.push(pane);
-
-				// Register properties
-				_linkerProperties(pane);
-
-				// Update select pane
-				if(pane.title === $scope.selected || !$scope.selectedPane) {
-					$scope.setSelect(pane);
-				}
-			};
-
-			this.deletePane = function(pane) {
-				common.array.remove(pane, $scope.paneList);
-
-				if($scope.selectedPane === pane) {
-					$scope.selectedPane = $scope.activePane = $scope.inPane = $scope.paneList[0];
-				}
-			};
-
-			// ===================== UI =====================
-			$header = $element.find("> .nav-tabs-custom > .box-body");
-			$footer = $element.find("> .nav-tabs-custom > .box-footer");
-
-			$scope.hasHeader = function() {
-				return !!$header.children().length;
-			};
-			$scope.hasFooter = function() {
-				return !!$footer.children().length;
-			};
-
-			// ================= Interface ==================
-			_holder_updateTimes = 0;
-			_holder = {
-				scope: $scope,
-				element: $element,
-				setSelect: $scope.setSelect
-			};
-
-			Object.defineProperty(_holder, 'selectedPane', {
-				get: function() {return $scope.selectedPane;}
-			});
-
-			$scope.$watch("holder", function(newValue, oldValue) {
-				// Holder times update
-				setTimeout(function() {
-					_holder_updateTimes = 0;
-				}, 0);
-				_holder_updateTimes += 1;
-				if(_holder_updateTimes > 100) throw "Holder conflict";
-
-				$scope.holder = _holder;
-			});
-		},
-
-		template :
-			'<div class="nav-tabs-custom">' +
-				// Menu
-				'<div class="box-tools pull-right" ng-if="getMenuList() && getMenuList().length">' +
-					'<div ng-repeat="menu in getMenuList() track by $index" class="inline">' +
-						// Button
-						'<button class="btn btn-box-tool" ng-click="menu.func($event)" ng-if="!menu.list"' +
-							' uib-tooltip="{{menu.title}}" tooltip-enable="menu.title" tooltip-append-to-body="true">' +
-							'<span class="fa fa-{{menu.icon}}"></span>' +
-						'</button>' +
-
-						// Dropdown Group
-						'<div class="btn-group" ng-if="menu.list">' +
-							'<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"' +
-								' uib-tooltip="{{menu.title}}" tooltip-enable="menu.title" tooltip-append-to-body="true">' +
-								'<span class="fa fa-{{menu.icon}}"></span>' +
-							'</button>' +
-							'<ul class="dropdown-menu left" role="menu">' +
-								'<li ng-repeat="item in menu.list track by $index" ng-class="{danger: item.danger, disabled: item.disabled}">' +
-									'<a ng-click="!item.disabled && item.func($event)" ng-class="{strong: item.strong}">' +
-										'<span class="fa fa-{{item.icon}}"></span> {{item.title}}' +
-									'</a>' +
-								'</li>' +
-							'</ul>' +
-						'</div>' +
-					'</div>' +
-				'</div>' +
-
-				'<ul uie-sortable sortable-enabled="!!sortableModel" sortable-update-func="tabSwitchUpdate" ng-model="paneList" class="nav nav-tabs" ng-class="{\'pull-right\': title}">' +
-					// Tabs
-					'<li ng-repeat="pane in getPaneList() track by $index" ng-class="{active: selectedPane === pane}">' +
-						'<a ng-click="setSelect(pane);">{{pane.title}}</a>' +
-					'</li>' +
-
-					// Title
-					'<li class="pull-left header" ng-if="title">' +
-						'<i class="fa fa-{{icon}}" ng-if="icon"></i> {{title}}' +
-					'</li>' +
-
-				'</ul>' +
-				'<div class="box-body" ng-transclude="header" ng-show="paneList.length && hasHeader()"></div>' +
-				'<div class="tab-content" ng-transclude="pane"></div>' +
-				'<div class="box-footer" ng-transclude="footer" ng-show="paneList.length && hasFooter()"></div>' +
-			'</div>'
-	};
-}).directive('pane', function() {
-	'use strict';
-
-	return {
-		require : '^tabs',
-		restrict : 'AE',
-		transclude : true,
-		scope : {
-			title : '@',
-			data: '=?data',
-			menuList: "=?menu"
-		},
-		link : function(scope, element, attrs, tabsController) {
-			tabsController.addPane(scope);
-			scope.$on('$destroy', function() {
-				tabsController.deletePane(scope);
-			});
-		},
-		template : '<div class="tab-pane fade" ng-class="{active: active, in: in}" ng-transclude></div>',
-		replace : true
-	};
-}).directive('footer', function() {
-	'use strict';
-
-	return {
-		require : '^tabs',
-		restrict : 'AE',
-		transclude : true,
-		scope : {},
-		controller: function($scope, $element) {
-		},
-		template : '<div ng-transclude></div>',
-		replace : true
-	};
-});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/ctrl/authController.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/ctrl/authController.js b/eagle-webservice/src/main/webapp/_app/public/js/ctrl/authController.js
deleted file mode 100644
index dbdb704..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/ctrl/authController.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var eagleControllers = angular.module('eagleControllers');
-	// =============================================================
-	// =                     User Profile List                     =
-	// =============================================================
-	eagleControllers.controller('authLoginCtrl', function (PageConfig, Site, Authorization, Application, $scope) {
-		PageConfig.hideSidebar = true;
-		PageConfig.hideApplication = true;
-		PageConfig.hideSite = true;
-		PageConfig.hideUser = true;
-
-		$scope.username = "";
-		$scope.password = "";
-		$scope.lock = false;
-		$scope.loginSuccess = false;
-
-		if(localStorage) {
-			$scope.rememberUser = localStorage.getItem("rememberUser") !== "false";
-
-			if($scope.rememberUser) {
-				$scope.username = localStorage.getItem("username");
-				$scope.password = localStorage.getItem("password");
-			}
-		}
-
-		// UI
-		setTimeout(function () {
-			$("#username").focus();
-		});
-
-		// Login
-		$scope.login = function (event, forceSubmit) {
-			if ($scope.lock) return;
-
-			if (event.which === 13 || forceSubmit) {
-				$scope.lock = true;
-
-				Authorization.login($scope.username, $scope.password).then(function (success) {
-					if (success) {
-						// Check user remember
-						localStorage.setItem("rememberUser", $scope.rememberUser);
-						if($scope.rememberUser) {
-							localStorage.setItem("username", $scope.username);
-							localStorage.setItem("password", $scope.password);
-						} else {
-							localStorage.removeItem("username");
-							localStorage.removeItem("password");
-						}
-
-						// Initial environment
-						$scope.loginSuccess = true;
-						console.log("[Login] Login success! Reload data...");
-						Authorization.reload().then(function() {}, function() {console.warn("Site error!");});
-						Application.reload().then(function() {}, function() {console.warn("Site error!");});
-						Site.reload().then(function() {}, function() {console.warn("Site error!");});
-						Authorization.path(true);
-					} else {
-						$.dialog({
-							title: "OPS",
-							content: "User name or password not correct."
-						}).on("hidden.bs.modal", function () {
-							$("#username").focus();
-						});
-					}
-				}).finally(function () {
-					$scope.lock = false;
-				});
-			}
-		};
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/ctrl/configurationController.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/ctrl/configurationController.js b/eagle-webservice/src/main/webapp/_app/public/js/ctrl/configurationController.js
deleted file mode 100644
index e59198d..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/ctrl/configurationController.js
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var eagleControllers = angular.module('eagleControllers');
-
-	// =============================================================
-	// =                         Function                          =
-	// =============================================================
-	function watchEdit($scope, key) {
-		$scope.changed = false;
-		setTimeout(function() {
-			var _func = $scope.$watch(key, function(newValue, oldValue) {
-				if(angular.equals(newValue, oldValue)) return;
-				$scope.changed = true;
-				_func();
-			}, true);
-		}, 100);
-	}
-
-	// =============================================================
-	// =                       Configuration                       =
-	// =============================================================
-	// ========================== Feature ==========================
-	eagleControllers.controller('configFeatureCtrl', function ($scope, PageConfig, Application, Entities, UI) {
-		PageConfig.hideApplication = true;
-		PageConfig.hideSite = true;
-		$scope._pageLock = false;
-
-		PageConfig
-			.addNavPath("Home", "/")
-			.addNavPath("Feature Config");
-
-		// ================== Feature ==================
-		// Current feature
-		$scope.feature = Application.featureList[0];
-		$scope.setFeature = function (feature) {
-			$scope.feature = feature;
-		};
-
-		// Feature list
-		$scope.features = {};
-		$.each(Application.featureList, function(i, feature) {
-			$scope.features[feature.tags.feature] = $.extend({}, feature, true);
-		});
-
-		// Create feature
-		$scope.newFeature = function() {
-			UI.createConfirm("Feature", {}, [
-				{name: "Feature Name", field: "name"}
-			], function(entity) {
-				if(entity.name && $.map($scope.features, function(feature, name) {
-						return name.toUpperCase() === entity.name.toUpperCase() ? true : null;
-					}).length) {
-					return "Feature name conflict!";
-				}
-			}).then(null, null, function(holder) {
-				Entities.updateEntity(
-					"FeatureDescService",
-					{tags: {feature: holder.entity.name}},
-					{timestamp: false}
-				)._promise.then(function() {
-					holder.closeFunc();
-					location.reload();
-				});
-			});
-		};
-
-		// Delete feature
-		$scope.deleteFeature = function(feature) {
-			UI.deleteConfirm(feature.tags.feature).then(null, null, function(holder) {
-				Entities.delete("FeatureDescService", {feature: feature.tags.feature})._promise.then(function() {
-					holder.closeFunc();
-					location.reload();
-				});
-			});
-		};
-
-		// Save feature
-		$scope.saveAll = function() {
-			$scope._pageLock = true;
-			var _list = $.map($scope.features, function(feature) {
-				return feature;
-			});
-			Entities.updateEntity("FeatureDescService", _list, {timestamp: false})._promise.success(function() {
-				location.reload();
-			}).finally(function() {
-				$scope._pageLock = false;
-			});
-		};
-
-		// Watch config update
-		watchEdit($scope, "features");
-	});
-
-	// ======================== Application ========================
-	eagleControllers.controller('configApplicationCtrl', function ($scope, $timeout, PageConfig, Application, Entities, Feature, UI) {
-		PageConfig.hideApplication = true;
-		PageConfig.hideSite = true;
-		$scope._pageLock = false;
-
-		PageConfig
-			.addNavPath("Home", "/")
-			.addNavPath("Application Config");
-
-		// ================ Application ================
-		// Current application
-		$scope.application = Application.list[0];
-		$scope.setApplication = function (application) {
-			$scope.application = application;
-		};
-
-		// Application list
-		$scope.applications = {};
-		$.each(Application.list, function(i, application) {
-			var _application = $scope.applications[application.tags.application] = $.extend({}, application, {features: application.features.slice()}, true);
-			_application.optionalFeatures = $.map(Application.featureList, function(feature) {
-				var featurePlugin = Feature.get(feature.tags.feature);
-				if(featurePlugin.config.global) return null;
-				if(!common.array.find(feature.tags.feature, _application.features)) {
-					return feature.tags.feature;
-				}
-			});
-		});
-
-		// Create application
-		$scope.newApplication = function() {
-			UI.createConfirm("Application", {}, [
-				{name: "Application Name", field: "name"}
-			], function(entity) {
-				if(entity.name && $.map($scope.applications, function(application, name) {
-						return name.toUpperCase() === entity.name.toUpperCase() ? true : null;
-					}).length) {
-					return "Application name conflict!";
-				}
-			}).then(null, null, function(holder) {
-				Entities.updateEntity(
-					"ApplicationDescService",
-					{tags: {application: holder.entity.name}},
-					{timestamp: false}
-				)._promise.then(function() {
-					holder.closeFunc();
-					location.reload();
-				});
-			});
-		};
-
-		// Delete application
-		$scope.deleteApplication = function(application) {
-			UI.deleteConfirm(application.tags.application).then(null, null, function(holder) {
-				Entities.delete("ApplicationDescService", {application: application.tags.application})._promise.then(function() {
-					holder.closeFunc();
-					location.reload();
-				});
-			});
-		};
-
-		// ================= Function ==================
-		// Configuration check
-		$scope.configCheck = function(config) {
-			if(config && !common.parseJSON(config, false)) {
-				return "Invalid JSON format";
-			}
-		};
-
-		// Feature
-		$scope._feature = "";
-		function highlightFeature(feature) {
-			$scope._feature = feature;
-
-			$timeout(function() {
-				$scope._feature = "";
-			}, 100);
-		}
-
-		$scope.addFeature = function(feature, application) {
-			application.features.push(feature);
-			common.array.remove(feature, application.optionalFeatures);
-			highlightFeature(feature);
-			$scope.changed = true;
-		};
-
-		$scope.removeFeature = function(feature, application) {
-			application.optionalFeatures.push(feature);
-			common.array.remove(feature, application.features);
-			$scope.changed = true;
-		};
-
-		$scope.moveFeature = function(feature, list, offset) {
-			common.array.moveOffset(feature, list, offset);
-			highlightFeature(feature);
-			$scope.changed = true;
-		};
-
-		// Save feature
-		$scope.saveAll = function() {
-			$scope._pageLock = true;
-
-			var _list = $.map($scope.applications, function(application) {
-				return application;
-			});
-			Entities.updateEntity("ApplicationDescService", _list, {timestamp: false})._promise.success(function() {
-				location.reload();
-			}).finally(function() {
-				$scope._pageLock = false;
-			});
-		};
-
-		// Watch config update
-		watchEdit($scope, "applications");
-	});
-
-	// ============================ Site ===========================
-	eagleControllers.controller('configSiteCtrl', function ($scope, $timeout, PageConfig, Site, Application, Entities, UI) {
-		PageConfig.hideApplication = true;
-		PageConfig.hideSite = true;
-		$scope._pageLock = false;
-
-		PageConfig
-			.addNavPath("Home", "/")
-			.addNavPath("Site Config");
-
-		// =================== Site ====================
-		// Current site
-		$scope.site = Site.list[0];
-		$scope.setSite = function (site) {
-			$scope.site = site;
-		};
-
-
-		// Site list
-		$scope.sites = {};
-		$.each(Site.list, function(i, site) {
-			var _site = $scope.sites[site.tags.site] = $.extend({}, site, true);
-			var _applications = [];
-			var _optionalApplications = [];
-
-			Object.defineProperties(_site, {
-				applications: {
-					get: function() {return _applications;}
-				},
-				optionalApplications: {
-					get: function() {return _optionalApplications;}
-				}
-			});
-
-			$.each(Application.list, function(i, application) {
-				var _application = site.applicationList.set[application.tags.application];
-				if(_application && _application.enabled) {
-					_site.applications.push(_application);
-				} else {
-					if(_application) {
-						_site.optionalApplications.push(_application);
-					} else {
-						_site.optionalApplications.push({
-							prefix: "eagleSiteApplication",
-							config: "",
-							enabled: false,
-							tags: {
-								application: application.tags.application,
-								site: site.tags.site
-							}
-						});
-					}
-				}
-			});
-		});
-
-		// Create site
-		$scope.newSite = function() {
-			UI.createConfirm("Site", {}, [
-				{name: "Site Name", field: "name"}
-			], function(entity) {
-				if(entity.name && $.map($scope.sites, function(site, name) {
-						return name.toUpperCase() === entity.name.toUpperCase() ? true : null;
-					}).length) {
-					return "Site name conflict!";
-				}
-			}).then(null, null, function(holder) {
-				Entities.updateEntity(
-					"SiteDescService",
-					{enabled: true, tags: {site: holder.entity.name}},
-					{timestamp: false}
-				)._promise.then(function() {
-					holder.closeFunc();
-					location.reload();
-				});
-			});
-		};
-
-		// Delete site
-		$scope.deleteSite = function(site) {
-			UI.deleteConfirm(site.tags.site).then(null, null, function(holder) {
-				Entities.delete("SiteDescService", {site: site.tags.site})._promise.then(function() {
-					holder.closeFunc();
-					location.reload();
-				});
-			});
-		};
-
-		// ================= Function ==================
-		$scope._application = "";
-		function highlightApplication(application) {
-			$scope._application = application;
-
-			$timeout(function() {
-				$scope._application = "";
-			}, 100);
-		}
-
-		$scope.addApplication = function(application, site) {
-			site.applications.push(application);
-			common.array.remove(application, site.optionalApplications);
-			application.enabled = true;
-			highlightApplication(application);
-			$scope.changed = true;
-		};
-
-		$scope.removeApplication = function(application, site) {
-			site.optionalApplications.push(application);
-			common.array.remove(application, site.applications);
-			application.enabled = false;
-			$scope.changed = true;
-		};
-
-		$scope.setApplication = function(application) {
-			var _oriConfig = application.config;
-			UI.updateConfirm("Application", {config: _oriConfig}, [
-				{name: "Configuration", field: "config", type: "blob"}
-			], function(entity) {
-				if(entity.config !== "" && !common.properties.check(entity.config)) {
-					return "Invalid Properties format";
-				}
-			}).then(null, null, function(holder) {
-				application.config = holder.entity.config;
-				holder.closeFunc();
-				if(_oriConfig !== application.config) $scope.changed = true;
-			});
-		};
-
-		// Save feature
-		$scope.saveAll = function() {
-			$scope._pageLock = true;
-
-			var _list = $.map($scope.sites, function(site) {
-				var _clone = $.extend({applications: site.applications.concat(site.optionalApplications)}, site);
-				return _clone;
-			});
-
-			Entities.updateEntity("SiteDescService", _list, {timestamp: false, hook: true})._promise.success(function() {
-				location.reload();
-			}).finally(function() {
-				$scope._pageLock = false;
-			});
-		};
-
-		// Watch config update
-		watchEdit($scope, "sites");
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/ctrl/main.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/ctrl/main.js b/eagle-webservice/src/main/webapp/_app/public/js/ctrl/main.js
deleted file mode 100644
index 5064a1d..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/ctrl/main.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var eagleControllers = angular.module('eagleControllers', ['ui.bootstrap', 'eagle.components', 'eagle.service']);
-
-	// ===========================================================
-	// =                        Controller                       =
-	// ===========================================================
-	eagleControllers.controller('landingCtrl', function($scope, $wrapState, Site, Application, PageConfig, FeaturePageConfig, Feature) {
-		var _app = Application.current();
-
-		PageConfig.pageTitle = _app ? _app.displayName : 'OPS';
-		PageConfig.pageSubTitle = Site.current().tags.site;
-
-		$scope.Application = Application;
-
-		var _navItemList = FeaturePageConfig.pageList;
-		if(_navItemList.length) {
-			console.log("[Landing] Auto redirect.", FeaturePageConfig);
-			var _match = _navItemList[0].url.match(/#\/([^\/]+)\/([^\/]+)/);
-			Feature.go(_match[1], _match[2]);
-		}
-	});
-})();

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/js/srv/applicationSrv.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/js/srv/applicationSrv.js b/eagle-webservice/src/main/webapp/_app/public/js/srv/applicationSrv.js
deleted file mode 100644
index 187adb4..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/js/srv/applicationSrv.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var serviceModule = angular.module('eagle.service');
-	var eagleApp = angular.module('eagleApp');
-
-	serviceModule.service('Application', function($q, $location, $wrapState, Entities) {
-		var Application = {};
-		var _current;
-		var _featureCache = {};// After loading feature will be in cache. Which will not load twice.
-		var _deferred;
-
-		Application.list = [];
-		Application.list.set = {};
-		Application.featureList = [];
-		Application.featureList.set = {};
-
-		// Set current application
-		Application.current = function(app, reload) {
-			if(arguments.length && _current !== app) {
-				var _prev = _current;
-				_current = app;
-
-				if(sessionStorage && _current) {
-					sessionStorage.setItem("application", _current.tags.application);
-				}
-
-				if(_prev && reload !== false) {
-					console.log("[Application] Switch. Redirect to landing page.");
-					$wrapState.go('landing', true);
-				}
-			}
-			return _current;
-		};
-		Application.find = function(appName) {
-			return common.array.find(appName, Application.list, "tags.application");
-		};
-
-		Application.reload = function() {
-			_deferred = $q.defer();
-
-			if(Application.list && Application.list._promise) Application.list._promise.abort();
-			if(Application.featureList && Application.featureList._promise) Application.featureList._promise.abort();
-
-			Application.list = Entities.queryEntities("ApplicationDescService", '');
-			Application.list.set = {};
-			Application.featureList = Entities.queryEntities("FeatureDescService", '');
-			Application.featureList.set = {};
-
-			Application.featureList._promise.then(function() {
-				var _promiseList;
-				// Load feature script
-				_promiseList = $.map(Application.featureList, function(feature) {
-					var _ajax_deferred, _script;
-					if(_featureCache[feature.tags.feature]) return;
-
-					_featureCache[feature.tags.feature] = true;
-					_ajax_deferred = $q.defer();
-					_script = document.createElement('script');
-					_script.type = 'text/javascript';
-					_script.src = "public/feature/" + feature.tags.feature + "/controller.js?_=" + eagleApp._TRS();
-					document.head.appendChild(_script);
-					_script.onload = function() {
-						feature._loaded = true;
-						_ajax_deferred.resolve();
-					};
-					_script.onerror = function() {
-						feature._loaded = false;
-						_featureCache[feature.tags.feature] = false;
-						_ajax_deferred.reject();
-					};
-					return _ajax_deferred.promise;
-				});
-
-				// Merge application & feature
-				Application.list._promise.then(function() {
-					// Fill feature set
-					$.each(Application.featureList, function(i, feature) {
-						Application.featureList.set[feature.tags.feature] = feature;
-					});
-
-					// Fill application set
-					$.each(Application.list, function(i, application) {
-						Application.list.set[application.tags.application] = application;
-						application.features = application.features || [];
-						var _configObj = common.parseJSON(application.config, {});
-						var _appFeatureList = $.map(application.features, function(featureName) {
-							var _feature = Application.featureList.set[featureName];
-							if(!_feature) {
-								console.warn("[Application] Feature not mapping:", application.tags.application, "-", featureName);
-							} else {
-								return _feature;
-							}
-						});
-
-						// Find feature
-						_appFeatureList.find = function(featureName) {
-							return common.array.find(featureName, _appFeatureList, "tags.feature");
-						};
-
-						Object.defineProperties(application, {
-							featureList: {
-								get: function () {
-									return _appFeatureList;
-								}
-							},
-							// Get format group name. Will mark as 'Others' if no group defined
-							group: {
-								get: function () {
-									return this.groupName || "Others";
-								}
-							},
-							configObj: {
-								get: function() {
-									return _configObj;
-								}
-							},
-							displayName: {
-								get: function() {
-									return this.alias || this.tags.application;
-								}
-							}
-						});
-					});
-
-					// Set current application
-					if(!Application.current() && sessionStorage && Application.find(sessionStorage.getItem("application"))) {
-						Application.current(Application.find(sessionStorage.getItem("application")));
-					}
-				});
-
-				// Process all promise
-				$q.all(_promiseList.concat(Application.list._promise)).finally(function() {
-					_deferred.resolve(Application);
-				});
-			}, function() {
-				_deferred.reject(Application);
-			});
-
-			return _deferred.promise;
-		};
-
-		Application._promise = function() {
-			if(!_deferred) {
-				Application.reload();
-			}
-			return _deferred.promise;
-		};
-
-		return Application;
-	});
-})();
\ No newline at end of file


[07/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-spark-history/src/main/resources/META-INF/providers/org.apache.eagle.jpm.spark.history.SparkHistoryJobAppProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-spark-history/src/main/resources/META-INF/providers/org.apache.eagle.jpm.spark.history.SparkHistoryJobAppProvider.xml b/eagle-jpm/eagle-jpm-spark-history/src/main/resources/META-INF/providers/org.apache.eagle.jpm.spark.history.SparkHistoryJobAppProvider.xml
index 8c0d472..ef958cc 100644
--- a/eagle-jpm/eagle-jpm-spark-history/src/main/resources/META-INF/providers/org.apache.eagle.jpm.spark.history.SparkHistoryJobAppProvider.xml
+++ b/eagle-jpm/eagle-jpm-spark-history/src/main/resources/META-INF/providers/org.apache.eagle.jpm.spark.history.SparkHistoryJobAppProvider.xml
@@ -19,7 +19,6 @@
 <application>
     <type>SPARK_HISTORY_JOB_APP</type>
     <name>Spark History Job Monitor</name>
-    <version>0.5.0-incubating</version>
     <appClass>org.apache.eagle.jpm.spark.history.SparkHistoryJobApp</appClass>
     <configuration>
         <!-- topology config -->

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-spark-running/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-spark-running/pom.xml b/eagle-jpm/eagle-jpm-spark-running/pom.xml
index 9ff8410..61704d4 100644
--- a/eagle-jpm/eagle-jpm-spark-running/pom.xml
+++ b/eagle-jpm/eagle-jpm-spark-running/pom.xml
@@ -16,14 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-jpm-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>eagle-jpm-spark-running</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-spark-running/src/main/resources/META-INF/providers/org.apache.eagle.jpm.spark.running.SparkRunningJobAppProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-spark-running/src/main/resources/META-INF/providers/org.apache.eagle.jpm.spark.running.SparkRunningJobAppProvider.xml b/eagle-jpm/eagle-jpm-spark-running/src/main/resources/META-INF/providers/org.apache.eagle.jpm.spark.running.SparkRunningJobAppProvider.xml
index 0503d74..8c192fe 100644
--- a/eagle-jpm/eagle-jpm-spark-running/src/main/resources/META-INF/providers/org.apache.eagle.jpm.spark.running.SparkRunningJobAppProvider.xml
+++ b/eagle-jpm/eagle-jpm-spark-running/src/main/resources/META-INF/providers/org.apache.eagle.jpm.spark.running.SparkRunningJobAppProvider.xml
@@ -19,7 +19,6 @@
 <application>
     <type>SPARK_RUNNING_JOB_APP</type>
     <name>Spark Running Job Monitoring</name>
-    <version>0.5.0-incubating</version>
     <appClass>org.apache.eagle.jpm.spark.running.SparkRunningJobApp</appClass>
     <configuration>
         <!-- org.apache.eagle.jpm.spark.running.SparkRunningJobAppConfig -->

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-util/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-util/pom.xml b/eagle-jpm/eagle-jpm-util/pom.xml
index 198def3..73d5c5c 100644
--- a/eagle-jpm/eagle-jpm-util/pom.xml
+++ b/eagle-jpm/eagle-jpm-util/pom.xml
@@ -16,14 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-jpm-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>eagle-jpm-util</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-web/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-web/pom.xml b/eagle-jpm/eagle-jpm-web/pom.xml
index 9b8e4ba..6f223ca 100644
--- a/eagle-jpm/eagle-jpm-web/pom.xml
+++ b/eagle-jpm/eagle-jpm-web/pom.xml
@@ -15,13 +15,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-jpm-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>eagle-jpm-web</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/eagle-jpm-web/src/main/resources/META-INF/providers/org.apache.eagle.app.jpm.JPMWebApplicationProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-web/src/main/resources/META-INF/providers/org.apache.eagle.app.jpm.JPMWebApplicationProvider.xml b/eagle-jpm/eagle-jpm-web/src/main/resources/META-INF/providers/org.apache.eagle.app.jpm.JPMWebApplicationProvider.xml
index 222e306..5f59130 100644
--- a/eagle-jpm/eagle-jpm-web/src/main/resources/META-INF/providers/org.apache.eagle.app.jpm.JPMWebApplicationProvider.xml
+++ b/eagle-jpm/eagle-jpm-web/src/main/resources/META-INF/providers/org.apache.eagle.app.jpm.JPMWebApplicationProvider.xml
@@ -19,7 +19,6 @@
 <application>
     <type>JPM_WEB_APP</type>
     <name>Job Performance Monitoring Web </name>
-    <version>0.5.0-incubating</version>
     <viewPath>/apps/jpm</viewPath>
     <description>Job Performance Monitoring Web</description>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-jpm/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/pom.xml b/eagle-jpm/pom.xml
index be82acb..1ffdb03 100644
--- a/eagle-jpm/pom.xml
+++ b/eagle-jpm/pom.xml
@@ -18,13 +18,12 @@
   ~  */
   -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>eagle-jpm-parent</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-metric-collection/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-metric-collection/pom.xml b/eagle-security/eagle-metric-collection/pom.xml
index a74f51c..4283c41 100644
--- a/eagle-security/eagle-metric-collection/pom.xml
+++ b/eagle-security/eagle-metric-collection/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-security-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>eagle-metric-collection</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-common/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-common/pom.xml b/eagle-security/eagle-security-common/pom.xml
index 7910d3c..c2df42c 100644
--- a/eagle-security/eagle-security-common/pom.xml
+++ b/eagle-security/eagle-security-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-security-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>eagle-security-common</artifactId>
     <name>Eagle::App::Security::Common</name>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-hbase-auditlog/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hbase-auditlog/pom.xml b/eagle-security/eagle-security-hbase-auditlog/pom.xml
index 27a217e..6ee724d 100644
--- a/eagle-security/eagle-security-hbase-auditlog/pom.xml
+++ b/eagle-security/eagle-security-hbase-auditlog/pom.xml
@@ -18,12 +18,11 @@
   ~  */
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-security-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-hbase-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.hbase.HBaseAuditLogAppProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hbase-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.hbase.HBaseAuditLogAppProvider.xml b/eagle-security/eagle-security-hbase-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.hbase.HBaseAuditLogAppProvider.xml
index 403518a..18b2ed3 100644
--- a/eagle-security/eagle-security-hbase-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.hbase.HBaseAuditLogAppProvider.xml
+++ b/eagle-security/eagle-security-hbase-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.hbase.HBaseAuditLogAppProvider.xml
@@ -19,7 +19,6 @@
 <application>
     <type>HBASE_AUDIT_LOG_MONITOR</type>
     <name>Hbase Audit Log Monitor</name>
-    <version>0.5.0-incubating</version>
     <appClass>org.apache.eagle.security.hbase.HBaseAuditLogApplication</appClass>
     <configuration>
         <property>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-hbase-web/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hbase-web/pom.xml b/eagle-security/eagle-security-hbase-web/pom.xml
index 6bddb0b..56aa2bc 100644
--- a/eagle-security/eagle-security-hbase-web/pom.xml
+++ b/eagle-security/eagle-security-hbase-web/pom.xml
@@ -18,12 +18,11 @@
   ~  */
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-security-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-hdfs-auditlog/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hdfs-auditlog/pom.xml b/eagle-security/eagle-security-hdfs-auditlog/pom.xml
index 8a2e096..280b077 100644
--- a/eagle-security/eagle-security-hdfs-auditlog/pom.xml
+++ b/eagle-security/eagle-security-hdfs-auditlog/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-security-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>eagle-security-hdfs-auditlog</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml
index 90f9e5b..f82f8b3 100644
--- a/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml
+++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml
@@ -23,7 +23,6 @@
 <application>
     <type>HDFS_AUDIT_LOG_MONITOR_APP</type>
     <name>Hdfs Audit Log Monitor</name>
-    <version>0.5.0-incubating</version>
     <configuration>
         <!-- topology related configurations -->
         <property>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-hdfs-authlog/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hdfs-authlog/pom.xml b/eagle-security/eagle-security-hdfs-authlog/pom.xml
index 36d9b57..4b45504 100644
--- a/eagle-security/eagle-security-hdfs-authlog/pom.xml
+++ b/eagle-security/eagle-security-hdfs-authlog/pom.xml
@@ -17,12 +17,11 @@
   ~
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-security-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-hdfs-web/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hdfs-web/pom.xml b/eagle-security/eagle-security-hdfs-web/pom.xml
index 4cf29d9..672f6dd 100644
--- a/eagle-security/eagle-security-hdfs-web/pom.xml
+++ b/eagle-security/eagle-security-hdfs-web/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-security-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>eagle-security-hdfs-web</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-hive-web/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hive-web/pom.xml b/eagle-security/eagle-security-hive-web/pom.xml
index 3764280..7bae503 100644
--- a/eagle-security/eagle-security-hive-web/pom.xml
+++ b/eagle-security/eagle-security-hive-web/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-security-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>eagle-security-hive-web</artifactId>
     <name>Eagle::App::Security::HiveService</name>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-hive/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hive/pom.xml b/eagle-security/eagle-security-hive/pom.xml
index fbe0034..18114f3 100644
--- a/eagle-security/eagle-security-hive/pom.xml
+++ b/eagle-security/eagle-security-hive/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.eagle</groupId>
 		<artifactId>eagle-security-parent</artifactId>
-		<version>0.5.0-incubating-SNAPSHOT</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>eagle-security-hive</artifactId>
 	<name>Eagle::App::Security::HiveSecurity</name>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-hive/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HiveQueryMonitoringAppProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hive/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HiveQueryMonitoringAppProvider.xml b/eagle-security/eagle-security-hive/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HiveQueryMonitoringAppProvider.xml
index 1f61881..89fbfbd 100644
--- a/eagle-security/eagle-security-hive/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HiveQueryMonitoringAppProvider.xml
+++ b/eagle-security/eagle-security-hive/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HiveQueryMonitoringAppProvider.xml
@@ -18,7 +18,6 @@
 <application>
     <type>HiveQueryMonitoringApplication</type>
     <name>Hdfs Audit Log Monitoring Application</name>
-    <version>0.5.0-incubating</version>
     <appClass>org.apache.eagle.security.auditlog.HdfsAuditLogApplication</appClass>
     <viewPath>/apps/example</viewPath>
     <configuration>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-maprfs-auditlog/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-maprfs-auditlog/pom.xml b/eagle-security/eagle-security-maprfs-auditlog/pom.xml
index c349cd5..27a1608 100644
--- a/eagle-security/eagle-security-maprfs-auditlog/pom.xml
+++ b/eagle-security/eagle-security-maprfs-auditlog/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-security-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>eagle-security-maprfs-auditlog</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.MapRFSAuditLogAppProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.MapRFSAuditLogAppProvider.xml b/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.MapRFSAuditLogAppProvider.xml
index 074b828..768588e 100644
--- a/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.MapRFSAuditLogAppProvider.xml
+++ b/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.MapRFSAuditLogAppProvider.xml
@@ -23,8 +23,7 @@
 <application>
     <type>MAPR_HDFS_AUDIT_LOG_MONITOR_APP</type>
     <name>MapRFS Audit Log Monitoring Application</name>
-    <version>0.5.0-incubating</version>
-    <viewPath>/apps/example</viewPath>
+    <appClass>org.apache.eagle.security.auditlog.MapRFSAuditLogApplication</appClass>
     <configuration>
         <!-- topology related configurations -->
         <property>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-maprfs-web/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-maprfs-web/pom.xml b/eagle-security/eagle-security-maprfs-web/pom.xml
index af6d6ad..db6d7c1 100644
--- a/eagle-security/eagle-security-maprfs-web/pom.xml
+++ b/eagle-security/eagle-security-maprfs-web/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-security-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>eagle-security-maprfs-web</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-oozie-auditlog/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-oozie-auditlog/pom.xml b/eagle-security/eagle-security-oozie-auditlog/pom.xml
index 24412a6..2619783 100644
--- a/eagle-security/eagle-security-oozie-auditlog/pom.xml
+++ b/eagle-security/eagle-security-oozie-auditlog/pom.xml
@@ -18,12 +18,11 @@
   ~  */
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-security-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-oozie-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.oozie.parse.OozieAuditLogAppProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-oozie-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.oozie.parse.OozieAuditLogAppProvider.xml b/eagle-security/eagle-security-oozie-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.oozie.parse.OozieAuditLogAppProvider.xml
index 6ebe4a2..ee1715c 100644
--- a/eagle-security/eagle-security-oozie-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.oozie.parse.OozieAuditLogAppProvider.xml
+++ b/eagle-security/eagle-security-oozie-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.oozie.parse.OozieAuditLogAppProvider.xml
@@ -19,7 +19,6 @@
 <application>
     <type>OOZIE_AUDIT_LOG_MONITOR</type>
     <name>Oozie Audit Log Monitor</name>
-    <version>0.5.0-incubating</version>
     <appClass>org.apache.eagle.security.oozie.parse.OozieAuditLogApplication</appClass>
     <configuration>
         <!-- topology related configurations -->

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/eagle-security-oozie-web/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-oozie-web/pom.xml b/eagle-security/eagle-security-oozie-web/pom.xml
index f76ee0d..18897b3 100644
--- a/eagle-security/eagle-security-oozie-web/pom.xml
+++ b/eagle-security/eagle-security-oozie-web/pom.xml
@@ -16,13 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-security-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>eagle-security-oozie-web</artifactId>
     <name>Eagle::App::Security::OozieService</name>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-security/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/pom.xml b/eagle-security/pom.xml
index 29174f5..ed431af 100644
--- a/eagle-security/pom.xml
+++ b/eagle-security/pom.xml
@@ -18,13 +18,12 @@
   ~  */
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>eagle-security-parent</artifactId>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-server-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-server-assembly/pom.xml b/eagle-server-assembly/pom.xml
index 717f86e..56cff82 100644
--- a/eagle-server-assembly/pom.xml
+++ b/eagle-server-assembly/pom.xml
@@ -16,14 +16,12 @@
   ~ limitations under the License.
   -->
 
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>eagle-server-assembly</artifactId>
     <name>Eagle::Server::Assembly</name>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-server/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-server/pom.xml b/eagle-server/pom.xml
index 9a78b54..6bb9fbd 100644
--- a/eagle-server/pom.xml
+++ b/eagle-server/pom.xml
@@ -17,13 +17,11 @@
   ~
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>eagle-server</artifactId>
@@ -228,14 +226,12 @@
                  ========================================================================================================= -->
 
             <dependencies>
-                <!-- App: Example Application -->
                 <dependency>
                     <groupId>org.apache.eagle</groupId>
                     <artifactId>eagle-app-example</artifactId>
                     <version>${project.version}</version>
                 </dependency>
 
-                <!-- App: HBase Security Monitoring -->
                 <dependency>
                     <groupId>org.apache.eagle</groupId>
                     <artifactId>eagle-security-hbase-auditlog</artifactId>
@@ -253,7 +249,6 @@
                     <version>${project.version}</version>
                 </dependency>
 
-                <!-- App: Oozie  Auditlog monitoring -->
                 <dependency>
                     <groupId>org.apache.eagle</groupId>
                     <artifactId>eagle-security-oozie-auditlog</artifactId>
@@ -275,7 +270,6 @@
                     </exclusions>
                 </dependency>
 
-                <!-- App: hdfs audit log monitoring -->
                 <dependency>
                     <groupId>org.apache.eagle</groupId>
                     <artifactId>eagle-security-hdfs-auditlog</artifactId>
@@ -287,14 +281,12 @@
                     <version>${project.version}</version>
                 </dependency>
 
-                <!-- App: GC log monitoring -->
                 <dependency>
                     <groupId>org.apache.eagle</groupId>
                     <artifactId>eagle-gc</artifactId>
                     <version>${project.version}</version>
                 </dependency>
 
-                <!--App: Job Performance Monitoring -->
                 <dependency>
                     <groupId>org.apache.eagle</groupId>
                     <artifactId>eagle-jpm-web</artifactId>
@@ -326,13 +318,12 @@
                     <version>${project.version}</version>
                 </dependency>
 
-                <!-- App: Hadoop Queue Running Monitoring-->
                 <dependency>
                     <groupId>org.apache.eagle</groupId>
                     <artifactId>eagle-hadoop-queue</artifactId>
                     <version>${project.version}</version>
                 </dependency>
-                
+
                 <!-- add topology health check-->
                 <dependency>
                     <groupId>org.apache.eagle</groupId>
@@ -340,7 +331,6 @@
                     <version>${project.version}</version>
                 </dependency>
 
-                <!--- App: HadoopMetricMonitorApp -->
                 <dependency>
                     <groupId>org.apache.eagle</groupId>
                     <artifactId>eagle-hadoop-metric</artifactId>
@@ -370,4 +360,4 @@
             </resource>
         </resources>
     </build>
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-topology-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-topology-assembly/pom.xml b/eagle-topology-assembly/pom.xml
index 126e4f0..7699936 100644
--- a/eagle-topology-assembly/pom.xml
+++ b/eagle-topology-assembly/pom.xml
@@ -23,13 +23,12 @@
   ~ like mvn clean install -Phadoop-2.7
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.eagle</groupId>
         <artifactId>eagle-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>eagle-topology-assembly</artifactId>
     <name>Eagle::App::Assembly</name>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-topology-check/eagle-topology-app/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-topology-check/eagle-topology-app/pom.xml b/eagle-topology-check/eagle-topology-app/pom.xml
index 966ac85..913003d 100644
--- a/eagle-topology-check/eagle-topology-app/pom.xml
+++ b/eagle-topology-check/eagle-topology-app/pom.xml
@@ -17,13 +17,11 @@
   ~
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-topology-check</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-topology-check/eagle-topology-app/src/main/resources/META-INF/providers/org.apache.eagle.topology.TopologyCheckAppProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-topology-check/eagle-topology-app/src/main/resources/META-INF/providers/org.apache.eagle.topology.TopologyCheckAppProvider.xml b/eagle-topology-check/eagle-topology-app/src/main/resources/META-INF/providers/org.apache.eagle.topology.TopologyCheckAppProvider.xml
index b4e3695..c5a0e84 100644
--- a/eagle-topology-check/eagle-topology-app/src/main/resources/META-INF/providers/org.apache.eagle.topology.TopologyCheckAppProvider.xml
+++ b/eagle-topology-check/eagle-topology-app/src/main/resources/META-INF/providers/org.apache.eagle.topology.TopologyCheckAppProvider.xml
@@ -20,7 +20,6 @@
 <application>
     <type>TOPOLOGY_HEALTH_CHECK_APP</type>
     <name>Topology Health Check</name>
-    <version>0.5.0-incubating</version>
     <configuration>
         <!-- org.apache.eagle.topology.TopologyCheckApp -->
         <property>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-topology-check/eagle-topology-entity/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-topology-check/eagle-topology-entity/pom.xml b/eagle-topology-check/eagle-topology-entity/pom.xml
index 4f692e9..d2762c8 100644
--- a/eagle-topology-check/eagle-topology-entity/pom.xml
+++ b/eagle-topology-check/eagle-topology-entity/pom.xml
@@ -17,13 +17,11 @@
   ~
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-topology-check</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-topology-check/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-topology-check/pom.xml b/eagle-topology-check/pom.xml
index c7d8bdf..46923db 100644
--- a/eagle-topology-check/pom.xml
+++ b/eagle-topology-check/pom.xml
@@ -17,13 +17,11 @@
   ~
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eagle-parent</artifactId>
         <groupId>org.apache.eagle</groupId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/.gitignore
----------------------------------------------------------------------
diff --git a/eagle-webservice/.gitignore b/eagle-webservice/.gitignore
deleted file mode 100644
index b875523..0000000
--- a/eagle-webservice/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/bin/
-/target/
-node_modules
-ui
-tmp
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/WebContent/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/eagle-webservice/WebContent/META-INF/MANIFEST.MF b/eagle-webservice/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e94951..0000000
--- a/eagle-webservice/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-webservice/pom.xml b/eagle-webservice/pom.xml
deleted file mode 100644
index e591bc6..0000000
--- a/eagle-webservice/pom.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Licensed to the Apache Software Foundation (ASF) under one or more 
-	~ contributor license agreements. See the NOTICE file distributed with ~ 
-	this work for additional information regarding copyright ownership. ~ The 
-	ASF licenses this file to You under the Apache License, Version 2.0 ~ (the 
-	"License"); you may not use this file except in compliance with ~ the License. 
-	You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 
-	~ ~ Unless required by applicable law or agreed to in writing, software ~ 
-	distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT 
-	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the 
-	License for the specific language governing permissions and ~ limitations 
-	under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.eagle</groupId>
-        <artifactId>eagle-parent</artifactId>
-        <version>0.5.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>eagle-webservice</artifactId>
-    <packaging>war</packaging>
-    <name>eagle-webservice</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>eagle-service-base</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>log4j-over-slf4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>servlet-api</artifactId>
-                    <groupId>javax.servlet</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>servlet-api</artifactId>
-                    <groupId>org.mortbay.jetty</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>eagle-storage-hbase</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>log4j-over-slf4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>servlet-api</artifactId>
-                    <groupId>javax.servlet</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>servlet-api-2.5</artifactId>
-                    <groupId>org.mortbay.jetty</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>eagle-storage-jdbc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- jersey needs asm3, so use extcos 0.3b -->
-        <dependency>
-            <groupId>net.sf.extcos</groupId>
-            <artifactId>extcos</artifactId>
-            <!--<version>${extcos3.version}</version>-->
-            <version>${extcos4.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm-all</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>eagle-security-hbase-web</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-commons</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-tree</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>servlet-api</artifactId>
-                    <groupId>javax.servlet</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>eagle-security-hive-web</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-commons</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-tree</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>servlet-api</artifactId>
-                    <groupId>javax.servlet</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>eagle-security-oozie-web</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-commons</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-tree</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>servlet-api</artifactId>
-                    <groupId>javax.servlet</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>eagle-security-hdfs-web</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>eagle-security-maprfs-web</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>eagle-topology-assembly</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.quartz-scheduler</groupId>
-                    <artifactId>quartz</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- eagle user profile common dependency -->
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>eagle-alert-service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.siddhi</groupId>
-            <artifactId>siddhi-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.siddhi</groupId>
-            <artifactId>siddhi-extension-string</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Spring framework -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.framework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring.framework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <version>${spring.framework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.framework.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.framework.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${spring.framework.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.framework.version}</version>
-        </dependency>
-
-        <!-- Spring Security -->
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-            <version>${spring.framework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${spring.framework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${spring.framework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-acl</artifactId>
-            <version>${spring.framework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-ldap</artifactId>
-            <version>${spring.framework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet-api.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Integrate next generation alert engine service -->
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>alert-coordinator</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-commons</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-tree</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>servlet-api</artifactId>
-                    <groupId>javax.servlet</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.eagle</groupId>
-            <artifactId>alert-metadata-service</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-commons</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-tree</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>servlet-api</artifactId>
-                    <groupId>javax.servlet</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-    <build>
-        <finalName>eagle-service</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat7-maven-plugin</artifactId>
-                <configuration>
-                    <path>eagle-service</path>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>exec-ui-install</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>bash</executable>
-                            <arguments>
-                                <argument>${basedir}/ui-build.sh</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <packagingExcludes>
-                        app/,
-                        node_modules/,
-                        grunt.json,
-                        Gruntfile.js,
-                        package.json
-                    </packagingExcludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthenticationResource.java
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthenticationResource.java b/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthenticationResource.java
deleted file mode 100644
index 773c1cb..0000000
--- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthenticationResource.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.security.auth;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-/**
- * @since 10/5/15
- */
-@Path("authentication")
-public class AuthenticationResource {
-    private final static Logger LOG = LoggerFactory.getLogger(AuthenticationResource.class);
-
-    @GET
-    @Produces({MediaType.APPLICATION_JSON})
-    public Response authenticate() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (authentication == null) {
-            LOG.warn("Authentication is null, forbidden");
-            return Response.status(Response.Status.FORBIDDEN).build();
-        }
-        return Response.ok(authentication.getPrincipal()).build();
-    }
-
-    @POST
-    @Produces({MediaType.APPLICATION_JSON})
-    public Response authenticateByPOST(){
-        return authenticate();
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthenticationResult.java
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthenticationResult.java b/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthenticationResult.java
deleted file mode 100644
index e60010d..0000000
--- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthenticationResult.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.security.auth;
-
-/**
- * @since 10/5/15
- */
-public class AuthenticationResult {
-    private boolean success;
-
-    public AuthenticationResult(boolean success, String message) {
-        this.success = success;
-        this.message = message;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    private String message;
-}

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthoritiesPopulator.java
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthoritiesPopulator.java b/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthoritiesPopulator.java
deleted file mode 100644
index 95eb047..0000000
--- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/AuthoritiesPopulator.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package org.apache.eagle.service.security.auth;
-
-
-import org.springframework.ldap.core.ContextSource;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class AuthoritiesPopulator extends DefaultLdapAuthoritiesPopulator {
-
-    String adminRole;
-    SimpleGrantedAuthority adminRoleAsAuthority;
-
-    SimpleGrantedAuthority adminAuthority = new SimpleGrantedAuthority("ROLE_ADMIN");
-    SimpleGrantedAuthority defaultAuthority = new SimpleGrantedAuthority("ROLE_USER");
-
-    /**
-     * @param contextSource
-     * @param groupSearchBase
-     */
-    public AuthoritiesPopulator(ContextSource contextSource, String groupSearchBase, String adminRole, String defaultRole) {
-        super(contextSource, groupSearchBase);
-        this.adminRole = adminRole;
-        this.adminRoleAsAuthority = new SimpleGrantedAuthority(adminRole);
-    }
-
-    @Override
-    public Set<GrantedAuthority> getGroupMembershipRoles(String userDn, String username) {
-        Set<GrantedAuthority> authorities = super.getGroupMembershipRoles(userDn, username);
-        Set<GrantedAuthority> newAuthorities = new HashSet<>();
-
-        if (authorities.contains(adminRoleAsAuthority)) {
-            newAuthorities.add(adminAuthority);
-        } else {
-            newAuthorities.add(defaultAuthority);
-        }
-
-        return newAuthorities;
-    }
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/LogoutSuccessHandlerImpl.java
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/LogoutSuccessHandlerImpl.java b/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/LogoutSuccessHandlerImpl.java
deleted file mode 100644
index 0db1b4c..0000000
--- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/LogoutSuccessHandlerImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.security.auth;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-/**
- * @since 10/5/15
- */
-public class LogoutSuccessHandlerImpl extends SimpleUrlLogoutSuccessHandler {
-    @Override
-    public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
-        PrintWriter writer = response.getWriter();
-        ObjectMapper mapper = new ObjectMapper();
-        if(authentication!=null && authentication.isAuthenticated()) {
-            response.setStatus(HttpServletResponse.SC_OK);
-            writer.write(mapper.writeValueAsString(new AuthenticationResult(true, "Successfully logout session for user \"" + authentication.getName()+"\"")));
-        }else{
-            response.setStatus(HttpServletResponse.SC_OK);
-            writer.write(mapper.writeValueAsString(new AuthenticationResult(true, "Session is not authenticated")));
-        }
-        writer.flush();
-        writer.close();
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/MonitorResource.java
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/MonitorResource.java b/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/MonitorResource.java
deleted file mode 100644
index 5da87ba..0000000
--- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/MonitorResource.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.security.auth;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * @since 15/12/15
- */
-@Path("/status")
-public class MonitorResource {
-	
-	public static class ServerStatus {
-		@JsonProperty
-		public String status = "OK";
-	}
-
-	@GET
-	@Produces({ MediaType.APPLICATION_JSON })
-	public Response get() {
-		// TODO : add server management/throttling reflection here.
-		return Response.ok(new ServerStatus()).build();
-	}
-}

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/package-info.java
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/package-info.java b/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/package-info.java
deleted file mode 100644
index db56e4a..0000000
--- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/auth/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * <h1>Eagle Web Service Security</h1>
- *
- * <b>Customize Spring Security Process to support eagle REST web service in more efficient way</b>
- */
-package org.apache.eagle.service.security.auth;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/ApplicationSchedulerListener.java
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/ApplicationSchedulerListener.java b/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/ApplicationSchedulerListener.java
deleted file mode 100644
index 3ef9756..0000000
--- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/ApplicationSchedulerListener.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package org.apache.eagle.service.security.profile;
-
-
-import akka.actor.ActorSystem;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-import org.apache.eagle.service.application.AppManagerConstants;
-import org.apache.eagle.stream.application.scheduler.ApplicationScheduler;
-import org.apache.hadoop.yarn.api.ApplicationConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import scala.concurrent.duration.Duration;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import java.util.concurrent.TimeUnit;
-
-public class ApplicationSchedulerListener implements ServletContextListener {
-    private static final Logger LOG = LoggerFactory.getLogger(ApplicationSchedulerListener.class);
-
-    //@Autowired
-    private ActorSystem system;
-
-    @Override
-    public void contextInitialized(ServletContextEvent servletContextEvent) {
-        //Get the actor system from the spring context
-        //SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
-        Config config = ConfigFactory.load("eagle-scheduler.conf");
-        if(config.hasPath(AppManagerConstants.APP_COMMAND_LOADER_ENABLED) && config.getBoolean(AppManagerConstants.APP_COMMAND_LOADER_ENABLED)) {
-            system = new ApplicationScheduler().start(config);
-        }
-    }
-
-    @Override
-    public void contextDestroyed(ServletContextEvent servletContextEvent) {
-        if (system != null) {
-            LOG.info("Killing ActorSystem as a part of web application ctx destruction.");
-            system.shutdown();
-            system.awaitTermination(Duration.create(15, TimeUnit.SECONDS));
-        } else {
-            LOG.warn("No actor system loaded, yet trying to shut down. Check eagle-scheduler.conf and consider if you need this listener.");
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/EagleServiceProfileInitializer.java
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/EagleServiceProfileInitializer.java b/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/EagleServiceProfileInitializer.java
deleted file mode 100644
index 600e17a..0000000
--- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/EagleServiceProfileInitializer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.security.profile;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-import org.apache.eagle.stream.application.scheduler.ApplicationScheduler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-
-public class EagleServiceProfileInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-
-    private static final Logger logger = LoggerFactory.getLogger(EagleServiceProfileInitializer.class);
-
-    @Override
-    public void initialize(ConfigurableApplicationContext applicationContext) {
-        Config config = ConfigFactory.load();
-        String SPRING_ACTIVE_PROFILE = "eagle.service.springActiveProfile";
-        String profile = "sandbox";
-        if (config.hasPath(SPRING_ACTIVE_PROFILE)) {
-            profile = config.getString(SPRING_ACTIVE_PROFILE);
-        }
-        logger.info("Eagle service use env: " + profile);
-        applicationContext.getEnvironment().setActiveProfiles(profile);
-        applicationContext.refresh();
-
-        //new ApplicationScheduler().startDeamon();
-    }
-}

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/BasicAuthenticationEncoder.java
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/BasicAuthenticationEncoder.java b/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/BasicAuthenticationEncoder.java
deleted file mode 100644
index 0b4702e..0000000
--- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/BasicAuthenticationEncoder.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.security.pwdgen;
-
-import org.apache.eagle.common.Base64;
-
-public class BasicAuthenticationEncoder {
-	public static void main(String[] args){
-		System.out.println(Base64.encode("admin:secret"));
-		System.out.println(Base64.encode("eagle:secret"));
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/PasswordEncoderGenerator.java
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/PasswordEncoderGenerator.java b/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/PasswordEncoderGenerator.java
deleted file mode 100644
index ffbdcc2..0000000
--- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/PasswordEncoderGenerator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.service.security.pwdgen;
-
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-
-public class PasswordEncoderGenerator {
-    public static void main(String[] args) {
-        String password = "eagle@fake.pwd";
-        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-        String hashedPassword = passwordEncoder.encode(password);
-        System.out.println(hashedPassword);
-    }
-}

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/resources/application-derby.conf
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/application-derby.conf b/eagle-webservice/src/main/resources/application-derby.conf
deleted file mode 100644
index fa72ec0..0000000
--- a/eagle-webservice/src/main/resources/application-derby.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-storage {
-		storage-type="jdbc"
-		storage-adapter="derby"
-		storage-username="eagle"
-		storage-password=eagle
-		storage-database=eagle
-		storage-connection-url="jdbc:derby:/tmp/eagle-db-dev;create=true"
-		storage-connection-props="encoding=UTF-8"
-		storage-driver-class="org.apache.derby.jdbc.EmbeddedDriver"
-		storage-connection-max=8
-}
-
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/resources/application-hbase.conf
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/application-hbase.conf b/eagle-webservice/src/main/resources/application-hbase.conf
deleted file mode 100644
index 12ade6a..0000000
--- a/eagle-webservice/src/main/resources/application-hbase.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-storage {
-		storage-type="hbase"
-		hbase-zookeeper-quorum="localhost"
-		hbase-zookeeper-property-clientPort=2181
-		zookeeper-znode-parent="/hbase",
-		springActiveProfile="sandbox"
-		audit-enabled=true
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/resources/application-mysql.conf
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/application-mysql.conf b/eagle-webservice/src/main/resources/application-mysql.conf
deleted file mode 100644
index b14a125..0000000
--- a/eagle-webservice/src/main/resources/application-mysql.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-storage {
-		storage-type="jdbc"
-		storage-adapter="mysql"
-		storage-username="eagle"
-		storage-password=eagle
-		storage-database=eagle
-		storage-connection-url="jdbc:mysql://localhost:3306/eagle"
-		storage-connection-props="encoding=UTF-8"
-		storage-driver-class="com.mysql.jdbc.Driver"
-		storage-connection-max=8
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/application.conf b/eagle-webservice/src/main/resources/application.conf
deleted file mode 100644
index c1ca0e5..0000000
--- a/eagle-webservice/src/main/resources/application.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-storage {
-	storage-type = "hbase"
-	hbase-zookeeper-quorum = "sandbox.hortonworks.com"
-	hbase-zookeeper-property-clientPort = 2181
-	zookeeper-znode-parent = "/hbase-unsecure",
-	springActiveProfile = "sandbox"
-	audit-enabled = true
-}
-
-coordinator {
-	"policiesPerBolt" : 5,
-	"boltParallelism" : 5,
-	"policyDefaultParallelism" : 5,
-	"boltLoadUpbound": 0.8,
-	"topologyLoadUpbound" : 0.8,
-	"numOfAlertBoltsPerTopology" : 5,
-	"zkConfig" : {
-		"zkQuorum" : "sandbox.hortonworks.com:2181",
-		"zkRoot" : "/alert",
-		"zkSessionTimeoutMs" : 10000,
-		"connectionTimeoutMs" : 10000,
-		"zkRetryTimes" : 3,
-		"zkRetryInterval" : 3000
-	},
-	"metadataService" : {
-		"host" : "localhost",
-		"port" : 58080,
-		"context" : "/rest"
-	},
-	"metadataDynamicCheck" : {
-		"initDelayMillis" : 1000,
-		"delayMillis" : 30000
-	}
-}
-
-datastore {
-	"metadataDao": "org.apache.eagle.alert.metadata.impl.InMemMetadataDaoImpl",
-	"connection": "localhost:27017"
-}
-
-
-
-


[13/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/eagle-topology.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-topology.sh b/eagle-assembly/src/main/bin/eagle-topology.sh
deleted file mode 100755
index 06cd7e5..0000000
--- a/eagle-assembly/src/main/bin/eagle-topology.sh
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/eagle-env.sh
-
-TOPOLOGY_NAME_SET=0
-
-function print_help() {
-	echo "Usage: $0 options {start | stop | status}"
-	echo "Options:                       Description:"
-	echo "  --jar      <fatJar path>       (Optional) Default is ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar"
-	echo "  --main     <main class>        for example: org.apache.eagle.security.auditlog.HdfsAuditLogProcessorMain"
-	echo "  --topology <topology name>     for example: sandbox-hdfsAuditLog-topology"
-	echo "  --config   <file path>         for example: $EAGLE_HOME/conf/sandbox-hdfsAuditLog-application.conf"
-	echo "  --storm-ui <storm ui url>      Execute through storm UI API, default: http://localhost:8744"
-
-	echo "Command Examples:"
-	echo "  $0 --main <mainClass> --topology <topologyName> --config <filePath> start"
-	echo "  $0 --topology <topologyName> stop"
-	echo "  $0 --topology <topologyName> status"
-}
-
-function env_check(){
-    which storm >/dev/null 2>&1
-    if [ $? != 0 ];then
-        echo "Error: storm is not installed"
-        exit 1
-    fi
-}
-
-#### parameters are in pair plus command
-#if [ `expr $# % 2` != 1 ]
-#then
-#    print_help
-#    exit 1
-#fi
-
-cmd=""
-while [  $# -gt 0  ]; do
-case $1 in
-    "start")
-        cmd=$1
-        shift
-        ;;
-    "stop")
-        cmd=$1
-        shift
-        ;;
-    "status")
-        cmd=$1
-        shift
-        ;;
-    --jar)
-        if [ $# -lt 3 ]; then
-            print_help
-            exit 1
-        fi
-        jarName=$2
-        shift 2
-        ;;
-    --main)
-        if [ $# -lt 3 ]; then
-            print_help
-            exit 1
-        fi
-        mainClass=$2
-        shift 2
-        ;;
-    --topology)
-        if [ $# -lt 3 ]; then
-            print_help
-            exit 1
-        fi
-        TOPOLOGY_NAME_SET=1
-        topologyName=$2
-        shift 2
-        ;;
-    --config)
-        if [ $# -lt 3 ]; then
-            print_help
-            exit 1
-        fi
-        configFile=$2
-        shift 2
-        ;;
-	--storm-ui)
-		# TODO: configure through arguments
-		storm_ui="http://localhost:8744"
-		shift 1
-		;;
-    *)
-        echo "Internal Error: option processing error: $1" 1>&2
-        exit 1
-        ;;
-    esac
-done
-
-
-if [ -z "$jarName" ]; then
-    jarName=$(ls ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar)
-fi
-
-if [ -z "$mainClass" ]; then
-    mainClass="org.apache.eagle.security.auditlog.HdfsAuditLogProcessorMain"
-fi
-
-if [ -z "$topologyName" ]; then
-    topologyName=sandbox-hdfsAuditLog-topology
-fi
-
-if [ -z "$configFile" ]; then
-    configFile="$EAGLE_HOME/conf/sandbox-hdfsAuditLog-application.conf"
-fi
-
-case $cmd in
-"start")
-    env_check
-    echo "Starting eagle topology ..."
-    echo "jarName="$jarName "mainClass="$mainClass "configFile="$configFile
-    if [ $TOPOLOGY_NAME_SET = 1 ]; then
-	    storm jar -c nimbus.host=$EAGLE_NIMBUS_HOST ${jarName} $mainClass -D config.file=$configFile -D envContextConfig.topologyName=$topologyName
-	else
-	    storm jar -c nimbus.host=$EAGLE_NIMBUS_HOST ${jarName} $mainClass -D config.file=$configFile
-	fi
-	if [ $? = 0 ]; then
-		echo "Starting is completed"
-		exit 0
-	else
-		echo "Failure"
-		exit 1
-	fi
-	;;
-"stop")
-    env_check
-    echo "Stopping eagle topology ..."
-    storm kill -c nimbus.host=$EAGLE_NIMBUS_HOST $topologyName
-    if [ $? = 0 ]; then
-    	echo "Stopping is completed"
-	    exit 0
-    else
-    	echo "Failure"
-	exit 1
-    fi
-	;;
-"status")
-	if [ -z "$storm_ui" ];then
-	    env_check
-	    echo "Checking topology $topologyName status ..."
-	    output=`storm list  -c nimbus.host=$EAGLE_NIMBUS_HOST | grep $topologyName`
-	    if [ $? != 0 ];then
-	        echo "Topology is not alive: $topologyName is not found"
-	        exit 1
-	    fi
-
-	    echo $output | grep ACTIVE > /dev/null 2>&1
-
-	    if [ $? = 0 ];then
-	        echo "Topology is alive: $output"
-	        exit 0
-	    else
-	        echo "Topology is not alive: $output"
-	        exit 1
-	    fi
-    else
-	    echo "Checking topology $topologyName status through storm UI API on $storm_ui"
-	    curl -XGET $storm_ui/api/v1/topology/summary | grep $topologyName | grep ACTIVE >/dev/null 2>&1
-	    if [ $? == 0 ];then
-	        echo "$topologyName is running"
-	        exit 0
-	    else
-	        echo "$topologyName is dead"
-	        exit 1
-	    fi
-    fi
-    ;;
-*)
-	print_help
-	exit 1
-esac
-
-exit 0
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/eagle-userprofile-scheduler.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-userprofile-scheduler.sh b/eagle-assembly/src/main/bin/eagle-userprofile-scheduler.sh
deleted file mode 100755
index fb74513..0000000
--- a/eagle-assembly/src/main/bin/eagle-userprofile-scheduler.sh
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-function usage() {
-	echo "Usage: $0 [options] {start|stop|status}"
-	echo ""
-	echo "Commands"
-	echo "  start                       Start scheduler process"
-	echo "  stop                        Stop scheduler process"
-	echo "  status                      Check scheduler process status"
-	echo ""
-	echo "Options:"
-	echo "  --config <configFilePath>     Configuration file path"
-	echo "  --log    <logFilePath>        Log file path"
-	echo "  --daemon                      Run as daemon service"
-	echo "	--site		site information"
-}
-
-source $(dirname $0)/eagle-env.sh
-
-[ ! -e $EAGLE_HOME/logs ] && mkdir -p $EAGLE_HOME/logs
-[ ! -e $EAGLE_HOME/temp ] && mkdir -p $EAGLE_HOME/temp
-
-SCHEDULER_JAR=$(ls $EAGLE_HOME/lib/userprofile/eagle-security-userprofile-training-*-assembly.jar)
-SCHEDULER_CLASS="org.apache.eagle.security.userprofile.daemon.Scheduler"
-SCHEDULER_JVM_OPTS="-server"
-SCHDULER_LOG_DIR=$(dirname $0)/logs/
-
-SCHEDULER_CLASSPATH=$EAGLE_HOME/conf:$SCHEDULER_JAR
-# Add eagle shared library jars
-for file in $EAGLE_HOME/lib/share/*;do
-	SCHEDULER_CLASSPATH=$SCHEDULER_CLASSPATH:$file
-done
-
-# Walk around comman-math3 conflict with spark
-SCHEDULER_OPTS="-D eagle.userprofile.driver-classpath=$(dirname $0)/../lib/share/asm-3.1.jar:$(dirname $0)/../lib/share/commons-math3-3.5.jar"
-
-# Specify user profile spark job assembly jar
-SCHEDULER_OPTS="$SCHEDULER_OPTS -D eagle.userprofile.jar=$SCHEDULER_JAR"
-
-SCHEDULER_CMD="java $SCHEDULER_JVM_OPTS -cp $SCHEDULER_CLASSPATH:$SCHEDULER_JAR $SCHEDULER_CLASS $SCHEDULER_OPTS"
-
-### parameters are in pair
-if [ $# = 0 ] ; then
-	usage
-	exit 1
-fi
-
-while [  $# -gt 0  ]; do
-case $1 in
-  "--site")
-     if [ $# -lt 2 ]; then
-        usage
-        exit 1
-     fi
-	 site=$2
-     shift 2
-     ;;
-  "--config")
-     if [ $# -lt 2 ]; then
-        usage
-        exit 1
-     fi
-	 config=$2
-     shift 2
-     ;;
-  "--log")
-     if [ $# -lt 2 ]; then
-        usage
-        exit 1
-     fi
-	 log=$2
-     shift 2
-     ;;
-  "--daemon")
-     daemon="true"
-     shift 1
-     ;;
-  "start")
-    command="start"
-     shift 1
-    ;;
-  "stop")
-    command="stop"
-	shift 1
-    ;;
-  "status")
-    command="status"
-	shift 1
-    ;;
-  *)
-     echo "Internal Error: option processing error: $1" 1>&2
-     usage
-     exit 1
-     ;;
-  esac
-done
-
-# Validate Arguments
-# ==================
-
-# --site
-if [ -z "$site" ];then
-	echo "Error: --site required"
-	usage
-	exit 1
-fi
-
-pid=$(dirname $0)/../temp/$site-userprofile-scheduler.pid
-
-# --config
-if [ -z "$config" ];then
-	config=$(dirname $0)/../conf/$site-userprofile-scheduler.conf
-fi
-
-# --log
-if [ -z "$log" ];then
-	log=$(dirname $0)/../logs/$site-userprofile-scheduler.out
-fi
-
-# Define Functions
-# ================
-function start(){
-	if [ -e $pid ];then
-		pidv=`cat $pid`
-		ps -p $pidv 1>/dev/null 2>&1
-		if [ "$?" != "0" ];then
-			echo "Process [$pidv] is found, but dead, continue to start ..."
-		else
-			echo "Process [$pidv] is still runing, please top it firstly, exiting ..."
-			exit 1
-		fi
-	fi
-
-	if [ ! -e $config ];then
-		echo "Error: --config $config not exist"
-		usage
-		exit 1
-	fi
-
-	cmd="$SCHEDULER_CMD -D eagle.site=$site -D config.file=$config"
-
-	if [ "$daemon" == "true" ];then
-		echo "Executing: $cmd as daemon"
-		echo $cmd >> $log
-		nohup $cmd 1>>$log 2>&1 &
-		pidv=$!
-		echo $pidv > $pid
-		echo "Logging to: $log, pid: $pidv"
-	else
-		echo "Executing: $cmd"
-		$cmd
-	fi
-}
-
-function stop(){
-	if [ -e $pid ];then
-		pidv=`cat $pid`
-		ps -p $pidv 1>/dev/null 2>&1
-		if [ "$?" != "0" ];then
-			rm $pid
-			echo "Process [$pidv] is not running, but PID file exisits: $pid, removed"
-			exit 1
-		else
-			echo "Killing process [$pidv]"
-			kill $pidv
-			if [ $? == 0 ];then
-				rm $pid
-				echo "Killed successfully"
-				exit 0
-			else
-				echo "Failed to kill process [$pid]"
-				exit 1
-			fi
-		fi
-	else
-		echo "Process is not running"
-		exit 1
-	fi
-}
-
-function status(){
-	if [ -e $pid ];then
-		pidv=`cat $pid`
-		ps -p $pidv 1>/dev/null 2>&1
-		if [ "$?" != "0" ];then
-			echo "Process [$pidv] is dead"
-			exit 1
-		else
-			echo "Process [$pidv] is running"
-			exit 0
-		fi
-	else
-		echo "$pid not found, assume process should have been stopped"
-		exit 1
-	fi
-}
-
-case $command in
-	"start")
-		start
-		;;
-	"stop")
-		stop
-		;;
-	"status")
-		status
-		;;
-	*)  usage
-		exit 1
-		;;
-esac
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/eagle-userprofile-training.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-userprofile-training.sh b/eagle-assembly/src/main/bin/eagle-userprofile-training.sh
deleted file mode 100755
index 209570c..0000000
--- a/eagle-assembly/src/main/bin/eagle-userprofile-training.sh
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-function usage() {
-	echo "Usage: $0 --jar <jarName> --main <mainClass> --site <sitename> --input <inputschema> --output <outputschema>"
-	echo "--site <siteName>     Must be given"
-	echo "--jar <jarName>       Default is $EAGLE_HOME/lib/userprofile/eagle-security-userprofile-training-0.1.0-assembly.jar"
-    echo "--main <mainClass>    Default is org.apache.eagle.security.userprofile.UserProfileTrainingCLI"
-    echo "--input               Default is /tmp/userprofile/hdfs-audit.log"
-    echo "--output              Default is eagle://localhost:9099. When modelSink is hdfs, the value is hdfs:///tmp/userprofile/output"
-	echo "Example: $0 --jar <jarName> --main <mainClass> --site <sitename> --input <input> --output <output>"
-}
-
-function env_check(){
-    which spark-submit >/dev/null 2>&1
-    if [ $? != 0 ];then
-        echo "Error: spark is not installed"
-        exit 1
-    fi
-}
-
-source $(dirname $0)/eagle-env.sh
-
-#### parameters are in pair
-if [ $# = 0 ] || [ `expr $# % 2` != 0 ] ; then
-	usage
-	exit 1
-fi
-
-while [  $# -gt 0  ]; do
-case $1 in
-  "--site")
-     if [ $# -lt 2 ]; then
-        usage
-        exit 1
-     fi
-     site=$2
-     shift 2
-     ;;
-  "--jar")
-     if [ $# -lt 2 ]; then
-        usage
-        exit 1
-     fi
-     jar=$2
-     shift 2
-     ;;
-  "--main")
-     if [ $# -lt 2 ]; then
-        usage
-        exit 1
-     fi
-     main=$2
-     shift 2
-     ;;
-  "--input")
-     if [ $# -lt 2 ]; then
-        usage
-        exit 1
-     fi
-     input=$2
-     shift 2
-     ;;
-  "--output")
-     if [ $# -lt 2 ]; then
-        usage
-        exit 1
-     fi
-     output=$2
-     shift 2
-     ;;
-  *)
-     echo "Internal Error: option processing error: $1" 1>&2
-     exit 1
-     ;;
-  esac
-done
-
-if [ -z "$site" ];then
-	echo "Error: --site is required" 1>&2
-	exit 1
-fi
-
-if [ -z "$main" ] ; then
-  main="org.apache.eagle.security.userprofile.UserProfileTrainingCLI"
-fi
-
-if [ -z "$jar" ] ; then
-  jar="$EAGLE_HOME/lib/userprofile/eagle-security-userprofile-training-0.1.0-assembly.jar"
-fi
-
-if [ -z "input" ] ; then
-  input="hdfs:///tmp/userprofile/hdfs-audit.log"
-fi
-
-if [ -z "output" ] ; then
-  output="eagle://localhost:9099"
-fi
-
-outputScheme=`echo $output | sed -E 's/^(.*):\/\/.*/\1/'`
-
-case $outputScheme in
- "hdfs")
-   env_check
-   echo "Starting eagle user profile training ..."
-   hdfsOutput=`echo $output | sed -E 's/hdfs:\/\/(.*)/\1/'`
-   spark-submit --class $main \
-                 --master "local[10]" \
-                 --driver-class-path $EAGLE_HOME/lib/share/asm-3.1.jar:$EAGLE_HOME/lib/share/commons-math3-3.5.jar \
-                 $jar \
-                 --site $site \
-                 --input $input \
-                 --output $hdfsOutput
-    if [ $? = 0 ]; then
-		echo "Starting is completed"
-		exit 0
-	else
-		echo "Failure"
-		exit 1
-	fi
-	;;
-  "eagle")
-    env_check
-    echo "Starting eagle user profile training ..."
-    eagleServiceHost=`echo $output | sed -E 's/eagle:\/\/(.*):(.*)/\1/'`
-    eagleServicePort=`echo $output | sed -E 's/eagle:\/\/(.*):(.*)/\2/'`
-    spark-submit --class $main \
-                 --master "local[10]" \
-                 --driver-class-path $EAGLE_HOME/lib/share/asm-3.1.jar:$EAGLE_HOME/lib/share/commons-math3-3.5.jar \
-                 $jar \
-                 --site $site \
-                 --input $input \
-                 --service-host $eagleServiceHost \
-                 --service-port $eagleServicePort
-
-    if [ $? = 0 ]; then
-        echo "Starting is completed"
-        exit 0
-    else
-        echo "Failure"
-        exit 1
-    fi
-    ;;
-  *)
-	usage
-	exit 1
-esac
-
-exit 0
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/hadoop-metric-monitor.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/hadoop-metric-monitor.sh b/eagle-assembly/src/main/bin/hadoop-metric-monitor.sh
deleted file mode 100755
index 327bec1..0000000
--- a/eagle-assembly/src/main/bin/hadoop-metric-monitor.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-##!/bin/bash
-#
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##    http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-#
-source $(dirname $0)/eagle-env.sh
-
-######################################################################
-##            Import stream metadata for HADOOP METRIC
-######################################################################
-${EAGLE_HOME}/bin/hadoop-metric-init.sh
-
-######################################################################
-##            Run topology for HADOOP METRIC
-######################################################################
-### if topology exists, we should shutdown it
-echo "check topology status ..."
-active=$(${EAGLE_HOME}/bin/eagle-topology.sh --topology sandbox-hadoopjmx-topology status | grep ACTIVE)
-echo "topology status $active"
-if [ "$active" ]; then
- echo "stop topology ..."
- ${EAGLE_HOME}/bin/eagle-topology.sh --topology sandbox-hadoopjmx-topology stop
-fi
-echo "start Eagle Hadoop Metric Monitoring topology"
-${EAGLE_HOME}/bin/eagle-topology.sh --main org.apache.eagle.hadoop.metric.HadoopJmxMetricMonitor --topology sandbox-hadoopjmx-topology --config ${EAGLE_HOME}/conf/sandbox-hadoopjmx-topology.conf start
-
-######################################################################
-##            Setup minutely crontab job for HADOOP METRIC
-######################################################################
-echo "set up crontab script"
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cp $DIR/../tools/hadoop_jmx_collector/config-sample.json $DIR/../tools/hadoop_jmx_collector/config.json
-command="python $DIR/../tools/hadoop_jmx_collector/hadoop_jmx_kafka.py"
-job="* * * * * $command >> $DIR/../logs/hadoop_metric.log"
-echo "$job"
-cat <(fgrep -i -v "$command" <(crontab -l)) <(echo "$job") | crontab -
-
-echo "$(crontab -l)"

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/hdfs-securitylog-metadata-create.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/hdfs-securitylog-metadata-create.sh b/eagle-assembly/src/main/bin/hdfs-securitylog-metadata-create.sh
deleted file mode 100755
index 0d50376..0000000
--- a/eagle-assembly/src/main/bin/hdfs-securitylog-metadata-create.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with`
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/eagle-env.sh
-
-echo "Importing metadata for HDFS security log... "
-
-#### AlertStreamService: alert streams generated from data source
-
-curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertStreamService" -d '[{"prefix":"alertStream","tags":{"application":"hdfsSecurityLog","streamName":"hdfsSecurityLogEventStream"},"desc":"alert event stream from HDFS security audit log"}]'
-
-
-#### AlertExecutorService: what alert streams are consumed by alert executor
-
-curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertExecutorService" -d '[{"prefix":"alertExecutor","tags":{"application":"hdfsSecurityLog","alertExecutorId":"hdfsSecurityLogAlertExecutor","streamName":"hdfsSecurityLogEventStream"},"desc":"alert executor for HDFS security log event stream"}]'
-
-
-#### AlertStreamSchemaService: schema for event from alert stream
-
-curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertStreamSchemaService" -d '[{"prefix":"alertStreamSchema","tags":{"application":"hdfsSecurityLog","streamName":"hdfsSecurityLogEventStream","attrName":"timestamp"},"attrDescription":"milliseconds of the datetime","attrType":"long","category":"","attrValueResolver":""},{"prefix":"alertStreamSchema","tags":{"application":"hdfsSecurityLog","streamName":"hdfsSecurityLogEventStream","attrName":"user"},"attrDescription":"","attrType":"string","category":"","attrValueResolver":""},{"prefix":"alertStreamSchema","tags":{"application":"hdfsSecurityLog","streamName":"hdfsSecurityLogEventStream","attrName":"allowed"},"attrDescription":"true, false or none","attrType":"bool","category":"","attrValueResolver":""}]'
-
-curl -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Content-Type:application/json' "http://${EAGLE_SERVICE_HOST}:${EAGLE_SERVICE_PORT}/eagle-service/rest/entities?serviceName=AlertDataSourceService" -d '[{"prefix":"alertDataSource","tags":{"site":"sandbox","application":"hdfsSecurityLog"},"enabled":"true","desc":"HDFS Security"}]'
-
-
-echo ""
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/kafka-producer.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/kafka-producer.sh b/eagle-assembly/src/main/bin/kafka-producer.sh
deleted file mode 100755
index 3366de0..0000000
--- a/eagle-assembly/src/main/bin/kafka-producer.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [ "x$EAGLE_HEAP_OPTS" = "x" ]; then
-    export EAGLE_HEAP_OPTS="-Xmx512M"
-fi
-
-exec $(dirname $0)/eagle-run-class.sh org.apache.eagle.contrib.kafka.ProducerTool "$@"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/kafka-server-start.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/kafka-server-start.sh b/eagle-assembly/src/main/bin/kafka-server-start.sh
deleted file mode 100755
index ce37610..0000000
--- a/eagle-assembly/src/main/bin/kafka-server-start.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [ $# -lt 1 ];
-then
-	echo "USAGE: $0 [-daemon] conf/kafka-server.properties [--override property=value]*"
-	exit 1
-fi
-
-base_dir=$(dirname $0)
-
-if [ "x$EAGLE_LOG4J_OPTS" = "x" ]; then
-    export KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/../conf/log4j.properties"
-fi
-
-if [ "x$EAGLE_HEAP_OPTS" = "x" ]; then
-    export EAGLE_HEAP_OPTS="-Xmx1G -Xms1G"
-fi
-
-EXTRA_ARGS="-name kafkaServer -loggc"
-
-COMMAND=$1
-case $COMMAND in
-  -daemon)
-    EXTRA_ARGS="-daemon "$EXTRA_ARGS
-    shift
-    ;;
-  *)
-    ;;
-esac
-
-$base_dir/kafka-server-status.sh 1>/dev/null 2>&1
-if [ "$?" == "" ];then
-	echo "Kafka is still running, please stop firstly before starting"
-	exit 0
-else
-	exec $base_dir/eagle-run-class.sh $EXTRA_ARGS kafka.Kafka "$@"
-fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/kafka-server-status.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/kafka-server-status.sh b/eagle-assembly/src/main/bin/kafka-server-status.sh
deleted file mode 100755
index c794425..0000000
--- a/eagle-assembly/src/main/bin/kafka-server-status.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-PIDS=$(ps ax | grep -i 'kafka\.Kafka' | grep java | grep -v grep | awk '{print $1}')
-
-if [ -z "$PIDS" ]; then
-  echo "No kafka server is running"
-  exit 1
-else
-  echo "Kafka server is running at $PIDS"
-  exit 0
-fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/kafka-server-stop.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/kafka-server-stop.sh b/eagle-assembly/src/main/bin/kafka-server-stop.sh
deleted file mode 100755
index 9de6d76..0000000
--- a/eagle-assembly/src/main/bin/kafka-server-stop.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-PIDS=$(ps ax | grep -i 'kafka\.Kafka' | grep java | grep -v grep | awk '{print $1}')
-
-if [ -z "$PIDS" ]; then
-  echo "No kafka server to stop"
-  exit 1
-else
-  kill -s TERM $PIDS
-fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/kafka-stream-monitor.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/kafka-stream-monitor.sh b/eagle-assembly/src/main/bin/kafka-stream-monitor.sh
deleted file mode 100755
index 50dce87..0000000
--- a/eagle-assembly/src/main/bin/kafka-stream-monitor.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/eagle-env.sh
-
-if [ -e ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar ];then
-	export jar_name=$(ls ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar)
-else
-	echo "ERROR: ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar not found"
-	exit 1
-fi
-
-export main_class=org.apache.eagle.datastream.storm.KafkaStreamMonitor
-
-export alert_stream=$1
-export alert_executor=$2
-export config_file=$3
-
-if [ "$#" -lt "2" ];then
-	echo "ERROR: parameter required"
-	echo "Usage: kafka-stream-monitor.sh [alert_stream alert_executor config_file] or [alert_stream config_file]"
-	echo ""
-	exit 1
-fi
-if [ "$#" == "2" ];then
-	config_file=$2
-	alert_executor="${alert_stream}Executor"
-fi
-
-cmd="java -cp $EAGLE_STORM_CLASSPATH:$jar_name $main_class -D eagle.stream.name=$alert_stream -D eagle.stream.executor=$alert_executor -D config.file=$config_file -D envContextConfig.jarFile=$jar_name"
-
-echo "=========="
-echo "Alert Stream: $alert_stream"
-echo "Alert Executor: $alert_executor"
-echo "Alert Config: $config_file"
-echo "=========="
-echo "Run Cmd: $cmd"
-echo $cmd
-$cmd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/kafka-topics.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/kafka-topics.sh b/eagle-assembly/src/main/bin/kafka-topics.sh
deleted file mode 100755
index 3c0b23d..0000000
--- a/eagle-assembly/src/main/bin/kafka-topics.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-exec $(dirname $0)/eagle-run-class.sh kafka.admin.TopicCommand "$@"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/pipeline-runner.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/pipeline-runner.sh b/eagle-assembly/src/main/bin/pipeline-runner.sh
deleted file mode 100755
index 65bf3f3..0000000
--- a/eagle-assembly/src/main/bin/pipeline-runner.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/eagle-env.sh
-
-if [ -e ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar ];then
-	export jar_name=$(ls ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar)
-else
-	echo "ERROR: ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar not found"
-	exit 1
-fi
-if [ -e ${EAGLE_HOME}/conf/pipeline.conf ];then
-	export common_conf=$(ls ${EAGLE_HOME}/conf/pipeline.conf)
-else
-	echo "WARN: ${EAGLE_HOME}/conf/pipeline.conf not found"
-fi
-
-main_class=org.apache.eagle.stream.pipeline.Pipeline
-
-if [ "$#" == "0" ];then
-	echo "ERROR: parameter required"
-	echo "Usage: $0 [pipeline-config]"
-
-	echo ""
-	exit 1
-fi
-
-which storm >/dev/null 2>&1
-if [ $? != 0 ];then
-    echo "ERROR: storm not found"
-    exit 1
-else
-	export EAGLE_CLASSPATH=$EAGLE_CLASSPATH:$jar_name:`storm classpath`
-fi
-
-cmd="java -cp $EAGLE_CLASSPATH $main_class --conf $common_conf --pipeline $1 -D envContextConfig.jarFile=$jar_name"
-echo $cmd
-$cmd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/zookeeper-server-start.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/zookeeper-server-start.sh b/eagle-assembly/src/main/bin/zookeeper-server-start.sh
deleted file mode 100755
index d0fbd3d..0000000
--- a/eagle-assembly/src/main/bin/zookeeper-server-start.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [ $# -lt 1 ];
-then
-	echo "USAGE: $0 [-daemon] conf/zookeeper-server.properties"
-	exit 1
-fi
-base_dir=$(dirname $0)
-
-if [ "x$EAGLE_LOG4J_OPTS" = "x" ]; then
-    export EAGLE_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/../conf/log4j.properties"
-fi
-
-if [ "x$EAGLE_HEAP_OPTS" = "x" ]; then
-    export EAGLE_HEAP_OPTS="-Xmx512M -Xms512M"
-fi
-
-EXTRA_ARGS="-name zookeeper -loggc"
-
-COMMAND=$1
-case $COMMAND in
-  -daemon)
-     EXTRA_ARGS="-daemon "$EXTRA_ARGS
-     shift
-     ;;
- *)
-     ;;
-esac
-
-$base_dir/zookeeper-server-status.sh 1>/dev/null 2>&1
-if [ "$?" == "" ];then
-	echo "Zookeeper is still running, please stop firstly before starting"
-	exit 0
-else
-	exec $base_dir/eagle-run-class.sh $EXTRA_ARGS org.apache.zookeeper.server.quorum.QuorumPeerMain "$@"
-fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/zookeeper-server-status.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/zookeeper-server-status.sh b/eagle-assembly/src/main/bin/zookeeper-server-status.sh
deleted file mode 100755
index 223a310..0000000
--- a/eagle-assembly/src/main/bin/zookeeper-server-status.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-PIDS=$(ps ax | grep java | grep -i QuorumPeerMain | grep -v grep | awk '{print $1}')
-
-if [ -z "$PIDS" ]; then
-  echo "No zookeeper server is running"
-  exit 1
-else
-  echo "Zookeeper server is running at $PIDS"
-  exit 0
-fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/bin/zookeeper-server-stop.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/zookeeper-server-stop.sh b/eagle-assembly/src/main/bin/zookeeper-server-stop.sh
deleted file mode 100755
index 4155182..0000000
--- a/eagle-assembly/src/main/bin/zookeeper-server-stop.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-PIDS=$(ps ax | grep java | grep -i QuorumPeerMain | grep -v grep | awk '{print $1}')
-
-if [ -z "$PIDS" ]; then
-  echo "No zookeeper server to stop"
-  exit 1
-else
-  kill -s TERM $PIDS
-fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/eagle-scheduler.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/eagle-scheduler.conf b/eagle-assembly/src/main/conf/eagle-scheduler.conf
deleted file mode 100644
index 74ff18b..0000000
--- a/eagle-assembly/src/main/conf/eagle-scheduler.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-### scheduler propertise
-appCommandLoaderEnabled = false
-appCommandLoaderIntervalSecs = 1
-appHealthCheckIntervalSecs = 5
-
-### execution platform properties
-envContextConfig.env = "storm"
-envContextConfig.url = "http://sandbox.hortonworks.com:8744"
-envContextConfig.nimbusHost = "sandbox.hortonworks.com"
-envContextConfig.nimbusThriftPort = 6627
-envContextConfig.jarFile = "/dir-to-jar/eagle-topology-0.3.0-incubating-assembly.jar"
-
-### default topology properties
-eagleProps.mailHost = "mailHost.com"
-eagleProps.mailSmtpPort = "25"
-eagleProps.mailDebug = "true"
-eagleProps.eagleService.host = "localhost"
-eagleProps.eagleService.port = 9099
-eagleProps.eagleService.username = "admin"
-eagleProps.eagleService.password = "secret"
-eagleProps.dataJoinPollIntervalSec = 30
-
-dynamicConfigSource.enabled = true
-dynamicConfigSource.initDelayMillis = 0
-dynamicConfigSource.delayMillis = 30000
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/eagle-service.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/eagle-service.conf b/eagle-assembly/src/main/conf/eagle-service.conf
deleted file mode 100644
index c28a676..0000000
--- a/eagle-assembly/src/main/conf/eagle-service.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-eagle {
-  service {
-    storage-type = "hbase"
-    hbase-zookeeper-quorum = "sandbox.hortonworks.com"
-    hbase-zookeeper-property-clientPort = 2181
-    zookeeper-znode-parent = "/hbase-unsecure",
-    springActiveProfile = "sandbox"
-    audit-enabled = true
-  }
-}
-
-
-
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/kafka-server.properties
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/kafka-server.properties b/eagle-assembly/src/main/conf/kafka-server.properties
deleted file mode 100644
index 684c81f..0000000
--- a/eagle-assembly/src/main/conf/kafka-server.properties
+++ /dev/null
@@ -1,115 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# see kafka.server.KafkaConfig for additional details and defaults
-
-############################# Server Basics #############################
-
-# The id of the broker. This must be set to a unique integer for each broker.
-broker.id=0
-
-############################# Socket Server Settings #############################
-
-# The address the socket server listens on. It will get the value returned from
-# java.net.InetAddress.getCanonicalHostName() if not configured.
-#   FORMAT:
-#     listeners = security_protocol://host_name:port
-#   EXAMPLE:
-#     listeners = PLAINTEXT://your.host.name:9092
-#listeners=PLAINTEXT://:9092
-
-# Hostname and port the broker will advertise to producers and consumers. If not set,
-# it uses the value for "listeners" if configured.  Otherwise, it will use the value
-# returned from java.net.InetAddress.getCanonicalHostName().
-#advertised.listeners=PLAINTEXT://your.host.name:9092
-
-# The number of threads handling network requests
-num.network.threads=3
-
-# The number of threads doing disk I/O
-num.io.threads=8
-
-# The send buffer (SO_SNDBUF) used by the socket server
-socket.send.buffer.bytes=102400
-
-# The receive buffer (SO_RCVBUF) used by the socket server
-socket.receive.buffer.bytes=102400
-
-# The maximum size of a request that the socket server will accept (protection against OOM)
-socket.request.max.bytes=104857600
-
-
-############################# Log Basics #############################
-
-# A comma seperated list of directories under which to store log files
-log.dirs=/tmp/eagle-kafka-logs
-
-# The default number of log partitions per topic. More partitions allow greater
-# parallelism for consumption, but this will also result in more files across
-# the brokers.
-num.partitions=1
-
-# The number of threads per data directory to be used for log recovery at startup and flushing at shutdown.
-# This value is recommended to be increased for installations with data dirs located in RAID array.
-num.recovery.threads.per.data.dir=1
-
-############################# Log Flush Policy #############################
-
-# Messages are immediately written to the filesystem but by default we only fsync() to sync
-# the OS cache lazily. The following configurations control the flush of data to disk.
-# There are a few important trade-offs here:
-#    1. Durability: Unflushed data may be lost if you are not using replication.
-#    2. Latency: Very large flush intervals may lead to latency spikes when the flush does occur as there will be a lot of data to flush.
-#    3. Throughput: The flush is generally the most expensive operation, and a small flush interval may lead to exceessive seeks.
-# The settings below allow one to configure the flush policy to flush data after a period of time or
-# every N messages (or both). This can be done globally and overridden on a per-topic basis.
-
-# The number of messages to accept before forcing a flush of data to disk
-#log.flush.interval.messages=10000
-
-# The maximum amount of time a message can sit in a log before we force a flush
-#log.flush.interval.ms=1000
-
-############################# Log Retention Policy #############################
-
-# The following configurations control the disposal of log segments. The policy can
-# be set to delete segments after a period of time, or after a given size has accumulated.
-# A segment will be deleted whenever *either* of these criteria are met. Deletion always happens
-# from the end of the log.
-
-# The minimum age of a log file to be eligible for deletion
-log.retention.hours=168
-
-# A size-based retention policy for logs. Segments are pruned from the log as long as the remaining
-# segments don't drop below log.retention.bytes.
-#log.retention.bytes=1073741824
-
-# The maximum size of a log segment file. When this size is reached a new log segment will be created.
-log.segment.bytes=1073741824
-
-# The interval at which log segments are checked to see if they can be deleted according
-# to the retention policies
-log.retention.check.interval.ms=300000
-
-############################# Zookeeper #############################
-
-# Zookeeper connection string (see zookeeper docs for details).
-# This is a comma separated host:port pairs, each corresponding to a zk
-# server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002".
-# You can also append an optional chroot string to the urls to specify the
-# root directory for all kafka znodes.
-zookeeper.connect=localhost:2181
-
-# Timeout in ms for connecting to zookeeper
-zookeeper.connection.timeout.ms=6000
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/ldap.properties
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/ldap.properties b/eagle-assembly/src/main/conf/ldap.properties
deleted file mode 100644
index 4a2c3f1..0000000
--- a/eagle-assembly/src/main/conf/ldap.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-ldap.server=
-ldap.username=
-ldap.password=
-ldap.user.searchBase=
-ldap.user.searchPattern=
-ldap.user.groupSearchBase=
-acl.adminRole=
-acl.defaultRole=
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/log4j.properties b/eagle-assembly/src/main/conf/log4j.properties
deleted file mode 100644
index 76ea987..0000000
--- a/eagle-assembly/src/main/conf/log4j.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-log4j.rootLogger=INFO, stdout
-eagle.log.dir=../logs
-eagle.log.file=eagle.log
-# standard output
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p [%t] %c{2}[%L]: %m%n
-# Daily Rolling File Appender
-log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DRFA.File=${eagle.log.dir}/${eagle.log.file}
-log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
-## 30-day backup
-# log4j.appender.DRFA.MaxBackupIndex=30
-log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
-# Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p [%t] %c{2}[%L]: %m%n
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/pipeline.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/pipeline.conf b/eagle-assembly/src/main/conf/pipeline.conf
deleted file mode 100644
index 9715ca3..0000000
--- a/eagle-assembly/src/main/conf/pipeline.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing software
-# distributed under the License is distributed on an "AS IS" BASIS
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{
-  "envContextConfig": {
-    "env": "storm"
-    "mode": "cluster"
-    "nimbusHost": "sandbox.hortonworks.com",
-    "nimbusThriftPort": 6627
-  }
-  "eagleProps": {
-    "dataJoinPollIntervalSec": 30
-    "mailHost": "smtp.server.host"
-    "mailSmtpPort": "25"
-    "mailDebug": "true"
-    "eagleService": {
-      "host": "localhost"
-      "port": 9099
-      "username": "admin"
-      "password": "secret"
-    }
-  }
-  "dynamicConfigSource": {
-    "enabled": true
-    "initDelayMillis": 0
-    "delayMillis": 30000
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/sandbox-hadoopjmx-pipeline.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/sandbox-hadoopjmx-pipeline.conf b/eagle-assembly/src/main/conf/sandbox-hadoopjmx-pipeline.conf
deleted file mode 100644
index 0211612..0000000
--- a/eagle-assembly/src/main/conf/sandbox-hadoopjmx-pipeline.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing software
-# distributed under the License is distributed on an "AS IS" BASIS
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{
-  config {
-    envContextConfig {
-      "topologyName": "sandbox-hadoopjmx-pipeline"
-    }
-    eagleProps {
-      "site": "sandbox"
-      "application": "HADOOP"
-    }
-  }
-
-  dataflow {
-    KafkaSource.hadoopNNJmxStream {
-      parallism = 1000
-      topic = "nn_jmx_metric_sandbox"
-      zkConnection = "sandbox.hortonworks.com:2181"
-      zkConnectionTimeoutMS = 15000
-      consumerGroupId = "Consumer"
-      fetchSize = 1048586
-      transactionZKServers = "sandbox.hortonworks.com"
-      transactionZKPort = 2181
-      transactionZKRoot = "/consumers"
-      transactionStateUpdateMS = 2000
-      deserializerClass = "org.apache.eagle.datastream.storm.JsonMessageDeserializer"
-    }
-
-    Alert.hadoopNNJmxStreamAlertExecutor {
-      upStreamNames = [hadoopNNJmxStream]
-      alertExecutorId = hadoopNNJmxStreamAlertExecutor
-    }
-
-    hadoopNNJmxStream -> hadoopNNJmxStreamAlertExecutor {}
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/sandbox-hadoopjmx-topology.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/sandbox-hadoopjmx-topology.conf b/eagle-assembly/src/main/conf/sandbox-hadoopjmx-topology.conf
deleted file mode 100644
index b69b4b9..0000000
--- a/eagle-assembly/src/main/conf/sandbox-hadoopjmx-topology.conf
+++ /dev/null
@@ -1,69 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{
-  "envContextConfig": {
-    "env": "storm",
-    "mode": "cluster",
-    "topologyName": "hadoopJmxMetricTopology",
-    "stormConfigFile": "hadoopjmx.yaml",
-    "parallelismConfig": {
-      "kafkaMsgConsumer": 1,
-      "hadoopJmxMetricAlertExecutor*": 1
-    }
-  },
-  "dataSourceConfig": {
-    "topic": "nn_jmx_metric_sandbox",
-    "zkConnection": "sandbox.hortonworks.com:2181",
-    "zkConnectionTimeoutMS": 15000,
-    "consumerGroupId": "EagleConsumer",
-    "fetchSize": 1048586,
-    "deserializerClass": "org.apache.eagle.datastream.storm.JsonMessageDeserializer",
-    "transactionZKServers": "sandbox.hortonworks.com",
-    "transactionZKPort": 2181,
-    "transactionZKRoot": "/consumers",
-    "transactionStateUpdateMS": 2000
-  },
-  "alertExecutorConfigs": {
-    "hadoopJmxMetricAlertExecutor": {
-      "parallelism": 1,
-      "partitioner": "org.apache.eagle.policy.DefaultPolicyPartitioner"
-      "needValidation": "true"
-    }
-  },
-  "eagleProps": {
-    "site": "sandbox",
-    "application": "hadoopJmxMetricDataSource",
-    "dataJoinPollIntervalSec": 30,
-    "mailHost": "mailHost.com",
-    "mailSmtpPort": "25",
-    "mailDebug": "true",
-    "balancePartitionEnabled": true,
-    #"partitionRefreshIntervalInMin" : 60,
-    #"kafkaStatisticRangeInMin" : 60,
-    "eagleService": {
-      "host": "localhost",
-      "port": 9099,
-      "username": "admin",
-      "password": "secret"
-    }
-    "readHdfsUserCommandPatternFrom": "file"
-  },
-  "dynamicConfigSource": {
-    "enabled": true,
-    "initDelayMillis": 0,
-    "delayMillis": 30000
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/sandbox-hbaseSecurityLog-application.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/sandbox-hbaseSecurityLog-application.conf b/eagle-assembly/src/main/conf/sandbox-hbaseSecurityLog-application.conf
deleted file mode 100644
index 83d6bfd..0000000
--- a/eagle-assembly/src/main/conf/sandbox-hbaseSecurityLog-application.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{
-  "envContextConfig": {
-    "env": "storm",
-    "mode": "cluster",
-    "topologyName": "sandbox-hbaseSecurityLog-topology",
-    "stormConfigFile": "security-auditlog-storm.yaml",
-    "parallelismConfig": {
-      "kafkaMsgConsumer": 1,
-      "hbaseSecurityLogAlertExecutor*": 1
-    }
-  },
-  "dataSourceConfig": {
-    "topic": "sandbox_hbase_security_log",
-    "zkConnection": "127.0.0.1:2181",
-    "zkConnectionTimeoutMS": 15000,
-    "brokerZkPath": "/brokers",
-    "fetchSize": 1048586,
-    "deserializerClass": "org.apache.eagle.security.hbase.HbaseAuditLogKafkaDeserializer",
-    "transactionZKServers": "127.0.0.1",
-    "transactionZKPort": 2181,
-    "transactionZKRoot": "/consumers",
-    "consumerGroupId": "eagle.hbasesecurity.consumer",
-    "transactionStateUpdateMS": 2000
-  },
-  "alertExecutorConfigs": {
-    "hbaseSecurityLogAlertExecutor": {
-      "parallelism": 1,
-      "partitioner": "org.apache.eagle.policy.DefaultPolicyPartitioner"
-      "needValidation": "true"
-    }
-  },
-  "eagleProps": {
-    "site": "sandbox",
-    "application": "hbaseSecurityLog",
-    "dataJoinPollIntervalSec": 30,
-    "mailHost": "mailHost.com",
-    "mailSmtpPort": "25",
-    "mailDebug": "true",
-    "eagleService": {
-      "host": "localhost",
-      "port": 9099
-      "username": "admin",
-      "password": "secret"
-    }
-  },
-  "dynamicConfigSource": {
-    "enabled": true,
-    "initDelayMillis": 0,
-    "delayMillis": 30000
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/sandbox-hdfsAuditLog-application.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/sandbox-hdfsAuditLog-application.conf b/eagle-assembly/src/main/conf/sandbox-hdfsAuditLog-application.conf
deleted file mode 100644
index be67309..0000000
--- a/eagle-assembly/src/main/conf/sandbox-hdfsAuditLog-application.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{
-  "envContextConfig": {
-    "env": "storm",
-    "mode": "cluster",
-    "topologyName": "sandbox-hdfsAuditLog-topology",
-    "stormConfigFile": "security-auditlog-storm.yaml",
-    "parallelismConfig": {
-      "kafkaMsgConsumer": 1,
-      "hdfsAuditLogAlertExecutor*": 1
-    }
-  },
-  "dataSourceConfig": {
-    "topic": "sandbox_hdfs_audit_log",
-    "zkConnection": "127.0.0.1:2181",
-    "brokerZkPath": "/brokers",
-    "zkConnectionTimeoutMS": 15000,
-    "fetchSize": 1048586,
-    "deserializerClass": "org.apache.eagle.security.auditlog.HdfsAuditLogKafkaDeserializer",
-    "transactionZKServers": "127.0.0.1",
-    "transactionZKPort": 2181,
-    "transactionZKRoot": "/consumers",
-    "consumerGroupId": "eagle.hdfsaudit.consumer",
-    "transactionStateUpdateMS": 2000
-  },
-  "alertExecutorConfigs": {
-    "hdfsAuditLogAlertExecutor": {
-      "parallelism": 1,
-      "partitioner": "org.apache.eagle.policy.DefaultPolicyPartitioner",
-      "needValidation": "true"
-    }
-  },
-  "eagleProps": {
-    "site": "sandbox",
-    "application": "hdfsAuditLog",
-    "dataJoinPollIntervalSec": 30,
-    "mailHost": "mailHost.com",
-    "mailSmtpPort": "25",
-    "mailDebug": "true",
-    "eagleService": {
-      "host": "localhost",
-      "port": 9099
-      "username": "admin",
-      "password": "secret"
-    }
-  },
-  "dynamicConfigSource": {
-    "enabled": true,
-    "initDelayMillis": 0,
-    "delayMillis": 30000
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/sandbox-hdfsSecurityLog-application.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/sandbox-hdfsSecurityLog-application.conf b/eagle-assembly/src/main/conf/sandbox-hdfsSecurityLog-application.conf
deleted file mode 100644
index e68dd70..0000000
--- a/eagle-assembly/src/main/conf/sandbox-hdfsSecurityLog-application.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{
-  "envContextConfig": {
-    "env": "storm",
-    "mode": "cluster",
-    "topologyName": "sandbox-hdfsSecurityLog-topology",
-    "stormConfigFile": "security-auditlog-storm.yaml",
-    "parallelismConfig": {
-      "kafkaMsgConsumer": 1,
-      "hdfsSecurityLogAlertExecutor*": 1
-    }
-  },
-  "dataSourceConfig": {
-    "topic": "sandbox_hdfs_security_log",
-    "zkConnection": "127.0.0.1:2181",
-    "brokerZkPath": "/brokers",
-    "zkConnectionTimeoutMS": 15000,
-    "fetchSize": 1048586,
-    "deserializerClass": "org.apache.eagle.security.securitylog.HDFSSecurityLogKafkaDeserializer",
-    "transactionZKServers": "127.0.0.1",
-    "transactionZKPort": 2181,
-    "transactionZKRoot": "/consumers",
-    "consumerGroupId": "eagle.hdfssecurity.consumer",
-    "transactionStateUpdateMS": 2000
-  },
-  "alertExecutorConfigs": {
-    "hdfsSecurityLogAlertExecutor": {
-      "parallelism": 1,
-      "partitioner": "eagle.alert.policy.DefaultPolicyPartitioner",
-      "needValidation": "true"
-    }
-  },
-  "eagleProps": {
-    "site": "sandbox",
-    "application": "hdfsSecurityLog",
-    "dataJoinPollIntervalSec": 30,
-    "mailHost": "mailHost.com",
-    "mailSmtpPort": "25",
-    "mailDebug": "true",
-    "eagleService": {
-      "host": "localhost",
-      "port": 9099
-      "username": "admin",
-      "password": "secret"
-    }
-  },
-  "dynamicConfigSource": {
-    "enabled": true,
-    "initDelayMillis": 0,
-    "delayMillis": 30000
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/sandbox-hiveQueryLog-application.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/sandbox-hiveQueryLog-application.conf b/eagle-assembly/src/main/conf/sandbox-hiveQueryLog-application.conf
deleted file mode 100644
index 8911e83..0000000
--- a/eagle-assembly/src/main/conf/sandbox-hiveQueryLog-application.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{
-  "envContextConfig": {
-    "env": "storm",
-    "mode": "cluster",
-    "topologyName": "sandbox-hiveQueryRunning-topology",
-    "stormConfigFile": "hive.storm.yaml",
-    "parallelismConfig": {
-      "msgConsumer": 2
-    }
-  },
-  "dataSourceConfig": {
-    "flavor": "stormrunning",
-    "zkQuorum": "localhost:2181",
-    "zkRoot": "/jobrunning",
-    "zkSessionTimeoutMs": 15000,
-    "zkRetryTimes": 3,
-    "zkRetryInterval": 2000,
-    "RMEndPoints": "http://localhost:8088/",
-    "HSEndPoint": "http://localhost:19888/",
-    "partitionerCls": "org.apache.eagle.job.DefaultJobPartitionerImpl"
-  },
-  "eagleProps": {
-    "site": "sandbox",
-    "application": "hiveQueryLog",
-    "mailHost": "atom.xyz.com",
-    "mailSmtpPort": "25",
-    "mailDebug": "true",
-    "eagleService": {
-      "host": "localhost",
-      "port": 9099,
-      "username": "admin",
-      "password": "secret"
-    }
-  },
-  "alertExecutorConfigs": {
-    "hiveAccessAlertByRunningJob": {
-      "parallelism": 1,
-      "partitioner": "org.apache.eagle.policy.DefaultPolicyPartitioner",
-      "needValidation": "true"
-    }
-  },
-  "dynamicConfigSource": {
-    "enabled": true,
-    "initDelayMillis": 0,
-    "delayMillis": 30000,
-    "ignoreDeleteFromSource": true
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/sandbox-userprofile-scheduler.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/sandbox-userprofile-scheduler.conf b/eagle-assembly/src/main/conf/sandbox-userprofile-scheduler.conf
deleted file mode 100644
index 4593a7e..0000000
--- a/eagle-assembly/src/main/conf/sandbox-userprofile-scheduler.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# eagle configuration
-eagle {
-  # eagle site id
-  site = "sandbox"
-
-  # eagle service configuration
-  service {
-    # eagle service host, default: "localhost"
-    host = "localhost"
-    # eagle service port, default: 8080
-    port = 9099
-    username = "admin"
-    password = "secret"
-  }
-
-  # eagle userprofile configuration
-  userprofile {
-    # training audit log input path
-    training-audit-path = "file:///usr/hdp/2.3.0.0-2130/eagle/lib/userprofile/data/*.txt"
-
-    # detection audit log input path
-    detection-audit-path = "file:///usr/hdp/2.3.0.0-2130/eagle/lib/userprofile/data/validate"
-
-    # detection output kafka brokers
-    # default: localhost:9200
-    detection-kafka-brokers = "sandbox.hortonworks.com:6667"
-
-    # detection output kafka topic
-    detection-kafka-topic = "sandbox_hdfs_audit_log"
-  }
-}
-
-akka {
-  # Loggers to register at boot time (akka.event.Logging$DefaultLogger logs
-  # to STDOUT)
-  loggers = ["akka.event.slf4j.Slf4jLogger"]
-
-  # Log level used by the configured loggers (see "loggers") as soon
-  # as they have been started; before that, see "stdout-loglevel"
-  # Options: OFF, ERROR, WARNING, INFO, DEBUG
-  loglevel = "INFO"
-
-  # Log level for the very basic logger activated during ActorSystem startup.
-  # This logger prints the log messages to stdout (System.out).
-  # Options: OFF, ERROR, WARNING, INFO, DEBUG
-  stdout-loglevel = "INFO"
-
-  # Filter of log events that is used by the LoggingAdapter before
-  # publishing log events to the eventStream.
-  logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
-}

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/sandbox-userprofile-topology.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/sandbox-userprofile-topology.conf b/eagle-assembly/src/main/conf/sandbox-userprofile-topology.conf
deleted file mode 100644
index a5f5983..0000000
--- a/eagle-assembly/src/main/conf/sandbox-userprofile-topology.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{
-  "deployInstanceIdentifier": {
-    "programId": "mlProgramId"
-  },
-  "envContextConfig": {
-    "env": "storm",
-    "topologyName": "sandbox-userprofile-topology",
-    "mode": "cluster",
-    "parallelismConfig": {
-      "kafkaMsgConsumer": 1,
-      "userProfileAnomalyDetectionExecutor*": 1
-    },
-    "stormConfigFile": "userprofile.storm.yaml"
-  },
-  "dataSourceConfig": {
-    "topic": "sandbox_hdfs_audit_log",
-    "zkConnection": "localhost:2181",
-    "zkConnectionTimeoutMS": 15000,
-    "consumerGroupId": "eagle.userprofile.consumer",
-    "fetchSize": 1048586,
-    "deserializerClass": "org.apache.eagle.security.auditlog.HdfsAuditLogKafkaDeserializer",
-    "transactionZKServers": "localhost",
-    "transactionZKPort": 2181,
-    "transactionZKRoot": "/brokers/topics",
-    "transactionStateUpdateMS": 2000
-  },
-  "eagleProps": {
-    "site": "sandbox",
-    "application": "userProfile",
-    "eagleService": {
-      "host": "localhost",
-      "port": "9099",
-      "username": "admin",
-      "password": "secret"
-    }
-  },
-  "alertExecutorConfigs": {
-    "userProfileAnomalyDetectionExecutor": {
-      "parallelism": 1,
-      "partitioner": "org.apache.eagle.policy.DefaultPolicyPartitioner",
-      "needValidation": true
-    }
-  },
-  "dynamicConfigSource": {
-    "enabled": true,
-    "initDelayMillis": 0,
-    "delayMillis": 5000
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/tools-log4j.properties
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/tools-log4j.properties b/eagle-assembly/src/main/conf/tools-log4j.properties
deleted file mode 100644
index 9c6875d..0000000
--- a/eagle-assembly/src/main/conf/tools-log4j.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-log4j.rootLogger=INFO, stdout
-# standard output
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p [%t] %c{2}[%L]: %m%n
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/conf/zookeeper-server.properties
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/zookeeper-server.properties b/eagle-assembly/src/main/conf/zookeeper-server.properties
deleted file mode 100644
index c27b558..0000000
--- a/eagle-assembly/src/main/conf/zookeeper-server.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# the directory where the snapshot is stored.
-dataDir=/tmp/eagle-zookeeper-data
-# the port at which the clients will connect
-clientPort=2181
-# disable the per-ip limit on the number of connections since this is a non-production config
-maxClientCnxns=0
\ No newline at end of file


[05/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/partials/landing.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/partials/landing.html b/eagle-webservice/src/main/webapp/_app/partials/landing.html
deleted file mode 100644
index a2e0f47..0000000
--- a/eagle-webservice/src/main/webapp/_app/partials/landing.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<p class="lead">
-	<span ng-if="!Application.current()">Current site do not use any application.</span>
-	<span ng-if="Application.current()">Current application do not install any feature.</span>
-
-	<span ng-if="Auth.isRole('ROLE_ADMIN')">
-		Click
-		<a href="#/config/site" ng-if="!Application.current()">here</a>
-		<a href="#/config/application" ng-if="Application.current()">here</a>
-		to configure.
-	</span>
-	<span ng-if="!Auth.isRole('ROLE_ADMIN')">Please contact your admin.</span>
-</p>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/partials/login.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/partials/login.html b/eagle-webservice/src/main/webapp/_app/partials/login.html
deleted file mode 100644
index 7faef42..0000000
--- a/eagle-webservice/src/main/webapp/_app/partials/login.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<div class="login-box">
-	<div class="login-logo">
-		<a href="#/">Apache Eagle</a>
-	</div>
-
-	<div class="login-box-body" ng-show="!loginSuccess">
-		<p class="login-box-msg">Sign in to start your session</p>
-		<div class="form-group has-feedback">
-			<input type="text" class="form-control" placeholder="User Name" ng-model="username" ng-keypress="login($event)" autocomplete="off" id="username">
-			<span class="glyphicon glyphicon-user form-control-feedback"></span>
-		</div>
-		<div class="form-group has-feedback">
-			<input type="password" class="form-control" placeholder="Password" ng-model="password" ng-keypress="login($event)">
-			<span class="glyphicon glyphicon-lock form-control-feedback"></span>
-		</div>
-		<div class="row">
-			<div class="col-xs-8">
-				<div class="checkbox">
-					<label> <input type="checkbox" ng-checked="rememberUser" ng-click="rememberUser = !rememberUser;" /> Remember Me
-					</label>
-				</div>
-			</div>
-			<div class="col-xs-4">
-				<button class="btn btn-primary btn-block btn-flat" ng-click="login($event, true)" ng-disabled="lock">Sign In</button>
-			</div>
-		</div>
-	</div>
-
-	<div class="login-box-body text-center" ng-show="loginSuccess">
-		<p class="login-box-msg">Login success</p>
-		<p>
-			<span class="fa fa-refresh fa-spin"></span>
-			Loading environment...
-		</p>
-	</div>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/css/animation.css
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/css/animation.css b/eagle-webservice/src/main/webapp/_app/public/css/animation.css
deleted file mode 100644
index 954bd29..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/css/animation.css
+++ /dev/null
@@ -1,46 +0,0 @@
-@CHARSET "UTF-8";
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-[ui-view].ng-enter, [ui-view].ng-leave {
-	position: absolute;
-	left: 0;
-	right: 0;
-	-webkit-transition: all .5s ease-in-out;
-	-moz-transition: all .5s ease-in-out;
-	-o-transition: all .5s ease-in-out;
-	transition: all .3s ease-in-out;
-}
-
-[ui-view].ng-enter {
-	opacity: 0;
-}
-
-[ui-view].ng-enter-active {
-	opacity: 1;
-}
-
-[ui-view].ng-leave {
-	opacity: 1;
-	transform:translate3d(0, 0, 0);
-}
-
-[ui-view].ng-leave-active {
-	opacity: 0;
-	transform:translate3d(20%, 0, 0);
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/css/main.css
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/css/main.css b/eagle-webservice/src/main/webapp/_app/public/css/main.css
deleted file mode 100644
index a7eba4b..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/css/main.css
+++ /dev/null
@@ -1,805 +0,0 @@
-@CHARSET "UTF-8";
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Frame */
-body.no-sidebar .content-wrapper {
-	margin-left: 0;
-
-	-webkit-transition: none;
-	-moz-transition: none;
-	-o-transition: none;
-	transition: none;
-}
-
-body.no-sidebar .main-footer {
-	margin-left: 0;
-}
-
-/* Navigation */
-.navbar-nav > .user-menu > .dropdown-menu > li.user-header .img-circle {
-	display: inline-block;
-	border: 3px solid;
-	border-color: rgba(255,255,255,0.2);
-	width: 90px;
-	height: 90px;
-	margin-top: 10px;
-}
-
-.navbar-nav > .user-menu > .dropdown-menu > li.user-header .fa {
-	font-size: 60px;
-	color: rgba(255,255,255,0.8);
-	margin-top: 10px;
-}
-
-	/* Common */
-a {
-	cursor: pointer;
-}
-
-/* Table */
-.table.table-sm>tbody>tr>td,
-.table.table-sm>tbody>tr>th,
-.table.table-sm>tfoot>tr>td,
-.table.table-sm>tfoot>tr>th,
-.table.table-sm>thead>tr>td,
-.table.table-sm>thead>tr>th{
-	padding: 3px 8px;
-}
-
-.table thead th .fa.fa-sort,
-.table thead th .fa.fa-sort-asc,
-.table thead th .fa.fa-sort-desc {
-	margin-top: 5px;
-	opacity: 0.3;
-	float: right;
-}
-.table thead th:hover .fa.fa-sort,
-.table thead th:hover .fa.fa-sort-asc,
-.table thead th:hover .fa.fa-sort-desc {
-	opacity: 0.8;
-}
-
-.table tr th,
-.table tr td {
-	-webkit-transition: background .5s linear;
-	-o-transition: background .5s linear;
-	transition: background .5s linear;
-}
-
-.sortTable-cntr .pagination {
-	margin-top: 0;
-}
-
-.table th.input-field,
-.table td.input-field {
-	padding: 0;
-	vertical-align: middle;
-}
-
-.table th.input-field > input,
-.table td.input-field > input,
-.table th.input-field > select,
-.table td.input-field > select {
-	border: none;
-	transition: border-color 0s;
-}
-
-.table th.input-field > input:focus,
-.table td.input-field > input:focus,
-.table th.input-field > select:focus,
-.table td.input-field > select:focus {
-	box-shadow: inset 1px 1px 0px #3c8dbc, inset -1px -1px 0px #3c8dbc;
-}
-
-.table th.input-field > input.has-warning,
-.table td.input-field > input.has-warning {
-	box-shadow: inset 1px 1px 0px #f39c12, inset -1px -1px 0px #f39c12;
-}
-
-/* Box */
-.small-box > a.inner {
-	color: #FFF;
-	display: block;
-}
-
-.small-box > a.inner h3 {
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	font-size: 32px;
-}
-
-.info-box.bg-gray,
-.info-box a {
-	color: #FFFFFF;
-}
-.info-box a:hover {
-	color: #FFFFFF;
-	text-decoration: underline;
-}
-
-.info-box-content a.config {
-	color: rgba(255,255,255,0.8);
-}
-.info-box-content a.config:hover {
-	color: #FFFFFF;
-}
-
-.info-box-content.box-clickable {
-	box-shadow: 0 0 3px;
-}
-.box-clickable {
-	cursor: pointer;
-}
-
-.info-box-content .info-box-text.text-large {
-	font-size: 26px;
-	margin: 5px 0 10px 0;
-}
-
-/* inline group */
-.inline-group dl,
-.inline-group dl dt,
-.inline-group dl dd {
-	display: inline-block;
-}
-
-.inline-group dl {
-	margin-right: 35px;
-}
-.inline-group dl dt {
-	margin-right: 20px;
-}
-
-.inline-group.form-inline {
-	margin-top: 5px;
-}
-.inline-group dl {
-	margin-right: 25px;
-}
-.inline-group dl dt {
-	margin-right: 5px;
-}
-
-/* Search box */
-.search-box {
-	position: relative;
-	margin-bottom: 15px;
-}
-.search-box input[type="search"] {
-	padding-left: 26px;
-}
-.search-box .fa.fa-search {
-	position: absolute;
-	top: 8px;
-	left: 8px;
-	z-index: 2;
-	pointer-events: none;
-	color: #999;
-}
-
-/* Navigation Tab */
-ul.nav.nav-tabs li .btn {
-	margin-top: 1px;
-}
-
-.modal-body ul.nav.nav-tabs {
-	border-bottom-color: #F4F4F4;
-	margin-bottom: 15px;
-}
-
-.modal-body ul.nav.nav-tabs li {
-	border-top: 3px solid #FFFFFF;
-	margin-right: 3px;
-}
-.modal-body ul.nav.nav-tabs li.active {
-	border-top-color: #3c8dbc;
-}
-
-.modal-body ul.nav.nav-tabs li > a,
-.modal-body ul.nav.nav-tabs li > a:active,
-.modal-body ul.nav.nav-tabs li > a:hover {
-	border: none;
-	border-radius: 0;
-	margin: 0;
-	padding: 6px 15px 8px 15px;
-	color: #444;
-}
-.modal-body ul.nav.nav-tabs li:not(.active) > a:hover {
-	background: rgba(0,0,0,0);
-	color: #999;
-}
-.modal-body ul.nav.nav-tabs li.active > a {
-	border-left: 1px solid #F4F4F4;
-	border-right: 1px solid #F4F4F4;
-}
-
-/* Step Navigation */
-.step-cntr .step {
-	background: #3c8dbc;
-	margin: 0 0 20px 0;
-	color: #FFF;
-	height: 60px;
-	border-radius: 3px;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.1);
-	display: block;
-
-	-webkit-transition: background .15s linear;
-	-o-transition: background .15s linear;
-	transition: background .15s linear;
-}
-.step-cntr .step.active {
-	background: #f39c12;
-}
-
-.step-cntr .step h1,
-.step-cntr .step h2,
-.step-cntr .step p {
-	margin: 0;
-	padding: 0;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-
-.step-cntr .step h1 {
-	display: inline-block;
-	font-size: 30px;
-	float: left;
-	border-right: 2px solid rgba(255,255,255,0.2);
-	width: 60px;
-	height: 60px;
-	text-align: center;
-	padding-top: 12px;
-	margin-right: 10px;
-}
-.step-cntr .step h2 {
-	font-size: 18px;
-	padding: 8px 0 5px 0;
-}
-
-/* Panel */
-.panel-group.panel-group-sm .panel .panel-heading {
-	padding: 5px 6px 5px 10px;
-}
-.panel-group.panel-group-sm .panel .panel-heading h4 {
-	font-size: 14px;
-}
-.panel-group.panel-group-sm .panel .panel-heading h4 a {
-	display: block;
-}
-.panel-group.panel-group-sm .panel .panel-heading .pull-right {
-	padding-left: 5px;
-	padding-right: 5px;
-	border-radius: 3px;
-}
-
-/* Drop Down */
-.dropdown-menu > li.danger > a {
-	color: #dd4b39;
-}
-.dropdown-menu > li.danger > a:hover {
-	color: #FFFFFF;
-	background: #dd4b39;
-}
-
-/* Drop Down */
-.dropdown-menu.left {
-	right: 0;
-	left: auto;
-}
-
-.dropdown-submenu{position:relative;}
-.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;}
-.dropdown-submenu:hover>.dropdown-menu{display:block;}
-.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#cccccc;margin-top:5px;margin-right:-10px;}
-.dropdown-submenu:hover>a:after{border-left-color:#ffffff;}
-.dropdown-submenu.pull-left{float:none;}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;}
-
-/* Input Group */
-.input-group .input-group-btn select {
-	width: auto;
-}
-
-/* Form group */
-.form-group .checkbox {
-	display: inline;
-	margin-right: 10px;
-}
-
-.form-group select.has-warning,
-.form-group input.has-warning {
-	border-color: #f39c12;
-	box-shadow: none;
-}
-
-.checkbox.noMargin {
-	margin-top: 0;
-	margin-bottom: 5px;
-}
-
-/* UL */
-ul.path {
-	margin-left: 0;
-}
-
-ul.path li {
-	padding: 0;
-	margin-right: 5px;
-}
-ul.path li a {
-	color: #FFFFFF;
-}
-
-ul.tree {
-	padding: 0 0 0 5px;
-}
-
-ul.tree > li,
-ul.tree > li > ul > li {
-	list-style-type: none;
-}
-
-ul.tree .tree-item .hover {
-	display: none;
-}
-ul.tree .tree-item:hover .hover {
-	display: inline-block;
-}
-
-ul.tree > li > ul {
-	padding: 0 0 0 25px;
-}
-
-ul.tree > li > ul > li.active {
-	background: #F4F4F4;
-}
-
-ul.tree.tree-bordered {
-	border: 1px solid #f4f4f4;
-}
-ul.tree.tree-bordered,
-ul.tree.tree-bordered > li > ul {
-	padding: 0;
-}
-ul.tree.tree-bordered > li:not(:last-child) {
-	border-bottom: 1px solid #f4f4f4;
-}
-ul.tree.tree-bordered > li > ul > li {
-	border-top: 1px solid #f4f4f4;
-}
-ul.tree.tree-bordered > li > span,
-ul.tree.tree-bordered > li > a {
-	display: block;
-	padding: 8px;
-}
-ul.tree.tree-bordered > li > ul > li > span,
-ul.tree.tree-bordered > li > ul > li > a {
-	display: block;
-	padding: 8px 8px 8px 30px;
-}
-
-.product-list-in-box > .item {
-	-webkit-transition: background .5s linear;
-	-o-transition: background .5s linear;
-	transition: background .5s linear;
-}
-.product-list-in-box > .item.ng-animate {
-	transition: 0s;
-}
-.product-list-in-box > .item.active {
-	background: #F5FAFC;
-	-webkit-transition: none;
-	-o-transition: none;
-	transition: none;
-}
-
-.nav.fixed-height,
-.products-list.fixed-height {
-	height: 402px;
-	overflow-y: auto;
-}
-
-.products-list .product-operation {
-	float: left;
-	border: 1px solid #9EC8E0;
-	border-radius: 5px;
-	overflow: hidden;
-}
-
-.products-list .product-operation .fa {
-	display: block;
-	padding: 4px 16px;
-	color: #3c8dbc;
-}
-.products-list .product-operation a.fa:hover {
-	color: #FFFFFF;
-	background: #337ab7;
-}
-
-.products-list .product-operation.single .fa {
-	padding: 12px 12px;
-	font-size: 20px;
-}
-
-.products-list .item .product-info a.fa.fa-times {
-	display: none;
-}
-.products-list .item:hover .product-info a.fa.fa-times {
-	display: block;
-}
-
-/* Label */
-.label.label-default {
-	color: #FFFFFF;
-}
-
-.label.label-sm {
-	padding: .0em .4em .1em;
-}
-
-/* Row */
-.row.narrow {
-	margin-left: -5px;
-	margin-right: -5px;
-	margin-bottom: -10px;
-}
-
-.row.narrow>.col-xs-1, .row.narrow>.col-sm-1, .row.narrow>.col-md-1, .row.narrow>.col-lg-1, .row.narrow>.col-xs-2, .row.narrow>.col-sm-2, .row.narrow>.col-md-2, .row.narrow>.col-lg-2, .row.narrow>.col-xs-3, .row.narrow>.col-sm-3, .row.narrow>.col-md-3, .row.narrow>.col-lg-3, .row.narrow>.col-xs-4, .row.narrow>.col-sm-4, .row.narrow>.col-md-4, .row.narrow>.col-lg-4, .row.narrow>.col-xs-5, .row.narrow>.col-sm-5, .row.narrow>.col-md-5, .row.narrow>.col-lg-5, .row.narrow>.col-xs-6, .row.narrow>.col-sm-6, .row.narrow>.col-md-6, .row.narrow>.col-lg-6, .row.narrow>.col-xs-7, .row.narrow>.col-sm-7, .row.narrow>.col-md-7, .row.narrow>.col-lg-7, .row.narrow>.col-xs-8, .row.narrow>.col-sm-8, .row.narrow>.col-md-8, .row.narrow>.col-lg-8, .row.narrow>.col-xs-9, .row.narrow>.col-sm-9, .row.narrow>.col-md-9, .row.narrow>.col-lg-9, .row.narrow>.col-xs-10, .row.narrow>.col-sm-10, .row.narrow>.col-md-10, .row.narrow>.col-lg-10, .row.narrow>.col-xs-11, .row.narrow>.col-sm-11, .row.narrow>.col-md-11, .
 row.narrow>.col-lg-11, .row.narrow>.col-xs-12, .row.narrow>.col-sm-12, .row.narrow>.col-md-12, .row.narrow>.col-lg-12 {
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.row.narrow > [class^="col-"],
-.row.narrow > [class*=" col-"] {
-	margin-bottom: 10px;
-}
-
-/* Chart */
-.sortable-mock-element .nvd3-chart-wrapper {
-	background: #FFFFFF;
-	opacity: 0.8;
-}
-
-.sortable-enter .nvd3-chart-wrapper {
-	border-color: #3c8dbc;
-	pointer-events: none;
-}
-.sortable-enter .nvd3-chart-wrapper .nvtooltip {
-	display: none;
-}
-
-.nvd3-chart-wrapper {
-	position: relative;
-	border: 1px solid rgba(0,0,0,0.1);
-}
-.nvd3-chart-wrapper:hover {
-	//border-color: #F4F4F4;
-}
-
-.nvd3-chart-wrapper .nvd3-chart-config {
-	position: absolute;
-	top: 1px;
-	right: 1px;
-	display: none;
-	border-radius: 0;
-	padding: 0 5px;
-	background: rgba(0,0,0,0.7);
-}
-.nvd3-chart-wrapper:hover .nvd3-chart-config {
-	display: block;
-}
-
-.nvd3-chart-wrapper .nvd3-chart-config a {
-	color: rgba(255,255,255, 0.9);
-	padding: 5px 2px 4px 2px;
-	font-size: 16px;
-}
-.nvd3-chart-wrapper .nvd3-chart-config a:hover {
-	color: #FFFFFF;
-}
-
-.nvd3-chart-cntr {
-	padding: 5px;
-}
-
-.nvd3-chart-cntr > h3 {
-	text-align: center;
-	font-size: 16px;
-	font-weight: bolder;
-	margin: 0;
-	padding: 5px 0;
-
-	overflow:hidden;
-	text-overflow:ellipsis;
-
-}
-
-.nvd3-chart-cntr > svg.nvd3-svg {
-	height: 200px;
-}
-
-.nvd3-chart-cntr.lg > svg.nvd3-svg {
-	height: 400px;
-}
-
-/* Tab */
-body .tab-content>.tab-pane {
-	display: block;
-	height: 0px;
-	overflow: hidden;
-	position: relative;
-}
-body .tab-content>.tab-pane.active {
-	height: auto;
-	overflow-x: visible;
-	overflow-y: visible;
-}
-
-body .modal-body .nav-pills > li > a,
-body .box-body .nav-pills > li > a {
-	padding: 5px 15px;
-	border: none;
-}
-
-body .modal-body .nav-stacked > li {
-	border-bottom: 1px solid #f4f4f4;
-	margin: 0;
-}
-body .modal-body .nav-stacked > li:last-child {
-	border-bottom: none;
-}
-
-body .box-body .nav-tabs-custom {
-	box-shadow: none;
-	margin-bottom: 0;
-}
-body .box-body .nav-tabs-custom > .nav-tabs > li:first-of-type.active > a {
-	border-left-color: #f4f4f4;
-}
-body .box-body .nav-tabs-custom > .nav-tabs > li > a {
-	padding: 8px 15px;
-}
-body .box-body .nav-tabs-custom > .tab-content {
-	padding: 10px 0;
-}
-
-/* Box */
-.box .guideline {
-	margin-top: 0;
-}
-
-.box.inner-box {
-	border: none;
-	box-shadow: none;
-	padding: 5px 10px;
-	margin: 0;
-	border-bottom: 1px solid #f4f4f4;
-	position: relative;
-	border-radius: 0;
-}
-
-.box.inner-box .box-title {
-	margin: 0 5px 5px 0;
-	padding: 0;
-	font-size: 16px;
-	font-weight: bolder;
-	display: inline-block;
-	word-break: break-all;
-}
-
-.box.inner-box .box-tools {
-	position: absolute;
-	top: 0;
-	right: 0;
-}
-
-.box.inner-box:last-child {
-	border-bottom: none;
-}
-
-/* Navigation Tab */
-.nav-tabs-custom {
-	position: relative;
-}
-
-.nav-tabs-custom .box-tools {
-	position: absolute;
-	right: 15px;
-	top: 8px;
-}
-
-.nav-tabs-custom .box-tools .strong {
-	font-weight: bolder;
-}
-
-/* Customize */
-#content {
-	position: relative;
-}
-
-.page-fixed {
-	position: absolute;
-	top: -45px;
-	right: 0;
-}
-
-@media (max-width:991px) {
-	.page-fixed {
-		top: -70px;
-	}
-}
-
-.fixed-right {
-	position: absolute;
-	right: 0;
-	z-index: 3;
-}
-
-.main-header .logo img {
-	height: 34px;
-}
-
-.main-header .navbar-toggle {
-	float: none;
-	border-radius: 0;
-}
-.main-header .navbar-toggle:hover {
-	background: rgba(0, 0, 0, 0.1);
-}
-
-#moduleMenu > ul > li.active > a {
-	border-top: 3px solid rgba(255,255,255,0.8);
-	padding-top: 12px;
-}
-
-@media (max-width: 767px) {
-	#moduleMenu > ul > li.active > a {
-		padding: 10px 15px;
-		border-top: none;
-		border-left: 3px solid rgba(255,255,255,0.8);
-	}
-
-	.main-header .navbar .navbar-custom-menu .nav .dropdown-menu li a {
-		color: #333;
-	}
-	.main-header .navbar .navbar-custom-menu .nav .dropdown-menu li a:hover {
-		color: #FFF;
-	}
-}
-
-#timeRangePickerCntr .navbar-form {
-	display: inline-block;
-	padding-right: 0;
-}
-
-#timeRangePickerCntr #timeRangePicker {
-	min-width: 300px;
-}
-
-body .login-box, body .register-box {
-	margin: 3% auto;
-}
-
-.content-header > .breadcrumb > li {
-	font-size: 14px;
-}
-
-.daterangepicker .ranges {
-  width: 110px!important;
-}
-.daterangepicker .daterangepicker_start_input,
-.daterangepicker .daterangepicker_end_input {
-	display: block!important;
-	padding: 0!important;
-	float: none!important;
-}
-.daterangepicker .daterangepicker_start_input .input-mini,
-.daterangepicker .daterangepicker_end_input .input-mini {
-	width: 110px!important;
-}
-
-.form-group.inner-icon {
-	position: relative;
-}
-.form-group.inner-icon .fa {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-}
-.form-group.inner-icon input {
-	padding-left: 35px;
-}
-
-#autoRefreshCntr > a {
-	border: none;
-	opacity: 0.3;
-}
-#autoRefreshCntr.autoRefresh > a {
-	opacity: 1;
-}
-
-.table-responsive .row {
-	margin: 0;
-}
-
-
-/* Misc */
-body .tooltip-inner {
-	max-width: 500px;
-}
-
-.text-nowrap {
-	white-space: nowrap;
-}
-
-.text-ellipsis,
-.label.text-ellipsis {
-	overflow:hidden;
-	text-overflow:ellipsis;
-	display: inline-block;
-	white-space: nowrap;
-	max-width: 100%;
-}
-td.text-ellipsis {
-	display: table-cell;
-}
-
-.text-breakall {
-	max-width: 100%;
-	display: inline-block;
-	word-wrap: break-word;
-}
-
-.btn.btn-xs.sm {
-	font-size: 12px;
-	padding: 2px 6px;
-}
-
-.form-control.input-xs {
-	height: 24px;
-	padding: 2px 8px;
-	font-size: 12px;
-	line-height: 100%;
-}
-
-pre.noWrap {
-	border: none;
-	border-radius: 0;
-	background: transparent;
-	margin: 0;
-	padding: 0;
-}
-
-.noSelect {
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-}
-
-.blink {
-	animation: blinker 1s linear infinite;
-}
-
-@keyframes blinker {
-	50% {opacity: 0.0;}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/classification/controller.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/classification/controller.js b/eagle-webservice/src/main/webapp/_app/public/feature/classification/controller.js
deleted file mode 100644
index 462b41b..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/classification/controller.js
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var featureControllers = angular.module('featureControllers');
-	var feature = featureControllers.register("classification");
-	var eagleApp = angular.module('eagleApp');
-
-	// ==============================================================
-	// =                          Function                          =
-	// ==============================================================
-
-	// =============================================================
-	// =                        Sensitivity                        =
-	// =============================================================
-	feature.navItem("sensitivity", "Classification", "user-secret");
-	feature.controller('sensitivity', function(PageConfig, Site, $scope, Application, Entities, UI) {
-		PageConfig.pageTitle = "Data Classification";
-		PageConfig.pageSubTitle = Site.current().tags.site;
-		$scope.ajaxId = eagleApp._TRS();
-		$scope.viewConfig = Application.current().configObj.view;
-
-		if(!$scope.viewConfig) {
-			$.dialog({
-				title: "OPS",
-				content: "View configuration not defined in Application."
-			});
-			return;
-		}
-
-		// ===================== Function =====================
-		$scope.export = function() {
-			var _data = {};
-			UI.fieldConfirm({title: "Export Classification", confirm: false, size: "large"}, _data, [
-				{name: "Data", field: "data", type: "blob", rows: 20, optional: true, readonly: true}]
-			);
-
-			Entities.queryEntities($scope.viewConfig.service, {site: Site.current().tags.site})._promise.then(function(data) {
-				_data.data = JSON.stringify(data, null, "\t");
-			});
-		};
-
-		$scope.import = function() {
-			UI.fieldConfirm({title: "Import Classification", size: "large"}, {}, [
-				{name: "Data", field: "data", type: "blob", rows: 20, optional: true}
-			], function(entity) {
-				var _list = common.parseJSON(entity.data, false);
-				if(!_list) {
-					return "Invalid JSON format";
-				}
-				if(!$.isArray(_list)) {
-					return "Not an array";
-				}
-			}).then(null, null, function(holder) {
-				Entities.updateEntity($scope.viewConfig.service, common.parseJSON(holder.entity.data, []), {timestamp: false})._promise.then(function() {
-					holder.closeFunc();
-					location.reload();
-				});
-			});
-		};
-
-		$scope.deleteAll = function() {
-			UI.deleteConfirm("All the Classification Data").then(null, null, function(holder) {
-				Entities.deleteEntities($scope.viewConfig.service, {site: Site.current().tags.site})._promise.then(function() {
-					holder.closeFunc();
-					location.reload();
-				});
-			});
-		};
-	});
-     // =============================================================
-    	// =                    Sensitivity - Job                   =
-    	// =============================================================
-    	feature.controller('sensitivityViewJob', function(Site, $scope, $wrapState, Entities) {
-    		$scope.items = [];
-
-    		// Mark sensitivity
-    		$scope._oriItem = {};
-    		$scope._markItem = {};
-
-    		// ======================= View =======================
-    		// Item
-    		$scope.updateItems = function() {
-    			$scope.items = Entities.query($scope.viewConfig.api, {site: Site.current().tags.site});
-    		};
-
-
-    		$scope.updateItems();
-
-    		// =================== Sensitivity ===================
-    		$scope.markSensitivity = function(item) {
-    			$scope._oriItem = item;
-    			$scope._markItem = {
-    				prefix: $scope.viewConfig.prefix,
-    				tags: {
-    					site: Site.current().tags.site
-    				},
-    				sensitivityType: ""
-    			};
-
-    			$scope._markItem.tags[$scope.viewConfig.keys[0]] = item.jobId;
-    			$("#sensitivityMDL").modal();
-    		};
-    		$scope.confirmUpateSensitivity = function() {
-    			$scope._oriItem.sensitiveType = $scope._markItem.sensitivityType;
-    			Entities.updateEntity($scope.viewConfig.service, $scope._markItem, {timestamp: false})._promise.success(function(data) {
-    				Entities.dialog(data);
-    			});
-    			$("#sensitivityMDL").modal('hide');
-    		};
-    		$scope.unmarkSensitivity = function(item) {
-    			$.dialog({
-    				title: "Unmark Confirm",
-    				content: "Do you want to remove the sensitivity mark on '" + item.jobId + "'?",
-    				confirm: true
-    			}, function(ret) {
-    				if(!ret) return;
-
-    				var _cond = {site: Site.current().tags.site};
-    				_cond[$scope.viewConfig.keys[0]] = item.jobId;
-    				Entities.deleteEntities($scope.viewConfig.service, _cond);
-
-    				item.sensitiveType = null;
-    				$scope.$apply();
-    			});
-    		};
-    	});
-	// =============================================================
-	// =                    Sensitivity - Folder                   =
-	// =============================================================
-	feature.controller('sensitivityViewFolder', function(Site, $scope, $wrapState, Entities) {
-		$scope.path = $wrapState.param.path || "/";
-		$scope.pathUnitList = [];
-		$scope.items = [];
-
-		// Mark sensitivity
-		$scope._oriItem = {};
-		$scope._markItem = {};
-
-		// ======================= View =======================
-		// Path
-		function _refreshPathUnitList(_path) {
-			var _start,_current, _unitList = [];
-			_path = _path + (_path.match(/\/$/) ? "" : "/");
-			for(_current = _start = 0 ; _current < _path.length ; _current += 1) {
-				if(_path[_current] === "/") {
-					_unitList.push({
-						name: _path.substring(_start, _current + (_current === 0 ? 1 : 0)),
-						path: _path.substring(0, _current === 0 ? 1 : _current)
-					});
-					_start = _current + 1;
-				}
-			}
-			$scope.pathUnitList = _unitList;
-		}
-
-		// Item
-		$scope.updateItems = function(path) {
-			if(path) $scope.path = path;
-
-			$scope.items = Entities.query($scope.viewConfig.api, {site: Site.current().tags.site, path: $scope.path});
-			$scope.items._promise.success(function(data) {
-				Entities.dialog(data, function() {
-					if($scope.path !== "/") $scope.updateItems("/");
-				});
-			});
-			_refreshPathUnitList($scope.path);
-		};
-
-		$scope.getFileName = function(item) {
-			return (item.resource + "").replace(/^.*\//, "");
-		};
-
-		$scope.updateItems($scope.path);
-
-		// =================== Sensitivity ===================
-		$scope.markSensitivity = function(item) {
-			$scope._oriItem = item;
-			$scope._markItem = {
-				prefix: $scope.viewConfig.prefix,
-				tags: {
-					site: Site.current().tags.site
-				},
-				sensitivityType: ""
-			};
-			$scope._markItem.tags[$scope.viewConfig.keys[0]] = item.resource;
-			$("#sensitivityMDL").modal();
-		};
-		$scope.confirmUpateSensitivity = function() {
-			$scope._oriItem.sensitiveType = $scope._markItem.sensitivityType;
-			Entities.updateEntity($scope.viewConfig.service, $scope._markItem, {timestamp: false})._promise.success(function(data) {
-				Entities.dialog(data);
-			});
-			$("#sensitivityMDL").modal('hide');
-		};
-		$scope.unmarkSensitivity = function(item) {
-			$.dialog({
-				title: "Unmark Confirm",
-				content: "Do you want to remove the sensitivity mark on '" + item.resource + "'?",
-				confirm: true
-			}, function(ret) {
-				if(!ret) return;
-
-				var _cond = {site: Site.current().tags.site};
-				_cond[$scope.viewConfig.keys[0]] = item.resource;
-				Entities.deleteEntities($scope.viewConfig.service, _cond);
-
-				item.sensitiveType = null;
-				$scope.$apply();
-			});
-		};
-	});
-
-	// =============================================================
-	// =                    Sensitivity - Table                    =
-	// =============================================================
-	feature.controller('sensitivityViewTable', function(Site, $scope, Entities) {
-		$scope.databases = null;
-		$scope.table = null;
-
-		// Mark sensitivity
-		$scope._oriItem = {};
-		$scope._markItem = {};
-
-		// ======================= View =======================
-		var _fillAttr = function(list, key, target) {
-			list._promise.then(function() {
-				$.each(list, function(i, unit) {
-					unit[key] = unit[target];
-				});
-			});
-			return list._promise;
-		};
-
-		$scope.loadDatabases = function(database) {
-			var _dbs = Entities.query($scope.viewConfig.api.database, {site: Site.current().tags.site});
-			return _fillAttr(_dbs, "database", $scope.viewConfig.mapping.database).then(function() {
-				if($scope.databases) {
-					$.each($scope.databases, function(i, oriDB) {
-						var db = common.array.find(oriDB.resource, _dbs, "resource");
-						if(db) {
-							db.show = oriDB.show;
-							db.tables = oriDB.tables;
-						}
-					});
-				}
-				$scope.databases = _dbs;
-			});
-		};
-		$scope.loadDatabases();
-
-		$scope.loadTables = function(database, force) {
-			var _tables, _qry;
-			if(database.tables && !force) return;
-			_qry = {
-				site: Site.current().tags.site
-			};
-			_qry[$scope.viewConfig.mapping.database] = database[$scope.viewConfig.mapping.database];
-			_tables = Entities.query($scope.viewConfig.api.table, _qry);
-			if(!database.tables) database.tables = _tables;
-			_fillAttr(_tables, "table", $scope.viewConfig.mapping.table);
-			return _fillAttr(_tables, "database", $scope.viewConfig.mapping.database).then(function() {
-				database.tables = _tables;
-			});
-		};
-
-		$scope.loadColumns = function(database, table) {
-			$scope.table = table;
-
-			if(table.columns) return;
-			var _qry = {
-				site: Site.current().tags.site
-			};
-			_qry[$scope.viewConfig.mapping.database] = database[$scope.viewConfig.mapping.database];
-			_qry[$scope.viewConfig.mapping.table] = table[$scope.viewConfig.mapping.table];
-			table.columns = Entities.query($scope.viewConfig.api.column, _qry);
-			_fillAttr(table.columns, "column", $scope.viewConfig.mapping.column);
-		};
-
-		$scope.refreshData = function() {
-			$scope.loadDatabases().then(function() {
-				if(!$scope.table) return;
-
-				var _table = $scope.table;
-				var _db = common.array.find($scope.table.database, $scope.databases, "database");
-				if(_db) {
-					$scope.loadTables(_db, true).then(function() {
-						$scope.table = common.array.find(_table.table, _db.tables, "table");
-						$scope.table.columns = _table.columns;
-					});
-				}
-			});
-		};
-
-		// =================== Sensitivity ===================
-		$scope.markSensitivity = function(item, event) {
-			if(event) event.stopPropagation();
-
-			$scope._oriItem = item;
-			$scope._markItem = {
-				prefix: $scope.viewConfig.prefix,
-				tags: {
-					site: Site.current().tags.site
-				},
-				sensitivityType: ""
-			};
-			$scope._markItem.tags[$scope.viewConfig.keys[0]] = item.resource;
-			$("#sensitivityMDL").modal();
-		};
-		$scope.confirmUpateSensitivity = function() {
-			$scope._oriItem.sensitiveType = $scope._markItem.sensitivityType;
-			Entities.updateEntity($scope.viewConfig.service, $scope._markItem, {timestamp: false})._promise.success(function(data) {
-				Entities.dialog(data);
-				$scope.refreshData();
-			});
-			$("#sensitivityMDL").modal('hide');
-		};
-		$scope.unmarkSensitivity = function(item, event) {
-			if(event) event.stopPropagation();
-
-			$.dialog({
-				title: "Unmark Confirm",
-				content: "Do you want to remove the sensitivity mark on '" + item.resource + "'?",
-				confirm: true
-			}, function(ret) {
-				if(!ret) return;
-
-				var _qry = {
-					site: Site.current().tags.site
-				};
-				_qry[$scope.viewConfig.keys[0]] = item.resource;
-				Entities.deleteEntities($scope.viewConfig.service, _qry)._promise.then(function() {
-					$scope.refreshData();
-				});
-
-				item.sensitiveType = null;
-				$scope.$apply();
-			});
-		};
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity.html b/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity.html
deleted file mode 100644
index 41fb291..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<div class="box box-primary">
-	<div class="box-header with-border">
-		<i class="fa fa-folder-open"></i>
-		<h3 class="box-title ng-binding">{{Application.current().displayName}}</h3>
-		<div class="box-tools pull-right" ng-if="viewConfig">
-			<div class="btn-group">
-				<button type="button" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown">
-					<span class="fa fa-wrench"></span>
-				</button>
-				<ul class="dropdown-menu" role="menu">
-					<li><a ng-click="import()"><span class="fa fa-cloud-upload"></span> Import</a></li>
-					<li><a ng-click="export()"><span class="fa fa-cloud-download"></span> Export</a></li>
-					<li class="divider"></li>
-					<li class="danger"><a ng-click="deleteAll()"><span class="fa fa-trash"></span> Delete All</a></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-	<div class="box-body">
-		<ng-include ng-if="viewConfig" src="'public/feature/classification/page/sensitivity/' + viewConfig.type + '.html?_=' + ajaxId"></ng-include>
-	</div>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/folder.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/folder.html b/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/folder.html
deleted file mode 100644
index cfefffa..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/folder.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<div ng-controller="classification_sensitivityViewFolder">
-	<ul class="list-inline path">
-		<li>Path:</li>
-		<li ng-repeat="unit in pathUnitList">
-			<a ng-click="updateItems(unit.path)" class="label bg-black">{{unit.name}}</a>
-		</li>
-	</ul>
-
-	<table class="table table-bordered">
-		<thead>
-			<tr>
-				<th width="15%">File Name</th>
-				<th width="10%">Owner</th>
-				<th width="10%">Group</th>
-				<th>Sensitivity Type</th>
-				<th width="10" ng-show="Auth.isRole('ROLE_ADMIN')"> </th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr ng-show="items._promise.$$state.status !== 1">
-				<td colspan="5">
-					<span class="fa fa-refresh fa-spin"> </span>
-					Loading...
-				</td>
-			</tr>
-			<tr ng-show="items._promise.$$state.status === 1 && !items.length">
-				<td colspan="5">
-					<span class="fa fa-exclamation-triangle"> </span>
-					Empty Folder
-				</td>
-			</tr>
-			<tr ng-repeat="item in items" ng-class="{warning : item.sensitiveType}">
-				<td>
-					<span ng-show="!item.isdir">
-						<span class="fa fa-file"> </span>
-						{{getFileName(item)}}
-					</span>
-					<a ng-show="item.isdir" ng-click="updateItems(item.resource)">
-						<span class="fa fa-folder"> </span>
-						{{getFileName(item)}}
-					</a>
-
-					<span class="pull-right" ng-show="item.childSensitiveTypes.length">
-						<span class="fa fa-dot-circle-o text-muted" uib-tooltip="Contain child sensitivity defination"> </span>
-					</span>
-				</td>
-				<td>{{item.owner}}</td>
-				<td>{{item.groupName}}</td>
-				<td>{{item.sensitiveType}}</td>
-				<td ng-show="Auth.isRole('ROLE_ADMIN')">
-					<button class="fa fa-eye btn btn-primary btn-xs" ng-click="markSensitivity(item)" ng-show="!item.sensitiveType"
-					uib-tooltip="Mark as sensitivity data" tooltip-animation="false" tooltip-placement="left"> </button>
-					<button class="fa fa-eye-slash btn btn-warning btn-xs" ng-click="unmarkSensitivity(item)" ng-show="item.sensitiveType"
-					uib-tooltip="Remove the sensitivity mark" tooltip-animation="false" tooltip-placement="left"> </button>
-				</td>
-			</tr>
-		</tbody>
-	</table>
-
-
-	<!-- Modal: Create / Edit site -->
-	<div class="modal fade" id="sensitivityMDL" tabindex="-1" role="dialog">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-					<h4 class="modal-title">Mark Sensitivity Data</h4>
-				</div>
-				<div class="modal-body">
-					<div class="form-group">
-						<label>Resource</label>
-						<input type="text" readonly="readonly" class="form-control" ng-model="_markItem.tags.filedir" />
-					</div>
-					<div class="form-group">
-						<label>* Sensitivity Type</label>
-						<input type="text" class="form-control" ng-model="_markItem.sensitivityType" id="sensitiveType" />
-					</div>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal">
-						Close
-					</button>
-					<button type="button" class="btn btn-primary" ng-click="confirmUpateSensitivity()" ng-disabled="!_markItem.sensitivityType">
-						Update
-					</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/job.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/job.html b/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/job.html
deleted file mode 100644
index 05d70da..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/job.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<div ng-controller="classification_sensitivityViewJob">
-    <ul class="list-inline path">
-        <li>Oozie CoordinatorJob:</li>
-    </ul>
-
-    <table class="table table-bordered">
-        <thead>
-        <tr>
-            <th width="15%">JobId</th>
-            <th width="10%">AppName</th>
-            <th>Sensitivity Type</th>
-            <th width="10" ng-show="Auth.isRole('ROLE_ADMIN')"> </th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr ng-show="items._promise.$$state.status !== 1">
-            <td colspan="5">
-                <span class="fa fa-refresh fa-spin"> </span>
-                Loading...
-            </td>
-        </tr>
-        <tr ng-show="items._promise.$$state.status === 1 && !items.length">
-            <td colspan="5">
-                <span class="fa fa-exclamation-triangle"> </span>
-                Empty
-            </td>
-        </tr>
-        <tr ng-repeat="item in items" ng-class="{warning : item.sensitiveType}">
-            <td>{{item.jobId}}</td>
-            <td>{{item.name}}</td>
-            <td>{{item.sensitiveType}}</td>
-            <td ng-show="Auth.isRole('ROLE_ADMIN')">
-                <button class="fa fa-eye btn btn-primary btn-xs" ng-click="markSensitivity(item)" ng-show="!item.sensitiveType"
-                        uib-tooltip="Mark as sensitivity data" tooltip-animation="false" tooltip-placement="left"> </button>
-                <button class="fa fa-eye-slash btn btn-warning btn-xs" ng-click="unmarkSensitivity(item)" ng-show="item.sensitiveType"
-                        uib-tooltip="Remove the sensitivity mark" tooltip-animation="false" tooltip-placement="left"> </button>
-            </td>
-        </tr>
-        </tbody>
-    </table>
-
-
-    <!-- Modal: Create / Edit site -->
-    <div class="modal fade" id="sensitivityMDL" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                    <h4 class="modal-title">Mark Sensitivity Data</h4>
-                </div>
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label>Resource</label>
-                        <input type="text" readonly="readonly" class="form-control" ng-model="_markItem.tags.oozieResource" />
-                    </div>
-                    <div class="form-group">
-                        <label>* Sensitivity Type</label>
-                        <input type="text" class="form-control" ng-model="_markItem.sensitivityType" id="sensitiveType" />
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">
-                        Close
-                    </button>
-                    <button type="button" class="btn btn-primary" ng-click="confirmUpateSensitivity()" ng-disabled="!_markItem.sensitivityType">
-                        Update
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/table.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/table.html b/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/table.html
deleted file mode 100644
index 13d5807..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/classification/page/sensitivity/table.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<div ng-controller="classification_sensitivityViewTable">
-	<p ng-show="databases._promise.$$state.status !== 1">
-		<span class="fa fa-refresh fa-spin"> </span>
-		Loading...
-	</p>
-
-	<div ng-show="databases._promise.$$state.status === 1" class="row">
-		<div class="col-md-4">
-			<label>
-				Databases
-				({{databases.length}})
-			</label>
-			<ul class="tree tree-bordered" style="max-height: 500px; overflow-y: auto;">
-				<li ng-repeat="db in databases">
-					<span class="tree-item box-clickable text-primary" ng-click="db.show = !db.show; loadTables(db);">
-						<span ng-class="{'text-warning' : db.sensitiveType}">
-							<span class="fa fa-database"> </span>
-							{{db.database}}
-							<span ng-show="db.tables._promise.$$state.status === 1">({{db.tables.length}})</span>
-
-							<span ng-show="Auth.isRole('ROLE_ADMIN')">
-								<a class="fa fa-eye text-muted hover" ng-click="markSensitivity(db, $event)" ng-show="!db.sensitiveType"
-								uib-tooltip="Mark as sensitivity data" tooltip-animation="false" tooltip-placement="right"></a>
-								<a class="fa fa-eye-slash text-muted hover" ng-click="unmarkSensitivity(db, $event)" ng-show="db.sensitiveType"
-								uib-tooltip="Remove the sensitivity mark" tooltip-animation="false" tooltip-placement="right"></a>
-							</span>
-
-							<span class="pull-right" ng-show="db.childSensitiveTypes.length">
-								<span class="fa fa-dot-circle-o" uib-tooltip="Contain child sensitivity defination" tooltip-placement="right" tooltip-append-to-body="true"> </span>
-							</span>
-							<span ng-show="db.sensitiveType" class="pull-right">[{{db.sensitiveType}}]</span>
-						</span>
-					</span>
-					<ul ng-show="db.show">
-						<li ng-show="db.tables._promise.$$state.status !== 1">
-							<span>
-								<span class="fa fa-refresh fa-spin"> </span>
-								Loading...
-							</span>
-						</li>
-						<li ng-repeat="tb in db.tables" ng-class="{active : tb === table}">
-							<span class="tree-item box-clickable text-primary" ng-click="loadColumns(db, tb)">
-								<span ng-class="{'text-warning' : tb.sensitiveType}">
-									<span class="fa fa-table"> </span>
-									{{tb.table}}
-
-									<span ng-show="Auth.isRole('ROLE_ADMIN')">
-										<a class="fa fa-eye text-muted hover" ng-click="markSensitivity(tb, $event)" ng-show="!tb.sensitiveType"
-										uib-tooltip="Mark as sensitivity data" tooltip-animation="false" tooltip-placement="right"></a>
-										<a class="fa fa-eye-slash text-muted hover" ng-click="unmarkSensitivity(tb, $event)" ng-show="tb.sensitiveType"
-										uib-tooltip="Remove the sensitivity mark" tooltip-animation="false" tooltip-placement="right"></a>
-									</span>
-
-									<span class="pull-right" ng-show="tb.childSensitiveTypes.length">
-										<span class="fa fa-dot-circle-o" uib-tooltip="Contain child sensitivity defination" tooltip-placement="right" tooltip-append-to-body="true"> </span>
-									</span>
-									<span ng-show="tb.sensitiveType" class="pull-right">[{{tb.sensitiveType}}]</span>
-								</span>
-							</span>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</div>
-		<div class="col-md-8">
-			<label ng-show="table">Route: {{table.database}} > {{table.table}}</label>
-			<p ng-show="table && table.columns._promise.$$state.status !== 1">
-				<span class="fa fa-refresh fa-spin"> </span>
-				Loading...
-			</p>
-			<div ng-show="table && table.columns._promise.$$state.status === 1">
-				<table class="table table-bordered">
-					<thead>
-						<tr>
-							<th width="40%">Column Name</th>
-							<th>Sensitivity Type</th>
-							<th width="10" ng-show="Auth.isRole('ROLE_ADMIN')"> </th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr ng-repeat="col in table.columns" ng-class="{warning : col.sensitiveType}">
-							<td>{{col.column}}</td>
-							<td>{{col.sensitiveType}}</td>
-							<td ng-show="Auth.isRole('ROLE_ADMIN')">
-								<button class="fa fa-eye btn btn-primary btn-xs" ng-click="markSensitivity(col)" ng-show="!col.sensitiveType"
-								uib-tooltip="Mark as sensitivity data" tooltip-animation="false" tooltip-placement="left"> </button>
-								<button class="fa fa-eye-slash btn btn-warning btn-xs" ng-click="unmarkSensitivity(col)" ng-show="col.sensitiveType"
-								uib-tooltip="Remove the sensitivity mark" tooltip-animation="false" tooltip-placement="left"> </button>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		</div>
-	</div>
-
-
-
-
-
-
-	<!-- Modal: Create / Edit site -->
-	<div class="modal fade" id="sensitivityMDL" tabindex="-1" role="dialog">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-					<h4 class="modal-title">Mark Sensitivity Data</h4>
-				</div>
-				<div class="modal-body">
-					<div class="form-group">
-						<label>Resource</label>
-						<input type="text" readonly="readonly" class="form-control" ng-model="_markItem.tags[viewConfig.keys[0]]" />
-					</div>
-					<div class="form-group">
-						<label>* Sensitivity Type</label>
-						<input type="text" class="form-control" ng-model="_markItem.sensitivityType" id="sensitiveType" />
-					</div>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal">
-						Close
-					</button>
-					<button type="button" class="btn btn-primary" ng-click="confirmUpateSensitivity()" ng-disabled="!_markItem.sensitivityType">
-						Update
-					</button>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file


[04/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/common/controller.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/common/controller.js b/eagle-webservice/src/main/webapp/_app/public/feature/common/controller.js
deleted file mode 100644
index 207c8df..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/common/controller.js
+++ /dev/null
@@ -1,1224 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var featureControllers = angular.module("featureControllers");
-	var feature = featureControllers.register("common");
-
-	// ==============================================================
-	// =                          Function                          =
-	// ==============================================================
-	feature.service("Policy", function(Entities) {
-		var Policy = function () {};
-
-		Policy.updatePolicyStatus = function(policy, status) {
-			$.dialog({
-				title: "Confirm",
-				content: "Do you want to " + (status ? "enable" : "disable") + " policy[" + policy.tags.policyId + "]?",
-				confirm: true
-			}, function(ret) {
-				if(ret) {
-					policy.enabled = status;
-					Entities.updateEntity("AlertDefinitionService", policy);
-				}
-			});
-		};
-		Policy.deletePolicy = function(policy, callback) {
-			$.dialog({
-				title: "Confirm",
-				content: "Do you want to delete policy[" + policy.tags.policyId + "]?",
-				confirm: true
-			}, function(ret) {
-				if(ret) {
-					policy.enabled = status;
-					Entities.deleteEntity("AlertDefinitionService", policy)._promise.finally(function() {
-						if(callback) {
-							callback(policy);
-						}
-					});
-				}
-			});
-		};
-		return Policy;
-	});
-
-	feature.service("Notification", function(Entities) {
-		var Notification = function () {};
-		Notification.map = {};
-
-		Notification.list = Entities.queryEntities("AlertNotificationService");
-		Notification.list._promise.then(function () {
-			$.each(Notification.list, function (i, notification) {
-				// Parse fields
-				notification.fieldList = common.parseJSON(notification.fields, []);
-
-				// Fill map
-				Notification.map[notification.tags.notificationType] = notification;
-			});
-		});
-
-		Notification.promise = Notification.list._promise;
-
-		return Notification;
-	});
-
-	// ==============================================================
-	// =                          Policies                          =
-	// ==============================================================
-
-	// ========================= Policy List ========================
-	feature.navItem("policyList", "Policies", "list");
-	feature.controller('policyList', function(PageConfig, Site, $scope, Application, Entities, Policy) {
-		PageConfig.pageTitle = "Policy List";
-		PageConfig.pageSubTitle = Site.current().tags.site;
-
-		// Initial load
-		$scope.policyList = [];
-		$scope.application = Application.current();
-
-		// List policies
-		var _policyList = Entities.queryEntities("AlertDefinitionService", {site: Site.current().tags.site, application: $scope.application.tags.application});
-		_policyList._promise.then(function() {
-			$.each(_policyList, function(i, policy) {
-				policy.__expression = common.parseJSON(policy.policyDef, {}).expression;
-
-				$scope.policyList.push(policy);
-			});
-		});
-		$scope.policyList._promise = _policyList._promise;
-
-		// Function
-		$scope.searchFunc = function(item) {
-			var key = $scope.search;
-			if(!key) return true;
-
-			var _key = key.toLowerCase();
-			function _hasKey(item, path) {
-				var _value = common.getValueByPath(item, path, "").toLowerCase();
-				return _value.indexOf(_key) !== -1;
-			}
-			return _hasKey(item, "tags.policyId") || _hasKey(item, "__expression") || _hasKey(item, "description") || _hasKey(item, "owner");
-		};
-
-		$scope.updatePolicyStatus = Policy.updatePolicyStatus;
-		$scope.deletePolicy = function(policy) {
-			Policy.deletePolicy(policy, function(policy) {
-				var _index = $scope.policyList.indexOf(policy);
-				$scope.policyList.splice(_index, 1);
-			});
-		};
-	});
-
-	// ======================= Policy Detail ========================
-	feature.controller('policyDetail', function(PageConfig, Site, $scope, $wrapState, $interval, Entities, Policy, nvd3) {
-		var MAX_PAGESIZE = 10000;
-		var seriesRefreshInterval;
-
-		PageConfig.pageTitle = "Policy Detail";
-		PageConfig.lockSite = true;
-		PageConfig
-			.addNavPath("Policy List", "/common/policyList")
-			.addNavPath("Policy Detail");
-
-		$scope.chartConfig = {
-			chart: "line",
-			xType: "time"
-		};
-
-		// Query policy
-		if($wrapState.param.filter) {
-			$scope.policyList = Entities.queryEntity("AlertDefinitionService", $wrapState.param.filter);
-		} else {
-			$scope.policyList = Entities.queryEntities("AlertDefinitionService", {
-				policyId: $wrapState.param.policy,
-				site: $wrapState.param.site,
-				alertExecutorId: $wrapState.param.executor
-			});
-		}
-
-		$scope.policyList._promise.then(function() {
-			var policy = null;
-
-			if($scope.policyList.length === 0) {
-				$.dialog({
-					title: "OPS!",
-					content: "Policy not found!"
-				}, function() {
-					location.href = "#/common/policyList";
-				});
-				return;
-			} else {
-				policy = $scope.policyList[0];
-
-				policy.__notificationList = common.parseJSON(policy.notificationDef, []);
-
-				policy.__expression = common.parseJSON(policy.policyDef, {}).expression;
-
-				$scope.policy = policy;
-				Site.current(Site.find($scope.policy.tags.site));
-				console.log($scope.policy);
-			}
-
-			// Visualization
-			var _intervalType = 0;
-			var _intervalList = [
-				["Daily", 1440, function() {
-					var _endTime = app.time.now().hour(23).minute(59).second(59).millisecond(0);
-					var _startTime = _endTime.clone().subtract(1, "month").hour(0).minute(0).second(0).millisecond(0);
-					return [_startTime, _endTime];
-				}],
-				["Hourly", 60, function() {
-					var _endTime = app.time.now().minute(59).second(59).millisecond(0);
-					var _startTime = _endTime.clone().subtract(48, "hour").minute(0).second(0).millisecond(0);
-					return [_startTime, _endTime];
-				}],
-				["Every 5 minutes", 5, function() {
-					var _endTime = app.time.now().second(59).millisecond(0);
-					var _minute = Math.floor(_endTime.minute() / 5) * 5;
-					var _startTime = _endTime.clone().minute(_minute).subtract(5 * 30, "minute").second(0).millisecond(0);
-					_endTime.minute(_minute + 4);
-					return [_startTime, _endTime];
-				}]
-			];
-
-			function _loadSeries(seriesName, metricName, condition) {
-				var list = Entities.querySeries("GenericMetricService", $.extend({_metricName: metricName}, condition), "@site", "sum(value)", _intervalList[_intervalType][1]);
-				var seriesList = nvd3.convert.eagle([list]);
-				if(!$scope[seriesName]) $scope[seriesName] = seriesList;
-				list._promise.then(function() {
-					$scope[seriesName] = seriesList;
-				});
-			}
-
-			function refreshSeries() {
-				var _timeRange = _intervalList[_intervalType][2]();
-				var _startTime = _timeRange[0];
-				var _endTime = _timeRange[1];
-				var _cond = {
-					application: policy.tags.application,
-					policyId: policy.tags.policyId,
-					_startTime: _startTime,
-					_endTime: _endTime
-				};
-				console.log("Range:", common.format.date(_startTime, "datetime"), common.format.date(_endTime, "datetime"));
-
-				// > eagle.policy.eval.count
-				_loadSeries("policyEvalSeries", "eagle.policy.eval.count", _cond);
-
-				// > eagle.policy.eval.fail.count
-				_loadSeries("policyEvalFailSeries", "eagle.policy.eval.fail.count", _cond);
-
-				// > eagle.alert.count
-				_loadSeries("alertSeries", "eagle.alert.count", _cond);
-
-				// > eagle.alert.fail.count
-				_loadSeries("alertFailSeries", "eagle.alert.fail.count", _cond);
-			}
-
-			// Alert list
-			$scope.alertList = Entities.queryEntities("AlertService", {
-				site: Site.current().tags.site,
-				application: policy.tags.application,
-				policyId: policy.tags.policyId,
-				_pageSize: MAX_PAGESIZE,
-				_duration: 1000 * 60 * 60 * 24 * 30,
-				__ETD: 1000 * 60 * 60 * 24
-			});
-
-			refreshSeries();
-			seriesRefreshInterval = $interval(refreshSeries, 60000);
-
-			// Menu
-			$scope.visualizationMenu = [
-				{icon: "clock-o", title: "Interval", list:
-					$.map(_intervalList, function(item, index) {
-						var _item = {icon: "clock-o", title: item[0], func: function() {
-							_intervalType = index;
-							refreshSeries();
-						}};
-						Object.defineProperty(_item, 'strong', {
-							get: function() {return _intervalType === index;}
-						});
-						return _item;
-					})
-				}
-			];
-		});
-
-		// Function
-		$scope.updatePolicyStatus = Policy.updatePolicyStatus;
-		$scope.deletePolicy = function(policy) {
-			Policy.deletePolicy(policy, function() {
-				location.href = "#/common/policyList";
-			});
-		};
-
-		// Clean up
-		$scope.$on('$destroy', function() {
-			$interval.cancel(seriesRefreshInterval);
-		});
-	});
-
-	// ======================== Policy Edit =========================
-	function policyCtrl(create, PageConfig, Site, Policy, $scope, $wrapState, $q, UI, Entities, Application, Authorization, Notification) {
-		PageConfig.pageTitle = create ? "Policy Create" : "Policy Edit";
-		PageConfig.pageSubTitle = Site.current().tags.site;
-		PageConfig
-			.addNavPath("Policy List", "/common/policyList")
-			.addNavPath("Policy Edit");
-
-		var _winTimeDesc = "Number unit[millisecond, sec, min, hour, day, month, year]. e.g. 23 sec";
-		var _winTimeRegex = /^\d+\s+(millisecond|milliseconds|second|seconds|sec|minute|minutes|min|hour|hours|day|days|week|weeks|month|months|year|years)$/;
-		var _winTimeDefaultValue = '10 min';
-		$scope.config = {
-			window: [
-				// Display name, window type, required columns[Title, Description || "LONG_FIELD", Regex check, default value]
-				{
-					title: "Message Time Slide",
-					description: "Using timestamp filed from input is used as event's timestamp",
-					type: "externalTime",
-					fields:[
-						{title: "Field", defaultValue: "timestamp", hide: true},
-						{title: "Time", description: _winTimeDesc, regex: _winTimeRegex, defaultValue: _winTimeDefaultValue}
-					]
-				},
-				{
-					title: "System Time Slide",
-					description: "Using System time is used as timestamp for event's timestamp",
-					type: "time",
-					fields:[
-						{title: "Time", description: _winTimeDesc, regex: _winTimeRegex, defaultValue: _winTimeDefaultValue}
-					]
-				},
-				{
-					title: "System Time Batch",
-					description: "Same as System Time Window except the policy is evaluated at fixed duration",
-					type: "timeBatch",
-					fields:[
-						{title: "Time", description: _winTimeDesc, regex: _winTimeRegex, defaultValue: _winTimeDefaultValue}
-					]
-				},
-				{
-					title: "Length Slide",
-					description: "The slide window has a fixed length",
-					type: "length",
-					fields:[
-						{title: "Number", description: "Number only. e.g. 1023", regex: /^\d+$/}
-					]
-				},
-				{
-					title: "Length Batch",
-					description: "Same as Length window except the policy is evaluated in batch mode when fixed event count reached",
-					type: "lengthBatch",
-					fields:[
-						{title: "Number", description: "Number only. e.g. 1023", regex: /^\d+$/}
-					]
-				}
-			]
-		};
-
-		$scope.Notification = Notification;
-
-		$scope.create = create;
-		$scope.encodedRowkey = $wrapState.param.filter;
-
-		$scope.step = 0;
-		$scope.applications = {};
-		$scope.policy = {};
-
-		// ==========================================
-		// =              Notification              =
-		// ==========================================
-		$scope.notificationTabHolder = null;
-
-		$scope.newNotification = function (notificationType) {
-			var __notification = {
-				notificationType: notificationType
-			};
-
-			$.each(Notification.map[notificationType].fieldList, function (i, field) {
-				__notification[field.name] = field.value || "";
-			});
-
-			$scope.policy.__.notification.push(__notification);
-		};
-
-		Notification.promise.then(function () {
-			$scope.menu = Authorization.isRole('ROLE_ADMIN') ? [
-				{icon: "cog", title: "Configuration", list: [
-					{icon: "trash", title: "Delete", danger: true, func: function () {
-						var notification = $scope.notificationTabHolder.selectedPane.data;
-						UI.deleteConfirm(notification.notificationType).then(null, null, function(holder) {
-							common.array.remove(notification, $scope.policy.__.notification);
-							holder.closeFunc();
-						});
-					}}
-				]},
-				{icon: "plus", title: "New", list: $.map(Notification.list, function(notification) {
-					return {
-						icon: "plus",
-						title: notification.tags.notificationType,
-						func: function () {
-							$scope.newNotification(notification.tags.notificationType);
-							setTimeout(function() {
-								$scope.notificationTabHolder.setSelect(-1);
-								$scope.$apply();
-							}, 0);
-						}
-					};
-				})}
-			] : [];
-		});
-
-		// ==========================================
-		// =            Data Preparation            =
-		// ==========================================
-		// Steam list
-		var _streamList = Entities.queryEntities("AlertStreamService", {application: Application.current().tags.application});
-		var _executorList = Entities.queryEntities("AlertExecutorService", {application: Application.current().tags.application});
-		$scope.streamList = _streamList;
-		$scope.executorList = _executorList;
-		$scope.streamReady = false;
-
-		$q.all([_streamList._promise, _executorList._promise]).then(function() {
-			// Map executor with stream
-			$.each(_executorList, function(i, executor) {
-				$.each(_streamList, function(j, stream) {
-					if(stream.tags.application === executor.tags.application && stream.tags.streamName === executor.tags.streamName) {
-						stream.alertExecutor = executor;
-						return false;
-					}
-				});
-			});
-
-			// Fill stream list
-			$.each(_streamList, function(i, unit) {
-				var _srcStreamList = $scope.applications[unit.tags.application] = $scope.applications[unit.tags.application] || [];
-				_srcStreamList.push(unit);
-			});
-
-			$scope.streamReady = true;
-
-			// ==========================================
-			// =                Function                =
-			// ==========================================
-			function _findStream(application, streamName) {
-				var _streamList = $scope.applications[application];
-				if(!_streamList) return null;
-
-				for(var i = 0 ; i < _streamList.length ; i += 1) {
-					if(_streamList[i].tags.streamName === streamName) {
-						return _streamList[i];
-					}
-				}
-				return null;
-			}
-
-			// ==========================================
-			// =              Step control              =
-			// ==========================================
-			$scope.steps = [
-				// >> Select stream
-				{
-					title: "Select Stream",
-					ready: function() {
-						return $scope.streamReady;
-					},
-					init: function() {
-						$scope.policy.__.streamName = $scope.policy.__.streamName ||
-							common.array.find($scope.policy.tags.application, _streamList, "tags.application").tags.streamName;
-					},
-					nextable: function() {
-						var _streamName = common.getValueByPath($scope.policy, "__.streamName");
-						if(!_streamName) return false;
-
-						// Detect stream in current data source list
-						return !!common.array.find(_streamName, $scope.applications[$scope.policy.tags.application], "tags.streamName");
-					}
-				},
-
-				// >> Define Alert Policy
-				{
-					title: "Define Alert Policy",
-					init: function() {
-						// Normal mode will fetch meta list
-						if(!$scope.policy.__.advanced) {
-							var _stream = _findStream($scope.policy.tags.application, $scope.policy.__.streamName);
-							$scope._stream = _stream;
-
-							if(!_stream) {
-								$.dialog({
-									title: "OPS",
-									content: "Stream not found! Current application don't match any stream."
-								});
-								return;
-							}
-
-							if(!_stream.metas) {
-								_stream.metas = Entities.queryEntities("AlertStreamSchemaService", {application: $scope.policy.tags.application, streamName: $scope.policy.__.streamName});
-								_stream.metas._promise.then(function() {
-									_stream.metas.sort(function(a, b) {
-										if(a.tags.attrName < b.tags.attrName) {
-											return -1;
-										} else if(a.tags.attrName > b.tags.attrName) {
-											return 1;
-										}
-										return 0;
-									});
-								});
-							}
-						}
-					},
-					ready: function() {
-						if(!$scope.policy.__.advanced) {
-							return $scope._stream.metas._promise.$$state.status === 1;
-						}
-						return true;
-					},
-					nextable: function() {
-						if($scope.policy.__.advanced) {
-							// Check stream source
-							$scope._stream = null;
-							$.each($scope.applications[$scope.policy.tags.application], function(i, stream) {
-								if(($scope.policy.__._expression || "").indexOf(stream.tags.streamName) !== -1) {
-									$scope._stream = stream;
-									return false;
-								}
-							});
-							return $scope._stream;
-						} else {
-							// Window
-							if($scope.policy.__.windowConfig) {
-								var _winMatch = true;
-								var _winConds = $scope.getWindow().fields;
-								$.each(_winConds, function(i, cond) {
-									if(!(cond.val || "").match(cond.regex)) {
-										_winMatch = false;
-										return false;
-									}
-								});
-								if(!_winMatch) return false;
-
-								// Aggregation
-								if($scope.policy.__.groupAgg) {
-									if(!$scope.policy.__.groupAggPath ||
-										!$scope.policy.__.groupCondOp ||
-										!$scope.policy.__.groupCondVal) {
-										return false;
-									}
-								}
-							}
-						}
-						return true;
-					}
-				},
-
-				// >> Configuration & Notification
-				{
-					title: "Configuration & Notification",
-					nextable: function() {
-						return !!$scope.policy.tags.policyId;
-					}
-				}
-			];
-
-			// ==========================================
-			// =              Policy Logic              =
-			// ==========================================
-			_streamList._promise.then(function() {
-				// Initial policy entity
-				if(create) {
-					$scope.policy = {
-						__: {
-							toJSON: jQuery.noop,
-							conditions: {},
-							notification: [],
-							dedupe: {
-								alertDedupIntervalMin: 10,
-								fields: []
-							},
-							_dedupTags: {},
-							policy: {},
-							window: "externalTime",
-							group: "",
-							groupAgg: "count",
-							groupAggPath: "timestamp",
-							groupCondOp: ">=",
-							groupCondVal: "2"
-						},
-						description: "",
-						enabled: true,
-						prefix: "alertdef",
-						remediationDef: "",
-						tags: {
-							application: Application.current().tags.application,
-							policyType: "siddhiCEPEngine"
-						}
-					};
-
-					// If configured data source
-					if($wrapState.param.app) {
-						$scope.policy.tags.application = $wrapState.param.app;
-						if(common.array.find($wrapState.param.app, Site.current().applicationList, "tags.application")) {
-							setTimeout(function() {
-								$scope.changeStep(0, 2, false);
-								$scope.$apply();
-							}, 1);
-						}
-					}
-
-					// Start step
-					$scope.changeStep(0, 1, false);
-					console.log($scope.policy);
-				} else {
-					var _policy = Entities.queryEntity("AlertDefinitionService", $scope.encodedRowkey);
-					_policy._promise.then(function() {
-						if(_policy.length) {
-							$scope.policy = _policy[0];
-							$scope.policy.__ = {
-								toJSON: jQuery.noop
-							};
-
-							Site.current(Site.find($scope.policy.tags.site));
-						} else {
-							$.dialog({
-								title: "OPS",
-								content: "Policy not found!"
-							}, function() {
-								$wrapState.path("/common/policyList");
-								$scope.$apply();
-							});
-							return;
-						}
-
-						var _application = Application.current();
-						if(_application.tags.application !== $scope.policy.tags.application) {
-							_application = Application.find($scope.policy.tags.application);
-							if(_application) {
-								Application.current(_application, false);
-								console.log("Application not match. Do reload...");
-								$wrapState.reload();
-							} else {
-								$.dialog({
-									title: "OPS",
-									content: "Application not found! Current policy don't match any application."
-								}, function() {
-									$location.path("/common/policyList");
-									$scope.$apply();
-								});
-							}
-							return;
-						}
-
-						// === Revert inner data ===
-						// >> De-dupe
-						$scope.policy.__._dedupTags = {};
-						$scope.policy.__.dedupe = common.parseJSON($scope.policy.dedupeDef, {});
-						$.each($scope.policy.__.dedupe.fields || [], function (i, field) {
-							$scope.policy.__._dedupTags[field] = true;
-						});
-
-						// >> Notification
-						$scope.policy.__.notification = common.parseJSON($scope.policy.notificationDef, []);
-
-						// >> Policy
-						var _policyUnit = $scope.policy.__.policy = common.parseJSON($scope.policy.policyDef);
-
-						// >> Parse expression
-						$scope.policy.__.conditions = {};
-						var _condition = _policyUnit.expression.match(/from\s+(\w+)(\[(.*)])?(#window[^\)]*\))?\s+(select (\w+, )?(\w+)\((\w+)\) as [\w\d_]+ (group by (\w+) )?having ([\w\d_]+) ([<>=]+) ([^\s]+))?/);
-						var _cond_stream = _condition[1];
-						var _cond_query = _condition[3] || "";
-						var _cond_window = _condition[4];
-						var _cond_group = _condition[5];
-						var _cond_groupUnit = _condition.slice(7,14);
-
-						if(!_condition) {
-							$scope.policy.__.advanced = true;
-						} else {
-							// > StreamName
-							var _streamName = _cond_stream;
-							var _cond = _cond_query;
-
-							$scope.policy.__.streamName = _streamName;
-
-							// > Conditions
-							// Loop condition groups
-							if(_cond.trim() !== "" && /^\(.*\)$/.test(_cond)) {
-								var _condGrps = _cond.substring(1, _cond.length - 1).split(/\)\s+and\s+\(/);
-								$.each(_condGrps, function(i, line) {
-									// Loop condition cells
-									var _condCells = line.split(/\s+or\s+/);
-									$.each(_condCells, function(i, cell) {
-										var _opMatch = cell.match(/(\S*)\s*(==|!=|>|<|>=|<=|contains)\s*('(?:[^'\\]|\\.)*'|[\w\d]+)/);
-										if(!common.isEmpty(_opMatch)) {
-											var _key = _opMatch[1];
-											var _op = _opMatch[2];
-											var _val = _opMatch[3];
-											var _conds = $scope.policy.__.conditions[_key] = $scope.policy.__.conditions[_key] || [];
-											var _type = "";
-											if(_val.match(/'.*'/)) {
-												_val = _val.slice(1, -1);
-												_type = "string";
-											} else if(_val === "true" || _val === "false") {
-												var _regexMatch = _key.match(/^str:regexp\((\w+),'(.*)'\)/);
-												var _containsMatch = _key.match(/^str:contains\((\w+),'(.*)'\)/);
-												var _mathes = _regexMatch || _containsMatch;
-												if(_mathes) {
-													_key = _mathes[1];
-													_val = _mathes[2];
-													_type = "string";
-													_op = _regexMatch ? "regex" : "contains";
-													_conds = $scope.policy.__.conditions[_key] = $scope.policy.__.conditions[_key] || [];
-												} else {
-													_type = "bool";
-												}
-											} else {
-												_type = "number";
-											}
-											_conds.push($scope._CondUnit(_key, _op, _val, _type));
-										}
-									});
-								});
-							} else if(_cond_query !== "") {
-								$scope.policy.__.advanced = true;
-							}
-						}
-
-						if($scope.policy.__.advanced) {
-							$scope.policy.__._expression = _policyUnit.expression;
-						} else {
-							// > window
-							if(!_cond_window) {
-								$scope.policy.__.window = "externalTime";
-								$scope.policy.__.group = "";
-								$scope.policy.__.groupAgg = "count";
-								$scope.policy.__.groupAggPath = "timestamp";
-								$scope.policy.__.groupCondOp = ">=";
-								$scope.policy.__.groupCondVal = "2";
-							} else {
-								try {
-									$scope.policy.__.windowConfig = true;
-
-									var _winCells = _cond_window.match(/\.(\w+)\((.*)\)/);
-									$scope.policy.__.window = _winCells[1];
-									var _winConds = $scope.getWindow().fields;
-									$.each(_winCells[2].split(","), function(i, val) {
-										_winConds[i].val = val;
-									});
-
-									// Group
-									if(_cond_group) {
-										$scope.policy.__.group = _cond_groupUnit[3];
-										$scope.policy.__.groupAgg = _cond_groupUnit[0];
-										$scope.policy.__.groupAggPath = _cond_groupUnit[1];
-										$scope.policy.__.groupAggAlias = _cond_groupUnit[4] === "aggValue" ? "" : _cond_groupUnit[4];
-										$scope.policy.__.groupCondOp = _cond_groupUnit[5];
-										$scope.policy.__.groupCondVal = _cond_groupUnit[6];
-									} else {
-										$scope.policy.__.group = "";
-										$scope.policy.__.groupAgg = "count";
-										$scope.policy.__.groupAggPath = "timestamp";
-										$scope.policy.__.groupCondOp = ">=";
-										$scope.policy.__.groupCondVal = "2";
-									}
-								} catch(err) {
-									$scope.policy.__.window = "externalTime";
-								}
-							}
-						}
-
-						$scope.changeStep(0, 2, false);
-						console.log($scope.policy);
-					});
-				}
-			});
-
-			// ==========================================
-			// =                Function                =
-			// ==========================================
-			// UI: Highlight select step
-			$scope.stepSelect = function(step) {
-				return step === $scope.step ? "active" : "";
-			};
-
-			// UI: Collapse all
-			$scope.collapse = function(cntr) {
-				var _list = $(cntr).find(".collapse").css("height", "auto");
-				if(_list.hasClass("in")) {
-					_list.removeClass("in");
-				} else {
-					_list.addClass("in");
-				}
-			};
-
-			// Step process. Will fetch target step attribute and return boolean
-			function _check(key, step) {
-				var _step = $scope.steps[step - 1];
-				if(!_step) return;
-
-				var _value = _step[key];
-				if(typeof _value === "function") {
-					return _value();
-				} else if(typeof _value === "boolean") {
-					return _value;
-				}
-				return true;
-			}
-			// Check step is ready. Otherwise will display load animation
-			$scope.stepReady = function(step) {
-				return _check("ready", step);
-			};
-			// Check whether process next step. Otherwise will disable next button
-			$scope.checkNextable = function(step) {
-				return !_check("nextable", step);
-			};
-			// Switch step
-			$scope.changeStep = function(step, targetStep, check) {
-				if(check === false || _check("checkStep", step)) {
-					$scope.step =  targetStep;
-
-					_check("init", targetStep);
-				}
-			};
-
-			// Window
-			$scope.getWindow = function() {
-				if(!$scope.policy || !$scope.policy.__) return null;
-				return common.array.find($scope.policy.__.window, $scope.config.window, "type");
-			};
-
-			// Aggregation
-			$scope.groupAggPathList = function() {
-				return $.grep(common.getValueByPath($scope, "_stream.metas", []), function(meta) {
-					return $.inArray(meta.attrType, ['long','integer','number', 'double', 'float']) !== -1;
-				});
-			};
-
-			$scope.updateGroupAgg = function() {
-				$scope.policy.__.groupAggPath = $scope.policy.__.groupAggPath || common.getValueByPath($scope.groupAggPathList()[0], "tags.attrName");
-
-				if($scope.policy.__.groupAgg === 'count') {
-					$scope.policy.__.groupAggPath = 'timestamp';
-				}
-			};
-
-			// Resolver
-			$scope.resolverTypeahead = function(value, resolver) {
-				var _resolverList = Entities.query("stream/attributeresolve", {
-					site: Site.current().tags.site,
-					resolver: resolver,
-					query: value
-				});
-				return _resolverList._promise.then(function() {
-					return _resolverList;
-				});
-			};
-
-			// Used for input box when pressing enter
-			$scope.conditionPress = function(event) {
-				if(event.which == 13) {
-					setTimeout(function() {
-						$(event.currentTarget).closest(".input-group").find("button").click();
-					}, 1);
-				}
-			};
-			// Check whether has condition
-			$scope.hasCondition = function(key, type) {
-				var _list = common.getValueByPath($scope.policy.__.conditions, key, []);
-				if(_list.length === 0) return false;
-
-				if(type === "bool") {
-					return !_list[0].ignored();
-				}
-				return true;
-			};
-			// Condition unit definition
-			$scope._CondUnit = function(key, op, value, type) {
-				return {
-					key: key,
-					op: op,
-					val: value,
-					type: type,
-					ignored: function() {
-						return this.type === "bool" && this.val === "none";
-					},
-					getVal: function() {
-						return this.type === "string" ? "'" + this.val + "'" : this.val;
-					},
-					toString: function() {
-						return this.op + " " + this.getVal();
-					},
-					toCondString: function() {
-						var _op = this.op === "=" ? "==" : this.op;
-						if(_op === "regex") {
-							return "str:regexp(" + this.key + "," + this.getVal() + ")==true";
-						} else if(_op === "contains") {
-							return "str:contains(" + this.key + "," + this.getVal() + ")==true";
-						} else {
-							return this.key + " " + _op + " " + this.getVal();
-						}
-					}
-				};
-			};
-
-			//for maprfs, if key is status or volume or src/dst, convert these names to id.
-			$scope.convertToID = function(_condList, key, op, name,  type, site){
-				if(key == "dst" || key == "src") {
-					Entities.maprfsNameToID("fNameResolver", name, site)._promise.then(
-						function(response){
-							console.log("success");
-							console.log(response);
-							_condList.push($scope._CondUnit(key, op, response.data, type));
-						},
-						function(error, status){
-							console.log("error: " + status);
-						}
-					);
-				}
-				else if (key == "status"){
-					Entities.maprfsNameToID("sNameResolver", name, site)._promise.then(
-						function(response){
-							console.log("success");
-							console.log(response);
-							_condList.push($scope._CondUnit(key, op, response.data, type));
-						},
-						function(error, status){
-							console.log("error: " + status);
-						}
-					);
-				}
-				else if (key == "volume") {
-					Entities.maprfsNameToID("vNameResolver", name, site)._promise.then(
-						function(response){
-							console.log("success");
-							console.log(response);
-							_condList.push($scope._CondUnit(key, op, response.data, type));
-						},
-						function(error, status){
-							console.log("error: " + status);
-						}
-					);
-				}
-			};
-
-			// Add condition for policy
-			$scope.addCondition = function(key, op, value, type) {
-				if(value === "" || value === undefined) return false;
-
-				var _condList = $scope.policy.__.conditions[key] = $scope.policy.__.conditions[key] || [];
-				_condList.push($scope._CondUnit(key, op, value, type));
-
-				//if it is mapr application, covert human readable name to ids
-				if(Application.current().tags.application == "maprFSAuditLog")  {
-					if ( key == "dst" || key == "src" || key == "volume" || key == "status")  {
-						$scope.convertToID(_condList, key, op, value , type, Site.current().tags.site);
-					}
-				}
-
-				return true;
-			};
-			// Convert condition list to description string
-			$scope.parseConditionDesc = function(key) {
-				return $.map($scope.policy.__.conditions[key] || [], function(cond) {
-					if(!cond.ignored()) return "[" + cond.toString() + "]";
-				}).join(" or ");
-			};
-
-			// To query
-			$scope.toQuery = function() {
-				if(!$scope.policy.__) return "";
-
-				if($scope.policy.__.advanced) return $scope.policy.__._expression;
-
-				// > Query
-				var _query = $.map(common.getValueByPath($scope.policy, "__.conditions", {}), function(list) {
-					var _conds = $.map(list, function(cond) {
-						if(!cond.ignored()) return cond.toCondString();
-					});
-					if(_conds.length) {
-						return "(" + _conds.join(" or ") + ")";
-					}
-				}).join(" and ");
-				if(_query) {
-					_query = "[" + _query + "]";
-				}
-
-				// > Window
-				var _window = $scope.getWindow();
-				var _windowStr = "";
-				if($scope.policy.__.windowConfig) {
-					_windowStr = $.map(_window.fields, function(field) {
-						return field.val;
-					}).join(",");
-					_windowStr = "#window." + _window.type + "(" + _windowStr + ")";
-
-					// > Group
-					if($scope.policy.__.group) {
-						_windowStr += common.template(" select ${group}, ${groupAgg}(${groupAggPath}) as ${groupAggAlias} group by ${group} having ${groupAggAlias} ${groupCondOp} ${groupCondVal}", {
-							group: $scope.policy.__.group,
-							groupAgg: $scope.policy.__.groupAgg,
-							groupAggPath: $scope.policy.__.groupAggPath,
-							groupCondOp: $scope.policy.__.groupCondOp,
-							groupCondVal: $scope.policy.__.groupCondVal,
-							groupAggAlias: $scope.policy.__.groupAggAlias || "aggValue"
-						});
-					} else {
-						_windowStr += common.template(" select ${groupAgg}(${groupAggPath}) as ${groupAggAlias} having ${groupAggAlias} ${groupCondOp} ${groupCondVal}", {
-							groupAgg: $scope.policy.__.groupAgg,
-							groupAggPath: $scope.policy.__.groupAggPath,
-							groupCondOp: $scope.policy.__.groupCondOp,
-							groupCondVal: $scope.policy.__.groupCondVal,
-							groupAggAlias: $scope.policy.__.groupAggAlias || "aggValue"
-						});
-					}
-				} else {
-					_windowStr = " select *";
-				}
-
-				return common.template("from ${stream}${query}${window} insert into outputStream;", {
-					stream: $scope.policy.__.streamName,
-					query: _query,
-					window: _windowStr
-				});
-			};
-
-			// ==========================================
-			// =             Update Policy              =
-			// ==========================================
-			// dedupeDef notificationDef policyDef
-			$scope.finishPolicy = function() {
-				$scope.lock = true;
-
-				// dedupeDef
-				$scope.policy.__.dedupe.fields = $.map($scope.policy.__._dedupTags, function (value, key) {
-					if(value) return key;
-				});
-				$scope.policy.dedupeDef = JSON.stringify($scope.policy.__.dedupe);
-
-				// notificationDef
-				$scope.policy.__.notification = $scope.policy.__.notification || [];
-
-				$scope.policy.notificationDef = JSON.stringify($scope.policy.__.notification);
-
-				// policyDef
-				$scope.policy.__.policy = {
-					expression: $scope.toQuery(),
-					type: "siddhiCEPEngine"
-				};
-				$scope.policy.policyDef = JSON.stringify($scope.policy.__.policy);
-
-				// alertExecutorId
-				if($scope._stream.alertExecutor) {
-					$scope.policy.tags.alertExecutorId = $scope._stream.alertExecutor.tags.alertExecutorId;
-				} else {
-					$scope.lock = false;
-					$.dialog({
-						title: "OPS!",
-						content: "Alert Executor not defined! Please check 'AlertExecutorService'!"
-					});
-					return;
-				}
-
-				// site
-				$scope.policy.tags.site = $scope.policy.tags.site || Site.current().tags.site;
-
-				// owner
-				$scope.policy.owner = Authorization.userProfile.username;
-
-				// Update function
-				function _updatePolicy() {
-					Entities.updateEntity("AlertDefinitionService", $scope.policy)._promise.success(function(data) {
-						$.dialog({
-							title: "Success",
-							content: (create ? "Create" : "Update") + " success!"
-						}, function() {
-							if(data.success) {
-								location.href = "#/common/policyList";
-							} else {
-								$.dialog({
-									title: "OPS",
-									content: (create ? "Create" : "Update") + "failed!" + JSON.stringify(data)
-								});
-							}
-						});
-
-						$scope.create = create = false;
-						$scope.encodedRowkey = data.obj[0];
-					}).error(function(data) {
-						$.dialog({
-							title: "OPS",
-							content: (create ? "Create" : "Update") + "failed!" + JSON.stringify(data)
-						});
-					}).then(function() {
-						$scope.lock = false;
-					});
-				}
-
-				// Check if already exist
-				if($scope.create) {
-					var _checkList = Entities.queryEntities("AlertDefinitionService", {
-						alertExecutorId: $scope.policy.tags.alertExecutorId,
-						policyId: $scope.policy.tags.policyId,
-						policyType: "siddhiCEPEngine",
-						application: $scope.policy.tags.application
-					});
-					_checkList._promise.then(function() {
-						if(_checkList.length) {
-							$.dialog({
-								title: "Override Confirm",
-								content: "Already exists PolicyID '" + $scope.policy.tags.policyId + "'. Do you want to override?",
-								confirm: true
-							}, function(ret) {
-								if(ret) {
-									_updatePolicy();
-								} else {
-									$scope.lock = false;
-									$scope.$apply();
-								}
-							});
-						} else {
-							_updatePolicy();
-						}
-					});
-				} else {
-					_updatePolicy();
-				}
-			};
-		});
-	}
-
-	feature.controller('policyCreate', function(PageConfig, Site, Policy, $scope, $wrapState, $q, UI, Entities, Application, Authorization, Notification) {
-		var _args = [true];
-		_args.push.apply(_args, arguments);
-		policyCtrl.apply(this, _args);
-	}, "policyEdit");
-	feature.controller('policyEdit', function(PageConfig, Site, Policy, $scope, $wrapState, $q, UI, Entities, Application, Authorization, Notification) {
-		PageConfig.lockSite = true;
-		var _args = [false];
-		_args.push.apply(_args, arguments);
-		policyCtrl.apply(this, _args);
-	});
-
-	// ==============================================================
-	// =                           Alerts                           =
-	// ==============================================================
-
-	// ========================= Alert List =========================
-	feature.navItem("alertList", "Alerts", "exclamation-triangle");
-	feature.controller('alertList', function(PageConfig, Site, $scope, $wrapState, $interval, $timeout, Entities, Application) {
-		PageConfig.pageSubTitle = Site.current().tags.site;
-
-		var MAX_PAGESIZE = 10000;
-
-		// Initial load
-		$scope.application = Application.current();
-
-		$scope.alertList = [];
-		$scope.alertList.ready = false;
-
-		// Load data
-		function _loadAlerts() {
-			if($scope.alertList._promise) {
-				$scope.alertList._promise.abort();
-			}
-
-			var _list = Entities.queryEntities("AlertService", {
-				site: Site.current().tags.site,
-				application: $scope.application.tags.application,
-				_pageSize: MAX_PAGESIZE,
-				_duration: 1000 * 60 * 60 * 24 * 30,
-				__ETD: 1000 * 60 * 60 * 24
-			});
-			$scope.alertList._promise = _list._promise;
-			_list._promise.then(function() {
-				var index;
-
-				if($scope.alertList[0]) {
-					// List new alerts
-					for(index = 0 ; index < _list.length ; index += 1) {
-						var _alert = _list[index];
-						_alert.__new = true;
-						if(_alert.encodedRowkey === $scope.alertList[0].encodedRowkey) {
-							break;
-						}
-					}
-
-					if(index > 0) {
-						$scope.alertList.unshift.apply($scope.alertList, _list.slice(0, index));
-
-						// Clean up UI highlight
-						$timeout(function() {
-							$.each(_list, function(i, alert) {
-								delete alert.__new;
-							});
-						}, 100);
-					}
-				} else {
-					// List all alerts
-					$scope.alertList.push.apply($scope.alertList, _list);
-				}
-
-				$scope.alertList.ready = true;
-			});
-		}
-
-		_loadAlerts();
-		var _loadInterval = $interval(_loadAlerts, app.time.refreshInterval);
-		$scope.$on('$destroy',function(){
-			$interval.cancel(_loadInterval);
-		});
-	});
-
-	// ======================== Alert Detail ========================
-	feature.controller('alertDetail', function(PageConfig, Site, $scope, $wrapState, Entities) {
-		PageConfig.pageTitle = "Alert Detail";
-		PageConfig.lockSite = true;
-		PageConfig
-			.addNavPath("Alert List", "/common/alertList")
-			.addNavPath("Alert Detail");
-
-		$scope.common = common;
-
-		// Query policy
-		$scope.alertList = Entities.queryEntity("AlertService", $wrapState.param.filter);
-		$scope.alertList._promise.then(function() {
-			if($scope.alertList.length === 0) {
-				$.dialog({
-					title: "OPS!",
-					content: "Alert not found!"
-				}, function() {
-					location.href = "#/common/alertList";
-				});
-			} else {
-				$scope.alert = $scope.alertList[0];
-				$scope.alert.rawAlertContext = JSON.stringify($scope.alert.alertContext, null, "\t");
-				Site.current(Site.find($scope.alert.tags.site));
-				console.log($scope.alert);
-			}
-		});
-
-		// UI
-		$scope.getMessageTime = function(alert) {
-			var _time = common.getValueByPath(alert, "alertContext.timestamp");
-			return Number(_time);
-		};
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/common/page/alertDetail.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/common/page/alertDetail.html b/eagle-webservice/src/main/webapp/_app/public/feature/common/page/alertDetail.html
deleted file mode 100644
index 309fac3..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/common/page/alertDetail.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<div class="box box-info">
-	<div class="box-header with-border">
-		<h3 class="box-title" id="policyId">
-			{{alert.tags.policyId}}
-			<small>{{common.format.date(alert.timestamp)}}</small>
-		</h3>
-	</div><!-- /.box-header -->
-
-	<div class="box-body">
-		<a class="btn btn-primary pull-right" href="#/common/policyDetail/?policy={{alert.tags.policyId}}&site={{alert.tags.site}}&executor={{alert.tags.alertExecutorId}}">View Policy</a>
-
-		<div class="inline-group">
-			<dl><dt>Site</dt><dd>{{alert.tags.site}}</dd></dl>
-			<dl><dt>Data Source</dt><dd>{{alert.tags.application}}</dd></dl>
-		</div>
-		<div class="inline-group">
-			<dl><dt>Alert Time</dt><dd>{{common.format.date(alert.timestamp)}}</dd></dl>
-			<dl><dt>Message Time</dt><dd>{{common.format.date(alert.alertContext.properties.timestamp)}}</dd></dl>
-		</div>
-		<div class="inline-group">
-			<dl><dt>Stream Name</dt><dd>{{alert.tags.sourceStreams}}</dd></dl>
-		</div>
-		<div class="inline-group">
-			<dl><dt>Alert Source</dt><dd>{{alert.tags.alertSource}}</dd></dl>
-		</div>
-		<div class="inline-group">
-			<dl><dt>User</dt><dd>{{alert.alertContext.properties.user}}</dd></dl>
-			<dl><dt>Host</dt><dd>{{alert.alertContext.properties.host}}</dd></dl>
-		</div>
-		<div class="inline-group">
-			<dl><dt>Event</dt><dd>{{alert.alertContext.properties.alertEvent}}</dd></dl>
-		</div>
-		<div class="inline-group">
-			<dl><dt>Message</dt><dd>{{alert.alertContext.properties.alertMessage}}</dd></dl>
-		</div>
-	</div><!-- /.box-body -->
-
-	<div class="overlay" ng-hide="alertList._promise.$$state.status === 1;">
-		<i class="fa fa-refresh fa-spin"></i>
-	</div>
-
-	<div class="box-footer clearfix">
-		<a data-toggle="collapse" href="[data-id='rawAlertContext']">
-			Raw Alert Context
-		</a>
-		<div data-id="rawAlertContext" class="collapse">
-			<pre>{{alert.rawAlertContext}}</pre>
-		</div>
-	</div>
-</div>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/common/page/alertList.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/common/page/alertList.html b/eagle-webservice/src/main/webapp/_app/public/feature/common/page/alertList.html
deleted file mode 100644
index 0415cc0..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/common/page/alertList.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<div class="box box-primary">
-	<div class="box-header with-border">
-		<i class="fa fa-list-alt"> </i>
-		<h3 class="box-title">
-			{{application.displayName}}
-		</h3>
-	</div>
-	<div class="box-body">
-		<p ng-show="!alertList.ready">
-			<span class="fa fa-refresh fa-spin"> </span>
-			Loading...
-		</p>
-
-		<div sorttable source="alertList" sort="-timestamp">
-			<table class="table table-bordered" ng-non-bindable>
-				<thead>
-					<tr>
-						<th width="170" sortpath="timestamp">Alert Time</th>
-						<th width="170" sortpath="alertContext.properties.timestamp">Message Time</th>
-						<th width="105" sortpath="tags.application">Application</th>
-						<th width="150" sortpath="tags.policyId">Policy Name</th>
-						<th width="60" sortpath="alertContext.properties.user">User</th>
-						<th width="150" sortpath="tags.alertSource">Source</th>
-						<th sortpath="alertContext.properties.emailMessage">Description</th>
-						<th width="50"> </th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr ng-class="{info : item.__new}">
-						<td>{{common.format.date(item.timestamp)}}</td>
-						<td>{{common.format.date(item.alertContext.properties.timestamp)}}</td>
-						<td>{{item.tags.application}}</td>
-						<td class="text-nowrap">
-							<a class="fa fa-share-square-o" ng-show="item.tags.policyId"
-							href="#/common/policyDetail/?policy={{item.tags.policyId}}&site={{item.tags.site}}&executor={{item.tags.alertExecutorId}}"> </a>
-							{{item.tags.policyId}}
-						</td>
-						<td>{{item.alertContext.properties.user}}</td>
-						<td>{{item.tags.alertSource}}</td>
-						<td>{{item.alertContext.properties.alertMessage}}</td>
-						<td><a href="#/common/alertDetail/{{item.encodedRowkey}}">Detail</a></td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-
-	</div>
-	<!--div class="box-footer clearfix">
-	</div-->
-</div>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyDetail.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyDetail.html b/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyDetail.html
deleted file mode 100644
index cdddc43..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyDetail.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<div class="box box-info">
-	<div class="box-header with-border">
-		<h3 class="box-title">
-			{{policy.tags.policyId}}
-			<small>{{policy.tags.site}}</small>
-		</h3>
-	</div>
-
-	<div class="box-body">
-		<div class="row">
-			<div class="col-xs-8">
-				<div class="inline-group">
-					<dl><dt>Data Source</dt><dd>{{policy.tags.application}}</dd></dl>
-					<dl><dt>Status</dt><dd>
-						<span ng-show="policy.enabled" class="text-muted"><i class="fa fa-square text-green"></i> Enabled</span>
-						<span ng-show="!policy.enabled" class="text-muted"><i class="fa fa-square text-muted"></i> Disabled</span>
-					</dd></dl>
-				</div>
-				<div class="inline-group">
-					<dl><dt>Description</dt><dd>{{policy.description}}</dd></dl>
-				</div>
-				<!--div class="inline-group">
-					<dl><dt>Alert</dt><dd>
-						<a href="mailto:{{mail}}" ng-repeat="mail in policy.__mailList track by $index" style="margin-right: 10px;">{{mail}}</a>
-						<div tabs>
-							<pane ng-repeat="notification in policy.__notificationList track by $index" data-title="{{notification.notificationType}}">
-							</pane>
-						</div>
-					</dd></dl>
-				</div-->
-				<label>Notification</label>
-				<div tabs>
-					<pane ng-repeat="notification in policy.__notificationList track by $index" data-title="{{notification.notificationType}}">
-						<table class="table table-bordered">
-							<tbody>
-								<tr ng-repeat="(key, value) in notification track by $index">
-									<th width="30%">{{key}}</th>
-									<td>{{value}}</td>
-								</tr>
-							</tbody>
-						</table>
-					</pane>
-				</div>
-			</div>
-			<div class="col-xs-4 text-right" ng-show="Auth.isRole('ROLE_ADMIN')">
-				<a class="btn btn-primary" href="#/common/policyEdit/{{policy.encodedRowkey}}">Edit</a>
-				<button class="btn btn-warning" ng-show="!policy.enabled" ng-click="updatePolicyStatus(policy, true)">Enable</button>
-				<button class="btn btn-warning" ng-show="policy.enabled" ng-click="updatePolicyStatus(policy, false)">Disable</button>
-				<button class="btn btn-danger" ng-click="deletePolicy(policy)">Delete</button>
-			</div>
-		</div>
-	</div>
-
-	<div class="overlay" ng-hide="policyList._promise.$$state.status === 1;">
-		<i class="fa fa-refresh fa-spin"></i>
-	</div>
-
-	<div class="box-footer clearfix">
-		<a data-toggle="collapse" href="[data-id='query']">
-			View Query
-		</a>
-		<div data-id="query" class="collapse in">
-			<pre>{{policy.__expression}}</pre>
-		</div>
-	</div>
-</div>
-
-<div tabs>
-	<pane data-title="Visualization" menu="visualizationMenu">
-		<div class="row">
-			<div class="col-xs-6">
-				<div nvd3="policyEvalSeries" data-title="Policy Eval Count" data-config="chartConfig" class="nvd3-chart-cntr"></div>
-			</div>
-			<div class="col-xs-6">
-				<div nvd3="policyEvalFailSeries" data-title="Policy Eval Fail Count" data-config="chartConfig" class="nvd3-chart-cntr"></div>
-			</div>
-			<div class="col-xs-6">
-				<div nvd3="alertSeries" data-title="Alert Count" data-config="chartConfig" class="nvd3-chart-cntr"></div>
-			</div>
-			<div class="col-xs-6">
-				<div nvd3="alertFailSeries" data-title="Alert Fail Count" data-config="chartConfig" class="nvd3-chart-cntr"></div>
-			</div>
-		</div>
-	</pane>
-	<pane data-title="Statistics">
-		<div class="row">
-			<div class="col-xs-3">
-				<div class="info-box bg-aqua">
-					<span class="info-box-icon"><i class="fa fa-bookmark-o"></i></span>
-					<div class="info-box-content">
-						<span class="info-box-text">Policy Eval Count</span>
-						<span class="info-box-number">{{common.array.sum(policyEvalSeries, "1")}} <small>(Monthly)</small></span>
-						<span class="info-box-number">{{policyEvalSeries[policyEvalSeries.length - 1][1]}} <small>(Daily)</small></span>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-3">
-				<div class="info-box bg-red">
-					<span class="info-box-icon"><i class="fa fa-bookmark-o"></i></span>
-					<div class="info-box-content">
-						<span class="info-box-text">Policy Eval Fail Count</span>
-						<span class="info-box-number">{{common.array.sum(policyEvalFailSeries, "1")}} <small>(Monthly)</small></span>
-						<span class="info-box-number">{{policyEvalFailSeries[policyEvalFailSeries.length - 1][1]}} <small>(Daily)</small></span>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-3">
-				<div class="info-box bg-aqua">
-					<span class="info-box-icon"><i class="fa fa-bookmark-o"></i></span>
-					<div class="info-box-content">
-						<span class="info-box-text">Alert Count</span>
-						<span class="info-box-number">{{common.array.sum(alertSeries, "1")}} <small>(Monthly)</small></span>
-						<span class="info-box-number">{{alertSeries[alertSeries.length - 1][1]}} <small>(Daily)</small></span>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-3">
-				<div class="info-box bg-red">
-					<span class="info-box-icon"><i class="fa fa-bookmark-o"></i></span>
-					<div class="info-box-content">
-						<span class="info-box-text">Alert Fail Count</span>
-						<span class="info-box-number">{{common.array.sum(alertFailSeries, "1")}} <small>(Monthly)</small></span>
-						<span class="info-box-number">{{alertFailSeries[alertFailSeries.length - 1][1]}} <small>(Daily)</small></span>
-					</div>
-				</div>
-			</div>
-		</div>
-	</pane>
-	<pane data-title="Alerts">
-		<div sorttable source="alertList" sort="-timestamp">
-			<table class="table table-bordered" ng-non-bindable>
-				<thead>
-				<tr>
-					<th width="170" sortpath="timestamp">Alert Time</th>
-					<th width="170" sortpath="alertContext.properties.timestamp">Message Time</th>
-					<th width="60" sortpath="alertContext.properties.user">User</th>
-					<th width="150" sortpath="alertContext.properties.host">Host</th>
-					<th sortpath="alertContext.properties.emailMessage">Description</th>
-					<th width="50"> </th>
-				</tr>
-				</thead>
-				<tbody>
-				<tr ng-class="{info : item.__new}">
-					<td>{{common.format.date(item.timestamp)}}</td>
-					<td>{{common.format.date(item.alertContext.properties.timestamp)}}</td>
-					<td>{{item.alertContext.properties.user}}</td>
-					<td>{{item.alertContext.properties.host}}</td>
-					<td>{{item.alertContext.properties.alertMessage}}</td>
-					<td><a href="#/common/alertDetail/{{item.encodedRowkey}}">Detail</a></td>
-				</tr>
-				</tbody>
-			</table>
-		</div>
-	</pane>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyEdit.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyEdit.html b/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyEdit.html
deleted file mode 100644
index 33d4cde..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyEdit.html
+++ /dev/null
@@ -1,346 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<div class="progress active" ng-show="!streamReady">
-	<div class="progress-bar progress-bar-primary progress-bar-striped" style="width: 100%">
-	</div>
-</div>
-
-<!-- Step navigation -->
-<div ng-show="streamReady">
-	<div class="row step-cntr">
-		<div class="col-sm-4" ng-repeat="step in steps">
-			<div class="step" ng-class="stepSelect($index + 1)">
-				<h1>{{$index + 1}}</h1>
-				<h2>Step {{$index + 1}}</h2>
-				<p title="{{step.title}}">{{step.title}}</p>
-			</div>
-		</div>
-	</div>
-
-	<!-- Step container -->
-	<div class="box box-info">
-		<div class="box-header with-border">
-			<h3 class="box-title">Step {{step}} - {{steps[step - 1].title}}</h3>
-		</div><!-- /.box-header -->
-
-		<div class="box-body">
-			<!-- ---------------------- Step Body Start ---------------------- -->
-
-			<!-- Step 1: Stream -->
-			<div ng-show="step === 1">
-				<div class="pull-right" ng-show="policy.__.advanced === undefined">
-					<span class="text-muted">or</span>
-					<a ng-click="policy.__.advanced = true;">Advanced</a>
-				</div>
-
-				<div class="form-group">
-					<label>Select Stream</label>
-					<select class="form-control" ng-model="policy.__.streamName" ng-show="!policy.__.advanced">
-						<option ng-repeat="stream in applications[policy.tags.application]">{{stream.tags.streamName}}</option>
-					</select>
-					<select class="form-control" ng-show="policy.__.advanced" disabled="disabled">
-						<option>[Advanced Mode]</option>
-					</select>
-				</div>
-
-				<div class="checkbox" ng-show="policy.__.advanced !== undefined">
-					<label>
-						<input type="checkbox" ng-model="policy.__.advanced">
-						Advanced Mode
-					</label>
-				</div>
-			</div>
-
-			<!-- Step 2: Define Alert Policy -->
-			<div ng-show="step === 2 && !policy.__.advanced">
-				<!-- Criteria -->
-				<div>
-					<label>Match Criteria</label>
-					<a ng-click="collapse('.panel-group')">expand / collapse all</a>
-
-					<div class="panel-group panel-group-sm" role="tablist">
-						<div class="panel panel-default"
-							ng-repeat="meta in _stream.metas"
-							ng-init="op = '=='; val = null; type = (meta.attrType || '').toLowerCase();">
-							<div class="panel-heading" role="tab">
-								<h4 class="panel-title">
-									<span class="bg-navy disabled color-palette pull-right">
-										{{parseConditionDesc(meta.tags.attrName)}}
-									</span>
-
-									<a role="button" data-toggle="collapse" href="[data-name='{{meta.tags.attrName}}']" class="collapsed">
-										<span class="fa fa-square" ng-class="hasCondition(meta.tags.attrName, type) ? 'text-green' : 'text-muted'"> </span>
-										{{meta.attrDisplayName || meta.tags.attrName}}
-										<span class="fa fa-question-circle" ng-show="meta.attrDescription"
-										uib-tooltip="{{meta.attrDescription}}" tooltip-placement="right" tooltip-animation="false"> </span>
-									</a>
-								</h4>
-							</div>
-							<div data-name="{{meta.tags.attrName}}" data-type="{{meta.attrType}}" role="tabpanel" class="collapse">
-								<div class="panel-body">
-									<ul ng-show="type !== 'bool'">
-										<li ng-repeat="cond in policy.__.conditions[meta.tags.attrName]">
-											[<a ng-click="policy.__.conditions[meta.tags.attrName].splice($index, 1)">X</a>]
-											{{cond.toString()}}
-										</li>
-									</ul>
-
-									<!-- String -->
-									<div ng-if="type == 'string'">
-										<div class="input-group" style="max-width: 450px;">
-											<div class="input-group-btn">
-												<select class="form-control" ng-model="op">
-													<option ng-repeat="mark in ['==','!=','contains','regex']">{{mark}}</option>
-												</select>
-											</div>
-
-											<!-- With resolver -->
-											<input type="text" class="form-control" autocomplete="off" ng-model="val" ng-show="meta.attrValueResolver"
-												ng-keypress="conditionPress($event, meta.tags.attrName, op, val, type)"
-												uib-typeahead="item for item in resolverTypeahead($viewValue, meta.attrValueResolver)">
-											<!-- Without resolver -->
-											<input type="text" class="form-control" autocomplete="off" ng-model="val" ng-show="!meta.attrValueResolver"
-												ng-keypress="conditionPress($event, meta.tags.attrName, op, val, type)">
-
-											<span class="input-group-btn">
-												<button class="btn btn-info btn-flat" type="button" ng-click="addCondition(meta.tags.attrName, op, val, type);val=null;">Add</button>
-											</span>
-										</div>
-									</div>
-
-									<!-- Number -->
-									<div ng-if="type == 'long' || type == 'integer' || type == 'number' || type == 'double' || type == 'float'">
-										<div class="input-group" style="max-width: 450px;">
-											<div class="input-group-btn">
-												<select class="form-control" ng-model="op">
-													<option ng-repeat="mark in ['==','!=','>','>=','<','<=']">{{mark}}</option>
-												</select>
-											</div>
-
-											<input type="number" class="form-control" autocomplete="off" placeholder="Number Only..." ng-model="val" ng-keypress="conditionPress($event, meta.tags.attrName, op, val, type)">
-											<span class="input-group-btn">
-												<button class="btn btn-info btn-flat" type="button" ng-click="addCondition(meta.tags.attrName, op, val, type) ? val=null : void(0);">Add</button>
-											</span>
-										</div>
-									</div>
-
-									<!-- Boolean -->
-									<div ng-if="type == 'bool'" ng-init="policy.__.conditions[meta.tags.attrName] = policy.__.conditions[meta.tags.attrName] || [_CondUnit(meta.tags.attrName, '==', 'none', 'bool')]">
-										<select class="form-control" ng-model="policy.__.conditions[meta.tags.attrName][0].val" style="max-width: 100px;">
-											<option ng-repeat="bool in ['none','true','false']">{{bool}}</option>
-										</select>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-
-				<!-- Window -->
-				<div class="checkbox">
-					<label>
-						<input type="checkbox" ng-checked="policy.__.windowConfig" ng-click="policy.__.windowConfig = !policy.__.windowConfig"> Slide Window
-					</label>
-				</div>
-				<div ng-show="policy.__.windowConfig">
-					<div class="row">
-						<div class="col-md-4">
-							<div class="form-group">
-								<label>Window</label>
-								<select class="form-control" ng-model="policy.__.window"
-								uib-tooltip="{{getWindow().description}}" tooltip-animation="false">
-									<option ng-repeat="item in config.window" value="{{item.type}}">{{item.title}}</option>
-								</select>
-							</div>
-						</div>
-
-						<!-- fields -->
-						<div class="col-md-4" ng-repeat="field in getWindow().fields" ng-init="field.val = field.val || (field.defaultValue || '');" ng-hide="field.hide">
-							<div class="form-group" ng-class="{'has-warning' : !field.val || !field.val.match(field.regex)}">
-								<label>Window - {{field.title}}</label>
-								<input type="text" class="form-control" autocomplete="off" placeholder="{{field.description}}" ng-model="field.val" title="{{field.description}}">
-							</div>
-						</div>
-					</div>
-
-					<!-- Aggregation -->
-					<div class="row">
-						<div class="col-md-4">
-							<div class="form-group" ng-class="{'text-yellow' : (policy.__.groupAgg && !policy.__.groupAggPath)}">
-								<label>Aggregation</label>
-								<div class="input-group">
-									<div class="input-group-btn">
-										<select class="form-control" ng-model="policy.__.groupAgg" ng-change="updateGroupAgg()">
-											<option ng-repeat="op in ['max','min','avg','count', 'sum']">{{op}}</option>
-										</select>
-									</div>
-									<select class="form-control" ng-model="policy.__.groupAggPath" ng-class="{'has-warning' : !policy.__.groupAggPath}" id="groupAggPath"
-											ng-show="policy.__.groupAgg" ng-disabled="policy.__.groupAgg === 'count'">
-										<option ng-repeat="meta in groupAggPathList()">{{meta.tags.attrName}}</option>
-									</select>
-								</div>
-							</div>
-						</div>
-
-						<div class="col-md-4">
-							<div class="form-group" ng-class="{'text-yellow' : (!policy.__.groupCondOp || !policy.__.groupCondVal)}">
-								<label>Condition</label>
-								<div class="input-group">
-									<div class="input-group-btn">
-										<select class="form-control" ng-model="policy.__.groupCondOp" ng-class="{'has-warning' : !policy.__.groupCondOp}">
-											<option ng-repeat="op in ['>','<','>=','<=','==']">{{op}}</option>
-										</select>
-									</div>
-									<input type="text" class="form-control" ng-model="policy.__.groupCondVal" ng-class="{'has-warning' : !policy.__.groupCondVal}" />
-								</div>
-							</div>
-						</div>
-
-						<div class="col-md-4">
-							<div class="form-group">
-								<label>Alias (Optional)</label>
-								<input type="text" class="form-control" ng-model="policy.__.groupAggAlias" placeholder="Default: aggValue" />
-							</div>
-						</div>
-					</div>
-
-					<!-- Group -->
-					<div class="row">
-						<div class="col-md-4">
-							<div class="form-group">
-								<label>Group By</label>
-								<select class="form-control" ng-model="policy.__.group">
-									<option value="">None</option>
-									<option ng-repeat="meta in _stream.metas">{{meta.tags.attrName}}</option>
-								</select>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-
-			<!-- Step 2: Define Alert Policy -->
-			<div ng-show="step === 2 && policy.__.advanced">
-				<div class="form-group">
-					<label>Query Expression</label>
-					<textarea class="form-control" ng-model="policy.__._expression"
-					placeholder="Query expression. e.g. from hdfsAuditLogEventStream[(cmd=='open') and (host=='localhost' or host=='127.0.0.1')]#window.time(2 sec) select * insert into outputStream;" rows="5"></textarea>
-				</div>
-			</div>
-
-			<!-- Step 3: Email Notification -->
-			<div ng-show="step === 3">
-				<div class="row">
-					<div class="col-xs-4">
-						<div class="form-group" ng-class="{'has-warning' : !policy.tags.policyId}">
-							<label>Policy Name</label>
-							<input type="text" class="form-control" placeholder="" ng-model="policy.tags.policyId" ng-disabled="!create">
-						</div>
-					</div>
-					<div class="col-xs-3">
-						<div class="form-group">
-							<label>
-								Alert De-Dup Interval(min)
-								<span class="fa fa-question-circle" uib-tooltip="Same type alert will be De-dup in configured interval"> </span>
-							</label>
-							<input type="number" class="form-control" ng-model="policy.__.dedupe.alertDedupIntervalMin" placeholder="[Minute] Number only. Suggestion: 720">
-						</div>
-					</div>
-					<div class="col-xs-2">
-						<div class="form-group">
-							<label>
-								Enabled
-							</label>
-							<p>
-								<input type="checkbox" checked="checked" ng-model="policy.enabled">
-							</p>
-						</div>
-					</div>
-				</div>
-
-				<div>
-					<a data-toggle="collapse" href="[data-id='advancedDeDup']">Advanced De-Dup</a>
-					<div data-id='advancedDeDup' class="collapse">
-						<label>
-							De-Dup Key
-							<span class="fa fa-question-circle" uib-tooltip="Type of grouping alerts. If you don't know how to config, leave it default."> </span>
-						</label>
-						<div class="form-group">
-							<div class="checkbox" ng-repeat="meta in _stream.metas" ng-init="create ? policy.__._dedupTags[meta.tags.attrName] = !!meta.usedAsTag : void(0);">
-								<label>
-									<input type="checkbox" ng-model="policy.__._dedupTags[meta.tags.attrName]">
-									{{meta.tags.attrName}}
-								</label>
-							</div>
-						</div>
-					</div>
-				</div>
-
-				<hr/>
-
-				<label>Notification</label>
-				<div tabs menu="menu" holder="notificationTabHolder" ng-show="policy.__.notification.length">
-					<pane ng-repeat="notification in policy.__.notification track by $index" data-data="notification" data-title="{{notification.notificationType}}">
-						<div class="form-group" ng-repeat="field in Notification.map[notification.notificationType].fieldList track by $index">
-							<label>{{field.name}}</label>
-							<input type="text" class="form-control" ng-model="notification[field.name]">
-						</div>
-						<p class="text-muted" ng-if="Notification.map[notification.notificationType].fieldList.length === 0">No configuration required</p>
-					</pane>
-				</div>
-				<ul ng-show="policy.__.notification.length === 0">
-					<li ng-repeat="notification in Notification.list track by $index">
-						<a ng-click="newNotification(notification.tags.notificationType)">+ New {{notification.tags.notificationType}} Notification</a>
-					</li>
-				</ul>
-
-				<hr/>
-
-				<div class="form-group">
-					<label>Description</label>
-					<textarea class="form-control" placeholder="Policy description" ng-model="policy.description"></textarea>
-				</div>
-
-				<a data-toggle="collapse" href="[data-id='policyQuery']">
-					View Query
-				</a>
-				<div class="collapse in" data-id="policyQuery">
-					<pre>{{toQuery()}}</pre>
-				</div>
-			</div>
-
-			<!-- ----------------------- Step Body End ----------------------- -->
-		</div><!-- /.box-body -->
-
-		<div class="overlay" ng-hide="stepReady(step)">
-			<span class="fa fa-refresh fa-spin"> </span>
-		</div>
-
-		<div class="box-footer text-right">
-			<button class="btn btn-info" ng-show="step > 1" ng-click="changeStep(step, step - 1, false)" ng-disabled="lock">
-				Prev <span class="fa fa-arrow-circle-o-left"> </span>
-			</button>
-			<button class="btn btn-info" ng-show="step < steps.length" ng-click="changeStep(step, step + 1)" ng-disabled="checkNextable(step) || lock">
-				Next <span class="fa fa-arrow-circle-o-right"> </span>
-			</button>
-			<button class="btn btn-info" ng-show="step === steps.length" ng-click="finishPolicy()" ng-disabled="checkNextable(step) || lock">
-				Done <span class="fa fa-check-circle-o"> </span>
-			</button>
-		</div>
-	</div>
-</div>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyList.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyList.html b/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyList.html
deleted file mode 100644
index 20a38dd..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/common/page/policyList.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<div class="box box-primary">
-	<div class="box-header with-border">
-		<i class="fa fa-list-alt"> </i>
-		<h3 class="box-title">
-			{{application.displayName}}
-		</h3>
-	</div>
-	<div class="box-body">
-		<div class="row">
-			<div class="col-xs-3">
-				<div class="search-box">
-					<input type="search" class="form-control input-sm" placeholder="Search" ng-model="search" />
-					<span class="fa fa-search"> </span>
-				</div>
-			</div>
-			<div class="col-xs-6">
-				<div class="inline-group form-inline text-muted">
-					<dl><dt><i class="fa fa-square text-green"> </i></dt><dd>Enabled</dd></dl>
-					<dl><dt><i class="fa fa-square text-muted"> </i></dt><dd>Disabled</dd></dl>
-				</div>
-			</div>
-			<div class="col-xs-3 text-right">
-				<a class="btn btn-primary" href="#/common/policyCreate/{{!application ? '' : '?app=' + application.tags.application}}" ng-show="Auth.isRole('ROLE_ADMIN')">
-					New Policy
-					<i class="fa fa-plus-circle"> </i>
-				</a>
-			</div>
-		</div>
-
-		<p ng-show="policyList._promise.$$state.status !== 1">
-			<span class="fa fa-refresh fa-spin"> </span>
-			Loading...
-		</p>
-
-		<div sorttable source="policyList" ng-show="policyList._promise.$$state.status === 1" search="false" searchfunc="searchFunc">
-			<table class="table table-bordered" ng-non-bindable>
-				<thead>
-					<tr>
-						<th width="30" sortpath="enabled"> </th>
-						<th width="200" sortpath="tags.policyId">Policy Name</th>
-						<th sortpath="description">Description</th>
-						<th width="150" sortpath="owner">Owner</th>
-						<th width="170" sortpath="lastModifiedDate">Last Modified</th>
-						<th width="95" ng-show="_parent.Auth.isRole('ROLE_ADMIN')">Action</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td><span class='fa fa-square' ng-class="item.enabled ? 'text-green' : 'text-muted'"> </span></td>
-						<td><a href="#/common/policyDetail/{{item.encodedRowkey}}" style="width: 200px;" class="text-breakall">{{item.tags.policyId}}</a></td>
-						<td>{{item.description}}</td>
-						<td>{{item.owner}}</td>
-						<td>{{common.format.date(item.lastModifiedDate) || "-"}}</td>
-						<td ng-show="_parent.Auth.isRole('ROLE_ADMIN')">
-							<a class="fa fa-pencil btn btn-default btn-xs" uib-tooltip="Edit" tooltip-animation="false" href="#/common/policyEdit/{{item.encodedRowkey}}"> </a>
-							<button class="fa fa-play sm btn btn-default btn-xs" uib-tooltip="Enable" tooltip-animation="false" ng-show="!item.enabled" ng-click="_parent.updatePolicyStatus(item, true)"> </button>
-							<button class="fa fa-pause sm btn btn-default btn-xs" uib-tooltip="Disable" tooltip-animation="false" ng-show="item.enabled" ng-click="_parent.updatePolicyStatus(item, false)"> </button>
-							<button class="rm fa fa-trash-o btn btn-danger btn-xs" uib-tooltip="Delete" tooltip-animation="false" ng-click="_parent.deletePolicy(item)"> </button>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-	</div>
-	<!--div class="box-footer clearfix">
-	</div-->
-</div>

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/metadata/controller.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/metadata/controller.js b/eagle-webservice/src/main/webapp/_app/public/feature/metadata/controller.js
deleted file mode 100644
index c17d612..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/metadata/controller.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function() {
-	'use strict';
-
-	var featureControllers = angular.module('featureControllers');
-	var feature = featureControllers.register("metadata");
-
-	// ==============================================================
-	// =                          Function                          =
-	// ==============================================================
-
-	// ==============================================================
-	// =                          Metadata                          =
-	// ==============================================================
-
-	// ======================= Metadata List ========================
-	feature.navItem("streamList", "Metadata", "bullseye");
-	feature.controller('streamList', function(PageConfig, Site, $scope, $q, Application, Entities) {
-		PageConfig.hideSite = true;
-
-		$scope.streams = {};
-		$scope._streamEntity = null;
-		$scope._streamEntityLock = false;
-
-		// =========================================== List ===========================================
-		var _streamList = Entities.queryEntities("AlertStreamService", {application: Application.current().tags.application});
-		var _streamSchemaList = Entities.queryEntities("AlertStreamSchemaService", {application: Application.current().tags.application});
-		$scope.streamList = _streamList;
-		$scope.streamSchemaList = _streamSchemaList;
-
-		_streamList._promise.then(function() {
-			$.each(_streamList, function(i, stream) {
-				stream.metaList = [];
-				$scope.streams[stream.tags.application + "_" + stream.tags.streamName] = stream;
-			});
-		});
-
-		$q.all([_streamList._promise, _streamSchemaList._promise]).then(function() {
-			$.each(_streamSchemaList, function(i, meta) {
-				var _stream = $scope.streams[meta.tags.application + "_" + meta.tags.streamName];
-				if(_stream) {
-					_stream.metaList.push(meta);
-				} else {
-					console.warn("[Meta] Stream not match:", meta.tags.application + "_" + meta.tags.streamName);
-				}
-			});
-		});
-	});
-})();
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-webservice/src/main/webapp/_app/public/feature/metadata/page/streamList.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/_app/public/feature/metadata/page/streamList.html b/eagle-webservice/src/main/webapp/_app/public/feature/metadata/page/streamList.html
deleted file mode 100644
index 2b73300..0000000
--- a/eagle-webservice/src/main/webapp/_app/public/feature/metadata/page/streamList.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<p ng-show="streamList._promise.$$state.status !== 1">
-	<span class="fa fa-refresh fa-spin"> </span>
-	Loading...
-</p>
-
-<div class="box box-primary" ng-repeat="stream in streams">
-	<div class="box-header with-border">
-		<h3 class="box-title">{{stream.tags.streamName}}</h3>
-	</div>
-	<div class="box-body">
-		<div class="inline-group">
-			<dl>
-				<dt>
-					Data Source
-				</dt>
-				<dd>
-					{{stream.tags.application}}
-				</dd>
-			</dl>
-			<dl>
-				<dt>
-					Stream Name
-				</dt>
-				<dd>
-					{{stream.tags.streamName}}
-				</dd>
-			</dl>
-		</div>
-		<div>
-			<dl>
-				<dt>
-					Description
-				</dt>
-				<dd>
-					{{stream.description}}
-				</dd>
-			</dl>
-		</div>
-
-		<p ng-show="streamSchemaList._promise.$$state.status !== 1">
-			<span class="fa fa-refresh fa-spin"> </span>
-			Loading...
-		</p>
-
-		<div class="list" ng-show="streamSchemaList._promise.$$state.status === 1">
-			<table class="table table-bordered">
-				<thead>
-					<tr>
-						<th width="10%">Attribute Name</th>
-						<th width="12%">Display Name</th>
-						<th width="8%">Type</th>
-						<th>Description</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr ng-repeat="meta in stream.metaList">
-						<td>{{meta.tags.attrName}}</td>
-						<td>{{meta.attrDisplayName}}</td>
-						<td><span class="label label-warning">{{meta.attrType}}</span></td>
-						<td>{{meta.attrDescription}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-	</div><!-- /.box-body -->
-	<!-- Loading (remove the following to stop the loading)-->
-</div>
\ No newline at end of file


[09/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/conf/web.xml
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/conf/web.xml b/eagle-assembly/src/main/lib/tomcat/conf/web.xml
deleted file mode 100644
index ecaa1a6..0000000
--- a/eagle-assembly/src/main/lib/tomcat/conf/web.xml
+++ /dev/null
@@ -1,4614 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-                      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-  version="3.0">
-
-  <!-- ======================== Introduction ============================== -->
-  <!-- This document defines default values for *all* web applications      -->
-  <!-- loaded into this instance of Tomcat.  As each application is         -->
-  <!-- deployed, this file is processed, followed by the                    -->
-  <!-- "/WEB-INF/web.xml" deployment descriptor from your own               -->
-  <!-- applications.                                                        -->
-  <!--                                                                      -->
-  <!-- WARNING:  Do not configure application-specific resources here!      -->
-  <!-- They should go in the "/WEB-INF/web.xml" file in your application.   -->
-
-
-  <!-- ================== Built In Servlet Definitions ==================== -->
-
-
-  <!-- The default servlet for all web applications, that serves static     -->
-  <!-- resources.  It processes all requests that are not mapped to other   -->
-  <!-- servlets with servlet mappings (defined either here or in your own   -->
-  <!-- web.xml file).  This servlet supports the following initialization   -->
-  <!-- parameters (default values are in square brackets):                  -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-  <!--                                                                      -->
-  <!--   fileEncoding        Encoding to be used to read static resources   -->
-  <!--                       [platform default]                             -->
-  <!--                                                                      -->
-  <!--   input               Input buffer size (in bytes) when reading      -->
-  <!--                       resources to be served.  [2048]                -->
-  <!--                                                                      -->
-  <!--   listings            Should directory listings be produced if there -->
-  <!--                       is no welcome file in this directory?  [false] -->
-  <!--                       WARNING: Listings for directories with many    -->
-  <!--                       entries can be slow and may consume            -->
-  <!--                       significant proportions of server resources.   -->
-  <!--                                                                      -->
-  <!--   output              Output buffer size (in bytes) when writing     -->
-  <!--                       resources to be served.  [2048]                -->
-  <!--                                                                      -->
-  <!--   readonly            Is this context "read only", so HTTP           -->
-  <!--                       commands like PUT and DELETE are               -->
-  <!--                       rejected?  [true]                              -->
-  <!--                                                                      -->
-  <!--   readmeFile          File to display together with the directory    -->
-  <!--                       contents. [null]                               -->
-  <!--                                                                      -->
-  <!--   sendfileSize        If the connector used supports sendfile, this  -->
-  <!--                       represents the minimal file size in KB for     -->
-  <!--                       which sendfile will be used. Use a negative    -->
-  <!--                       value to always disable sendfile.  [48]        -->
-  <!--                                                                      -->
-  <!--   useAcceptRanges     Should the Accept-Ranges header be included    -->
-  <!--                       in responses where appropriate? [true]         -->
-  <!--                                                                      -->
-  <!--  For directory listing customization. Checks localXsltFile, then     -->
-  <!--  globalXsltFile, then defaults to original behavior.                 -->
-  <!--                                                                      -->
-  <!--   localXsltFile       Make directory listings an XML doc and         -->
-  <!--                       pass the result to this style sheet residing   -->
-  <!--                       in that directory. This overrides              -->
-  <!--                       contextXsltFile and globalXsltFile[null]       -->
-  <!--                                                                      -->
-  <!--   contextXsltFile     Make directory listings an XML doc and         -->
-  <!--                       pass the result to this style sheet which is   -->
-  <!--                       relative to the context root. This overrides   -->
-  <!--                       globalXsltFile[null]                           -->
-  <!--                                                                      -->
-  <!--   globalXsltFile      Site wide configuration version of             -->
-  <!--                       localXsltFile. This argument must either be an -->
-  <!--                       absolute or relative (to either                -->
-  <!--                       $CATALINA_BASE/conf or $CATALINA_HOME/conf)    -->
-  <!--                       path that points to a location below either    -->
-  <!--                       $CATALINA_BASE/conf (checked first) or         -->
-  <!--                       $CATALINA_HOME/conf (checked second).[null]    -->
-  <!--                                                                      -->
-  <!--   showServerInfo      Should server information be presented in the  -->
-  <!--                       response sent to clients when directory        -->
-  <!--                       listings is enabled? [true]                    -->
-
-    <servlet>
-        <servlet-name>default</servlet-name>
-        <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
-        <init-param>
-            <param-name>debug</param-name>
-            <param-value>0</param-value>
-        </init-param>
-        <init-param>
-            <param-name>listings</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-
-  <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
-  <!-- used by Tomcat to support JSP pages.  Traditionally, this servlet    -->
-  <!-- is mapped to the URL pattern "*.jsp".  This servlet supports the     -->
-  <!-- following initialization parameters (default values are in square    -->
-  <!-- brackets):                                                           -->
-  <!--                                                                      -->
-  <!--   checkInterval       If development is false and checkInterval is   -->
-  <!--                       greater than zero, background compilations are -->
-  <!--                       enabled. checkInterval is the time in seconds  -->
-  <!--                       between checks to see if a JSP page (and its   -->
-  <!--                       dependent files) needs to  be recompiled. [0]  -->
-  <!--                                                                      -->
-  <!--   classdebuginfo      Should the class file be compiled with         -->
-  <!--                       debugging information?  [true]                 -->
-  <!--                                                                      -->
-  <!--   classpath           What class path should I use while compiling   -->
-  <!--                       generated servlets?  [Created dynamically      -->
-  <!--                       based on the current web application]          -->
-  <!--                                                                      -->
-  <!--   compiler            Which compiler Ant should use to compile JSP   -->
-  <!--                       pages.  See the jasper documentation for more  -->
-  <!--                       information.                                   -->
-  <!--                                                                      -->
-  <!--   compilerSourceVM    Compiler source VM. [1.6]                      -->
-  <!--                                                                      -->
-  <!--   compilerTargetVM    Compiler target VM. [1.6]                      -->
-  <!--                                                                      -->
-  <!--   development         Is Jasper used in development mode? If true,   -->
-  <!--                       the frequency at which JSPs are checked for    -->
-  <!--                       modification may be specified via the          -->
-  <!--                       modificationTestInterval parameter. [true]     -->
-  <!--                                                                      -->
-  <!--   displaySourceFragment                                              -->
-  <!--                       Should a source fragment be included in        -->
-  <!--                       exception messages? [true]                     -->
-  <!--                                                                      -->
-  <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->
-  <!--                       dumped to a file? [false]                      -->
-  <!--                       False if suppressSmap is true                  -->
-  <!--                                                                      -->
-  <!--   enablePooling       Determines whether tag handler pooling is      -->
-  <!--                       enabled. This is a compilation option. It will -->
-  <!--                       not alter the behaviour of JSPs that have      -->
-  <!--                       already been compiled. [true]                  -->
-  <!--                                                                      -->
-  <!--   engineOptionsClass  Allows specifying the Options class used to    -->
-  <!--                       configure Jasper. If not present, the default  -->
-  <!--                       EmbeddedServletOptions will be used.           -->
-  <!--                                                                      -->
-  <!--   errorOnUseBeanInvalidClassAttribute                                -->
-  <!--                       Should Jasper issue an error when the value of -->
-  <!--                       the class attribute in an useBean action is    -->
-  <!--                       not a valid bean class?  [true]                -->
-  <!--                                                                      -->
-  <!--   fork                Tell Ant to fork compiles of JSP pages so that -->
-  <!--                       a separate JVM is used for JSP page compiles   -->
-  <!--                       from the one Tomcat is running in. [true]      -->
-  <!--                                                                      -->
-  <!--   genStringAsCharArray                                               -->
-  <!--                       Should text strings be generated as char       -->
-  <!--                       arrays, to improve performance in some cases?  -->
-  <!--                       [false]                                        -->
-  <!--                                                                      -->
-  <!--   ieClassId           The class-id value to be sent to Internet      -->
-  <!--                       Explorer when using <jsp:plugin> tags.         -->
-  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
-  <!--                                                                      -->
-  <!--   javaEncoding        Java file encoding to use for generating java  -->
-  <!--                       source files. [UTF8]                           -->
-  <!--                                                                      -->
-  <!--   keepgenerated       Should we keep the generated Java source code  -->
-  <!--                       for each page instead of deleting it? [true]   -->
-  <!--                                                                      -->
-  <!--   mappedfile          Should we generate static content with one     -->
-  <!--                       print statement per input line, to ease        -->
-  <!--                       debugging?  [true]                             -->
-  <!--                                                                      -->
-  <!--   maxLoadedJsps       The maximum number of JSPs that will be loaded -->
-  <!--                       for a web application. If more than this       -->
-  <!--                       number of JSPs are loaded, the least recently  -->
-  <!--                       used JSPs will be unloaded so that the number  -->
-  <!--                       of JSPs loaded at any one time does not exceed -->
-  <!--                       this limit. A value of zero or less indicates  -->
-  <!--                       no limit. [-1]                                 -->
-  <!--                                                                      -->
-  <!--   jspIdleTimeout      The amount of time in seconds a JSP can be     -->
-  <!--                       idle before it is unloaded. A value of zero    -->
-  <!--                       or less indicates never unload. [-1]           -->
-  <!--                                                                      -->
-  <!--   modificationTestInterval                                           -->
-  <!--                       Causes a JSP (and its dependent files) to not  -->
-  <!--                       be checked for modification during the         -->
-  <!--                       specified time interval (in seconds) from the  -->
-  <!--                       last time the JSP was checked for              -->
-  <!--                       modification. A value of 0 will cause the JSP  -->
-  <!--                       to be checked on every access.                 -->
-  <!--                       Used in development mode only. [4]             -->
-  <!--                                                                      -->
-  <!--   recompileOnFail     If a JSP compilation fails should the          -->
-  <!--                       modificationTestInterval be ignored and the    -->
-  <!--                       next access trigger a re-compilation attempt?  -->
-  <!--                       Used in development mode only and is disabled  -->
-  <!--                       by default as compilation may be expensive and -->
-  <!--                       could lead to excessive resource usage.        -->
-  <!--                       [false]                                        -->
-  <!--                                                                      -->
-  <!--   scratchdir          What scratch directory should we use when      -->
-  <!--                       compiling JSP pages?  [default work directory  -->
-  <!--                       for the current web application]               -->
-  <!--                                                                      -->
-  <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->
-  <!--                       debugging be suppressed?  [false]              -->
-  <!--                                                                      -->
-  <!--   trimSpaces          Should white spaces in template text between   -->
-  <!--                       actions or directives be trimmed?  [false]     -->
-  <!--                                                                      -->
-  <!--   xpoweredBy          Determines whether X-Powered-By response       -->
-  <!--                       header is added by generated servlet.  [false] -->
-
-    <servlet>
-        <servlet-name>jsp</servlet-name>
-        <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-        <init-param>
-            <param-name>fork</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <init-param>
-            <param-name>xpoweredBy</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <load-on-startup>3</load-on-startup>
-    </servlet>
-
-
-  <!-- NOTE: An SSI Filter is also available as an alternative SSI          -->
-  <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->
-  <!--                                                                      -->
-  <!-- Server Side Includes processing servlet, which processes SSI         -->
-  <!-- directives in HTML pages consistent with similar support in web      -->
-  <!-- servers like Apache.  Traditionally, this servlet is mapped to the   -->
-  <!-- URL pattern "*.shtml".  This servlet supports the following          -->
-  <!-- initialization parameters (default values are in square brackets):   -->
-  <!--                                                                      -->
-  <!--   buffered            Should output from this servlet be buffered?   -->
-  <!--                       (0=false, 1=true)  [0]                         -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-  <!--                                                                      -->
-  <!--   expires             The number of seconds before a page with SSI   -->
-  <!--                       directives will expire.  [No default]          -->
-  <!--                                                                      -->
-  <!--   isVirtualWebappRelative                                            -->
-  <!--                       Should "virtual" paths be interpreted as       -->
-  <!--                       relative to the context root, instead of       -->
-  <!--                       the server root? [false]                       -->
-  <!--                                                                      -->
-  <!--   inputEncoding       The encoding to assume for SSI resources if    -->
-  <!--                       one is not available from the resource.        -->
-  <!--                       [Platform default]                             -->
-  <!--                                                                      -->
-  <!--   outputEncoding      The encoding to use for the page that results  -->
-  <!--                       from the SSI processing. [UTF-8]               -->
-  <!--                                                                      -->
-  <!--   allowExec           Is use of the exec command enabled? [false]    -->
-
-<!--
-    <servlet>
-        <servlet-name>ssi</servlet-name>
-        <servlet-class>
-          org.apache.catalina.ssi.SSIServlet
-        </servlet-class>
-        <init-param>
-          <param-name>buffered</param-name>
-          <param-value>1</param-value>
-        </init-param>
-        <init-param>
-          <param-name>debug</param-name>
-          <param-value>0</param-value>
-        </init-param>
-        <init-param>
-          <param-name>expires</param-name>
-          <param-value>666</param-value>
-        </init-param>
-        <init-param>
-          <param-name>isVirtualWebappRelative</param-name>
-          <param-value>false</param-value>
-        </init-param>
-        <load-on-startup>4</load-on-startup>
-    </servlet>
--->
-
-
-  <!-- Common Gateway Includes (CGI) processing servlet, which supports     -->
-  <!-- execution of external applications that conform to the CGI spec      -->
-  <!-- requirements.  Typically, this servlet is mapped to the URL pattern  -->
-  <!-- "/cgi-bin/*", which means that any CGI applications that are         -->
-  <!-- executed must be present within the web application.  This servlet   -->
-  <!-- supports the following initialization parameters (default values     -->
-  <!-- are in square brackets):                                             -->
-  <!--                                                                      -->
-  <!--   cgiPathPrefix        The CGI search path will start at             -->
-  <!--                        webAppRootDir + File.separator + this prefix. -->
-  <!--                        If not set, then webAppRootDir is used.       -->
-  <!--                        Recommended value: WEB-INF/cgi                -->
-  <!--                                                                      -->
-  <!--   debug                Debugging detail level for messages logged    -->
-  <!--                        by this servlet.  [0]                         -->
-  <!--                                                                      -->
-  <!--   executable           Name of the executable used to run the        -->
-  <!--                        script. [perl]                                -->
-  <!--                                                                      -->
-  <!--   parameterEncoding    Name of parameter encoding to be used with    -->
-  <!--                        CGI servlet.                                  -->
-  <!--                        [System.getProperty("file.encoding","UTF-8")] -->
-  <!--                                                                      -->
-  <!--   passShellEnvironment Should the shell environment variables (if    -->
-  <!--                        any) be passed to the CGI script? [false]     -->
-  <!--                                                                      -->
-  <!--   stderrTimeout        The time (in milliseconds) to wait for the    -->
-  <!--                        reading of stderr to complete before          -->
-  <!--                        terminating the CGI process. [2000]           -->
-
-<!--
-    <servlet>
-        <servlet-name>cgi</servlet-name>
-        <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
-        <init-param>
-          <param-name>debug</param-name>
-          <param-value>0</param-value>
-        </init-param>
-        <init-param>
-          <param-name>cgiPathPrefix</param-name>
-          <param-value>WEB-INF/cgi</param-value>
-        </init-param>
-         <load-on-startup>5</load-on-startup>
-    </servlet>
--->
-
-
-  <!-- ================ Built In Servlet Mappings ========================= -->
-
-
-  <!-- The servlet mappings for the built in servlets defined above.  Note  -->
-  <!-- that, by default, the CGI and SSI servlets are *not* mapped.  You    -->
-  <!-- must uncomment these mappings (or add them to your application's own -->
-  <!-- web.xml deployment descriptor) to enable these services              -->
-
-    <!-- The mapping for the default servlet -->
-    <servlet-mapping>
-        <servlet-name>default</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-
-    <!-- The mappings for the JSP servlet -->
-    <servlet-mapping>
-        <servlet-name>jsp</servlet-name>
-        <url-pattern>*.jsp</url-pattern>
-        <url-pattern>*.jspx</url-pattern>
-    </servlet-mapping>
-
-    <!-- The mapping for the SSI servlet -->
-<!--
-    <servlet-mapping>
-        <servlet-name>ssi</servlet-name>
-        <url-pattern>*.shtml</url-pattern>
-    </servlet-mapping>
--->
-
-    <!-- The mapping for the CGI Gateway servlet -->
-
-<!--
-    <servlet-mapping>
-        <servlet-name>cgi</servlet-name>
-        <url-pattern>/cgi-bin/*</url-pattern>
-    </servlet-mapping>
--->
-
-
-  <!-- ================== Built In Filter Definitions ===================== -->
-
-  <!-- A filter that sets character encoding that is used to decode -->
-  <!-- parameters in a POST request -->
-<!--
-    <filter>
-        <filter-name>setCharacterEncodingFilter</filter-name>
-        <filter-class>org.apache.catalina.filters.SetCharacterEncodingFilter</filter-class>
-        <init-param>
-            <param-name>encoding</param-name>
-            <param-value>UTF-8</param-value>
-        </init-param>
-        <async-supported>true</async-supported>
-    </filter>
--->
-
-  <!-- A filter that triggers request parameters parsing and rejects the    -->
-  <!-- request if some parameters were skipped because of parsing errors or -->
-  <!-- request size limitations.                                            -->
-<!--
-    <filter>
-        <filter-name>failedRequestFilter</filter-name>
-        <filter-class>
-          org.apache.catalina.filters.FailedRequestFilter
-        </filter-class>
-        <async-supported>true</async-supported>
-    </filter>
--->
-
-
-  <!-- NOTE: An SSI Servlet is also available as an alternative SSI         -->
-  <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->
-  <!--                                                                      -->
-  <!-- Server Side Includes processing filter, which processes SSI          -->
-  <!-- directives in HTML pages consistent with similar support in web      -->
-  <!-- servers like Apache.  Traditionally, this filter is mapped to the    -->
-  <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will     -->
-  <!-- selectively enable/disable SSI processing based on mime types. For   -->
-  <!-- this to work you will need to uncomment the .shtml mime type         -->
-  <!-- definition towards the bottom of this file.                          -->
-  <!-- The contentType init param allows you to apply SSI processing to JSP -->
-  <!-- pages, javascript, or any other content you wish.  This filter       -->
-  <!-- supports the following initialization parameters (default values are -->
-  <!-- in square brackets):                                                 -->
-  <!--                                                                      -->
-  <!--   contentType         A regex pattern that must be matched before    -->
-  <!--                       SSI processing is applied.                     -->
-  <!--                       [text/x-server-parsed-html(;.*)?]              -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-  <!--                                                                      -->
-  <!--   expires             The number of seconds before a page with SSI   -->
-  <!--                       directives will expire.  [No default]          -->
-  <!--                                                                      -->
-  <!--   isVirtualWebappRelative                                            -->
-  <!--                       Should "virtual" paths be interpreted as       -->
-  <!--                       relative to the context root, instead of       -->
-  <!--                       the server root? [false]                       -->
-  <!--                                                                      -->
-  <!--   allowExec           Is use of the exec command enabled? [false]    -->
-
-<!--
-    <filter>
-        <filter-name>ssi</filter-name>
-        <filter-class>
-          org.apache.catalina.ssi.SSIFilter
-        </filter-class>
-        <init-param>
-          <param-name>contentType</param-name>
-          <param-value>text/x-server-parsed-html(;.*)?</param-value>
-        </init-param>
-        <init-param>
-          <param-name>debug</param-name>
-          <param-value>0</param-value>
-        </init-param>
-        <init-param>
-          <param-name>expires</param-name>
-          <param-value>666</param-value>
-        </init-param>
-        <init-param>
-          <param-name>isVirtualWebappRelative</param-name>
-          <param-value>false</param-value>
-        </init-param>
-    </filter>
--->
-
-
-  <!-- ==================== Built In Filter Mappings ====================== -->
-
-  <!-- The mapping for the Set Character Encoding Filter -->
-<!--
-    <filter-mapping>
-        <filter-name>setCharacterEncodingFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
--->
-
-  <!-- The mapping for the Failed Request Filter -->
-<!--
-    <filter-mapping>
-        <filter-name>failedRequestFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
--->
-
-  <!-- The mapping for the SSI Filter -->
-<!--
-    <filter-mapping>
-        <filter-name>ssi</filter-name>
-        <url-pattern>*.shtml</url-pattern>
-    </filter-mapping>
--->
-
-
-  <!-- ==================== Default Session Configuration ================= -->
-  <!-- You can set the default session timeout (in minutes) for all newly   -->
-  <!-- created sessions by modifying the value below.                       -->
-
-    <session-config>
-        <session-timeout>30</session-timeout>
-    </session-config>
-
-
-  <!-- ===================== Default MIME Type Mappings =================== -->
-  <!-- When serving static resources, Tomcat will automatically generate    -->
-  <!-- a "Content-Type" header based on the resource's filename extension,  -->
-  <!-- based on these mappings.  Additional mappings can be added here (to  -->
-  <!-- apply to all web applications), or in your own application's web.xml -->
-  <!-- deployment descriptor.                                               -->
-
-    <mime-mapping>
-        <extension>123</extension>
-        <mime-type>application/vnd.lotus-1-2-3</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>3dml</extension>
-        <mime-type>text/vnd.in3d.3dml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>3ds</extension>
-        <mime-type>image/x-3ds</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>3g2</extension>
-        <mime-type>video/3gpp2</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>3gp</extension>
-        <mime-type>video/3gpp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>7z</extension>
-        <mime-type>application/x-7z-compressed</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aab</extension>
-        <mime-type>application/x-authorware-bin</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aac</extension>
-        <mime-type>audio/x-aac</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aam</extension>
-        <mime-type>application/x-authorware-map</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aas</extension>
-        <mime-type>application/x-authorware-seg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>abs</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>abw</extension>
-        <mime-type>application/x-abiword</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ac</extension>
-        <mime-type>application/pkix-attr-cert</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>acc</extension>
-        <mime-type>application/vnd.americandynamics.acc</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ace</extension>
-        <mime-type>application/x-ace-compressed</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>acu</extension>
-        <mime-type>application/vnd.acucobol</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>acutc</extension>
-        <mime-type>application/vnd.acucorp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>adp</extension>
-        <mime-type>audio/adpcm</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aep</extension>
-        <mime-type>application/vnd.audiograph</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>afm</extension>
-        <mime-type>application/x-font-type1</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>afp</extension>
-        <mime-type>application/vnd.ibm.modcap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ahead</extension>
-        <mime-type>application/vnd.ahead.space</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ai</extension>
-        <mime-type>application/postscript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aif</extension>
-        <mime-type>audio/x-aiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aifc</extension>
-        <mime-type>audio/x-aiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aiff</extension>
-        <mime-type>audio/x-aiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aim</extension>
-        <mime-type>application/x-aim</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>air</extension>
-        <mime-type>application/vnd.adobe.air-application-installer-package+zip</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ait</extension>
-        <mime-type>application/vnd.dvb.ait</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ami</extension>
-        <mime-type>application/vnd.amiga.ami</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>anx</extension>
-        <mime-type>application/annodex</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>apk</extension>
-        <mime-type>application/vnd.android.package-archive</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>appcache</extension>
-        <mime-type>text/cache-manifest</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>application</extension>
-        <mime-type>application/x-ms-application</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>apr</extension>
-        <mime-type>application/vnd.lotus-approach</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>arc</extension>
-        <mime-type>application/x-freearc</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>art</extension>
-        <mime-type>image/x-jg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>asc</extension>
-        <mime-type>application/pgp-signature</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>asf</extension>
-        <mime-type>video/x-ms-asf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>asm</extension>
-        <mime-type>text/x-asm</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aso</extension>
-        <mime-type>application/vnd.accpac.simply.aso</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>asx</extension>
-        <mime-type>video/x-ms-asf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>atc</extension>
-        <mime-type>application/vnd.acucorp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>atom</extension>
-        <mime-type>application/atom+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>atomcat</extension>
-        <mime-type>application/atomcat+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>atomsvc</extension>
-        <mime-type>application/atomsvc+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>atx</extension>
-        <mime-type>application/vnd.antix.game-component</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>au</extension>
-        <mime-type>audio/basic</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>avi</extension>
-        <mime-type>video/x-msvideo</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>avx</extension>
-        <mime-type>video/x-rad-screenplay</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aw</extension>
-        <mime-type>application/applixware</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>axa</extension>
-        <mime-type>audio/annodex</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>axv</extension>
-        <mime-type>video/annodex</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>azf</extension>
-        <mime-type>application/vnd.airzip.filesecure.azf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>azs</extension>
-        <mime-type>application/vnd.airzip.filesecure.azs</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>azw</extension>
-        <mime-type>application/vnd.amazon.ebook</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bat</extension>
-        <mime-type>application/x-msdownload</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bcpio</extension>
-        <mime-type>application/x-bcpio</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bdf</extension>
-        <mime-type>application/x-font-bdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bdm</extension>
-        <mime-type>application/vnd.syncml.dm+wbxml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bed</extension>
-        <mime-type>application/vnd.realvnc.bed</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bh2</extension>
-        <mime-type>application/vnd.fujitsu.oasysprs</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bin</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>blb</extension>
-        <mime-type>application/x-blorb</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>blorb</extension>
-        <mime-type>application/x-blorb</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bmi</extension>
-        <mime-type>application/vnd.bmi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bmp</extension>
-        <mime-type>image/bmp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>body</extension>
-        <mime-type>text/html</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>book</extension>
-        <mime-type>application/vnd.framemaker</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>box</extension>
-        <mime-type>application/vnd.previewsystems.box</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>boz</extension>
-        <mime-type>application/x-bzip2</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bpk</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>btif</extension>
-        <mime-type>image/prs.btif</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bz</extension>
-        <mime-type>application/x-bzip</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bz2</extension>
-        <mime-type>application/x-bzip2</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>c</extension>
-        <mime-type>text/x-c</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>c11amc</extension>
-        <mime-type>application/vnd.cluetrust.cartomobile-config</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>c11amz</extension>
-        <mime-type>application/vnd.cluetrust.cartomobile-config-pkg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>c4d</extension>
-        <mime-type>application/vnd.clonk.c4group</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>c4f</extension>
-        <mime-type>application/vnd.clonk.c4group</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>c4g</extension>
-        <mime-type>application/vnd.clonk.c4group</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>c4p</extension>
-        <mime-type>application/vnd.clonk.c4group</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>c4u</extension>
-        <mime-type>application/vnd.clonk.c4group</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cab</extension>
-        <mime-type>application/vnd.ms-cab-compressed</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>caf</extension>
-        <mime-type>audio/x-caf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cap</extension>
-        <mime-type>application/vnd.tcpdump.pcap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>car</extension>
-        <mime-type>application/vnd.curl.car</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cat</extension>
-        <mime-type>application/vnd.ms-pki.seccat</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cb7</extension>
-        <mime-type>application/x-cbr</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cba</extension>
-        <mime-type>application/x-cbr</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cbr</extension>
-        <mime-type>application/x-cbr</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cbt</extension>
-        <mime-type>application/x-cbr</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cbz</extension>
-        <mime-type>application/x-cbr</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cc</extension>
-        <mime-type>text/x-c</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cct</extension>
-        <mime-type>application/x-director</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ccxml</extension>
-        <mime-type>application/ccxml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdbcmsg</extension>
-        <mime-type>application/vnd.contact.cmsg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdf</extension>
-        <mime-type>application/x-cdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdkey</extension>
-        <mime-type>application/vnd.mediastation.cdkey</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdmia</extension>
-        <mime-type>application/cdmi-capability</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdmic</extension>
-        <mime-type>application/cdmi-container</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdmid</extension>
-        <mime-type>application/cdmi-domain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdmio</extension>
-        <mime-type>application/cdmi-object</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdmiq</extension>
-        <mime-type>application/cdmi-queue</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdx</extension>
-        <mime-type>chemical/x-cdx</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdxml</extension>
-        <mime-type>application/vnd.chemdraw+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdy</extension>
-        <mime-type>application/vnd.cinderella</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cer</extension>
-        <mime-type>application/pkix-cert</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cfs</extension>
-        <mime-type>application/x-cfs-compressed</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cgm</extension>
-        <mime-type>image/cgm</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>chat</extension>
-        <mime-type>application/x-chat</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>chm</extension>
-        <mime-type>application/vnd.ms-htmlhelp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>chrt</extension>
-        <mime-type>application/vnd.kde.kchart</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cif</extension>
-        <mime-type>chemical/x-cif</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cii</extension>
-        <mime-type>application/vnd.anser-web-certificate-issue-initiation</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cil</extension>
-        <mime-type>application/vnd.ms-artgalry</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cla</extension>
-        <mime-type>application/vnd.claymore</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>class</extension>
-        <mime-type>application/java</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>clkk</extension>
-        <mime-type>application/vnd.crick.clicker.keyboard</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>clkp</extension>
-        <mime-type>application/vnd.crick.clicker.palette</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>clkt</extension>
-        <mime-type>application/vnd.crick.clicker.template</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>clkw</extension>
-        <mime-type>application/vnd.crick.clicker.wordbank</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>clkx</extension>
-        <mime-type>application/vnd.crick.clicker</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>clp</extension>
-        <mime-type>application/x-msclip</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cmc</extension>
-        <mime-type>application/vnd.cosmocaller</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cmdf</extension>
-        <mime-type>chemical/x-cmdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cml</extension>
-        <mime-type>chemical/x-cml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cmp</extension>
-        <mime-type>application/vnd.yellowriver-custom-menu</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cmx</extension>
-        <mime-type>image/x-cmx</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cod</extension>
-        <mime-type>application/vnd.rim.cod</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>com</extension>
-        <mime-type>application/x-msdownload</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>conf</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cpio</extension>
-        <mime-type>application/x-cpio</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cpp</extension>
-        <mime-type>text/x-c</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cpt</extension>
-        <mime-type>application/mac-compactpro</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>crd</extension>
-        <mime-type>application/x-mscardfile</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>crl</extension>
-        <mime-type>application/pkix-crl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>crt</extension>
-        <mime-type>application/x-x509-ca-cert</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cryptonote</extension>
-        <mime-type>application/vnd.rig.cryptonote</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>csh</extension>
-        <mime-type>application/x-csh</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>csml</extension>
-        <mime-type>chemical/x-csml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>csp</extension>
-        <mime-type>application/vnd.commonspace</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>css</extension>
-        <mime-type>text/css</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cst</extension>
-        <mime-type>application/x-director</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>csv</extension>
-        <mime-type>text/csv</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cu</extension>
-        <mime-type>application/cu-seeme</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>curl</extension>
-        <mime-type>text/vnd.curl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cww</extension>
-        <mime-type>application/prs.cww</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cxt</extension>
-        <mime-type>application/x-director</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cxx</extension>
-        <mime-type>text/x-c</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dae</extension>
-        <mime-type>model/vnd.collada+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>daf</extension>
-        <mime-type>application/vnd.mobius.daf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dart</extension>
-        <mime-type>application/vnd.dart</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dataless</extension>
-        <mime-type>application/vnd.fdsn.seed</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>davmount</extension>
-        <mime-type>application/davmount+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dbk</extension>
-        <mime-type>application/docbook+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dcr</extension>
-        <mime-type>application/x-director</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dcurl</extension>
-        <mime-type>text/vnd.curl.dcurl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dd2</extension>
-        <mime-type>application/vnd.oma.dd2+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ddd</extension>
-        <mime-type>application/vnd.fujixerox.ddd</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>deb</extension>
-        <mime-type>application/x-debian-package</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>def</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>deploy</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>der</extension>
-        <mime-type>application/x-x509-ca-cert</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dfac</extension>
-        <mime-type>application/vnd.dreamfactory</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dgc</extension>
-        <mime-type>application/x-dgc-compressed</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dib</extension>
-        <mime-type>image/bmp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dic</extension>
-        <mime-type>text/x-c</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dir</extension>
-        <mime-type>application/x-director</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dis</extension>
-        <mime-type>application/vnd.mobius.dis</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dist</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>distz</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>djv</extension>
-        <mime-type>image/vnd.djvu</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>djvu</extension>
-        <mime-type>image/vnd.djvu</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dll</extension>
-        <mime-type>application/x-msdownload</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dmg</extension>
-        <mime-type>application/x-apple-diskimage</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dmp</extension>
-        <mime-type>application/vnd.tcpdump.pcap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dms</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dna</extension>
-        <mime-type>application/vnd.dna</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>doc</extension>
-        <mime-type>application/msword</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>docm</extension>
-        <mime-type>application/vnd.ms-word.document.macroenabled.12</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>docx</extension>
-        <mime-type>application/vnd.openxmlformats-officedocument.wordprocessingml.document</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dot</extension>
-        <mime-type>application/msword</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dotm</extension>
-        <mime-type>application/vnd.ms-word.template.macroenabled.12</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dotx</extension>
-        <mime-type>application/vnd.openxmlformats-officedocument.wordprocessingml.template</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dp</extension>
-        <mime-type>application/vnd.osgi.dp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dpg</extension>
-        <mime-type>application/vnd.dpgraph</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dra</extension>
-        <mime-type>audio/vnd.dra</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dsc</extension>
-        <mime-type>text/prs.lines.tag</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dssc</extension>
-        <mime-type>application/dssc+der</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dtb</extension>
-        <mime-type>application/x-dtbook+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dtd</extension>
-        <mime-type>application/xml-dtd</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dts</extension>
-        <mime-type>audio/vnd.dts</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dtshd</extension>
-        <mime-type>audio/vnd.dts.hd</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dump</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dv</extension>
-        <mime-type>video/x-dv</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dvb</extension>
-        <mime-type>video/vnd.dvb.file</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dvi</extension>
-        <mime-type>application/x-dvi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dwf</extension>
-        <mime-type>model/vnd.dwf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dwg</extension>
-        <mime-type>image/vnd.dwg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dxf</extension>
-        <mime-type>image/vnd.dxf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dxp</extension>
-        <mime-type>application/vnd.spotfire.dxp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dxr</extension>
-        <mime-type>application/x-director</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ecelp4800</extension>
-        <mime-type>audio/vnd.nuera.ecelp4800</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ecelp7470</extension>
-        <mime-type>audio/vnd.nuera.ecelp7470</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ecelp9600</extension>
-        <mime-type>audio/vnd.nuera.ecelp9600</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ecma</extension>
-        <mime-type>application/ecmascript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>edm</extension>
-        <mime-type>application/vnd.novadigm.edm</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>edx</extension>
-        <mime-type>application/vnd.novadigm.edx</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>efif</extension>
-        <mime-type>application/vnd.picsel</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ei6</extension>
-        <mime-type>application/vnd.pg.osasli</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>elc</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>emf</extension>
-        <mime-type>application/x-msmetafile</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>eml</extension>
-        <mime-type>message/rfc822</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>emma</extension>
-        <mime-type>application/emma+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>emz</extension>
-        <mime-type>application/x-msmetafile</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>eol</extension>
-        <mime-type>audio/vnd.digital-winds</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>eot</extension>
-        <mime-type>application/vnd.ms-fontobject</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>eps</extension>
-        <mime-type>application/postscript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>epub</extension>
-        <mime-type>application/epub+zip</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>es3</extension>
-        <mime-type>application/vnd.eszigno3+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>esa</extension>
-        <mime-type>application/vnd.osgi.subsystem</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>esf</extension>
-        <mime-type>application/vnd.epson.esf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>et3</extension>
-        <mime-type>application/vnd.eszigno3+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>etx</extension>
-        <mime-type>text/x-setext</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>eva</extension>
-        <mime-type>application/x-eva</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>evy</extension>
-        <mime-type>application/x-envoy</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>exe</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>exi</extension>
-        <mime-type>application/exi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ext</extension>
-        <mime-type>application/vnd.novadigm.ext</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ez</extension>
-        <mime-type>application/andrew-inset</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ez2</extension>
-        <mime-type>application/vnd.ezpix-album</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ez3</extension>
-        <mime-type>application/vnd.ezpix-package</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>f</extension>
-        <mime-type>text/x-fortran</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>f4v</extension>
-        <mime-type>video/x-f4v</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>f77</extension>
-        <mime-type>text/x-fortran</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>f90</extension>
-        <mime-type>text/x-fortran</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fbs</extension>
-        <mime-type>image/vnd.fastbidsheet</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fcdt</extension>
-        <mime-type>application/vnd.adobe.formscentral.fcdt</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fcs</extension>
-        <mime-type>application/vnd.isac.fcs</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fdf</extension>
-        <mime-type>application/vnd.fdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fe_launch</extension>
-        <mime-type>application/vnd.denovo.fcselayout-link</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fg5</extension>
-        <mime-type>application/vnd.fujitsu.oasysgp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fgd</extension>
-        <mime-type>application/x-director</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fh</extension>
-        <mime-type>image/x-freehand</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fh4</extension>
-        <mime-type>image/x-freehand</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fh5</extension>
-        <mime-type>image/x-freehand</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fh7</extension>
-        <mime-type>image/x-freehand</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fhc</extension>
-        <mime-type>image/x-freehand</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fig</extension>
-        <mime-type>application/x-xfig</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>flac</extension>
-        <mime-type>audio/flac</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fli</extension>
-        <mime-type>video/x-fli</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>flo</extension>
-        <mime-type>application/vnd.micrografx.flo</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>flv</extension>
-        <mime-type>video/x-flv</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>flw</extension>
-        <mime-type>application/vnd.kde.kivio</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>flx</extension>
-        <mime-type>text/vnd.fmi.flexstor</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fly</extension>
-        <mime-type>text/vnd.fly</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fm</extension>
-        <mime-type>application/vnd.framemaker</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fnc</extension>
-        <mime-type>application/vnd.frogans.fnc</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>for</extension>
-        <mime-type>text/x-fortran</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fpx</extension>
-        <mime-type>image/vnd.fpx</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>frame</extension>
-        <mime-type>application/vnd.framemaker</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fsc</extension>
-        <mime-type>application/vnd.fsc.weblaunch</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fst</extension>
-        <mime-type>image/vnd.fst</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ftc</extension>
-        <mime-type>application/vnd.fluxtime.clip</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fti</extension>
-        <mime-type>application/vnd.anser-web-funds-transfer-initiation</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fvt</extension>
-        <mime-type>video/vnd.fvt</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fxp</extension>
-        <mime-type>application/vnd.adobe.fxp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fxpl</extension>
-        <mime-type>application/vnd.adobe.fxp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>fzs</extension>
-        <mime-type>application/vnd.fuzzysheet</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>g2w</extension>
-        <mime-type>application/vnd.geoplan</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>g3</extension>
-        <mime-type>image/g3fax</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>g3w</extension>
-        <mime-type>application/vnd.geospace</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gac</extension>
-        <mime-type>application/vnd.groove-account</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gam</extension>
-        <mime-type>application/x-tads</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gbr</extension>
-        <mime-type>application/rpki-ghostbusters</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gca</extension>
-        <mime-type>application/x-gca-compressed</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gdl</extension>
-        <mime-type>model/vnd.gdl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>geo</extension>
-        <mime-type>application/vnd.dynageo</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gex</extension>
-        <mime-type>application/vnd.geometry-explorer</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ggb</extension>
-        <mime-type>application/vnd.geogebra.file</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ggt</extension>
-        <mime-type>application/vnd.geogebra.tool</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ghf</extension>
-        <mime-type>application/vnd.groove-help</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gif</extension>
-        <mime-type>image/gif</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gim</extension>
-        <mime-type>application/vnd.groove-identity-message</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gml</extension>
-        <mime-type>application/gml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gmx</extension>
-        <mime-type>application/vnd.gmx</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gnumeric</extension>
-        <mime-type>application/x-gnumeric</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gph</extension>
-        <mime-type>application/vnd.flographit</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gpx</extension>
-        <mime-type>application/gpx+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gqf</extension>
-        <mime-type>application/vnd.grafeq</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gqs</extension>
-        <mime-type>application/vnd.grafeq</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gram</extension>
-        <mime-type>application/srgs</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gramps</extension>
-        <mime-type>application/x-gramps-xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gre</extension>
-        <mime-type>application/vnd.geometry-explorer</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>grv</extension>
-        <mime-type>application/vnd.groove-injector</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>grxml</extension>
-        <mime-type>application/srgs+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gsf</extension>
-        <mime-type>application/x-font-ghostscript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gtar</extension>
-        <mime-type>application/x-gtar</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gtm</extension>
-        <mime-type>application/vnd.groove-tool-message</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gtw</extension>
-        <mime-type>model/vnd.gtw</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gv</extension>
-        <mime-type>text/vnd.graphviz</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gxf</extension>
-        <mime-type>application/gxf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gxt</extension>
-        <mime-type>application/vnd.geonext</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gz</extension>
-        <mime-type>application/x-gzip</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>h</extension>
-        <mime-type>text/x-c</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>h261</extension>
-        <mime-type>video/h261</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>h263</extension>
-        <mime-type>video/h263</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>h264</extension>
-        <mime-type>video/h264</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hal</extension>
-        <mime-type>application/vnd.hal+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hbci</extension>
-        <mime-type>application/vnd.hbci</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hdf</extension>
-        <mime-type>application/x-hdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hh</extension>
-        <mime-type>text/x-c</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hlp</extension>
-        <mime-type>application/winhlp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hpgl</extension>
-        <mime-type>application/vnd.hp-hpgl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hpid</extension>
-        <mime-type>application/vnd.hp-hpid</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hps</extension>
-        <mime-type>application/vnd.hp-hps</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hqx</extension>
-        <mime-type>application/mac-binhex40</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>htc</extension>
-        <mime-type>text/x-component</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>htke</extension>
-        <mime-type>application/vnd.kenameaapp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>htm</extension>
-        <mime-type>text/html</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>html</extension>
-        <mime-type>text/html</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hvd</extension>
-        <mime-type>application/vnd.yamaha.hv-dic</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hvp</extension>
-        <mime-type>application/vnd.yamaha.hv-voice</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hvs</extension>
-        <mime-type>application/vnd.yamaha.hv-script</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>i2g</extension>
-        <mime-type>application/vnd.intergeo</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>icc</extension>
-        <mime-type>application/vnd.iccprofile</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ice</extension>
-        <mime-type>x-conference/x-cooltalk</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>icm</extension>
-        <mime-type>application/vnd.iccprofile</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ico</extension>
-        <mime-type>image/x-icon</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ics</extension>
-        <mime-type>text/calendar</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ief</extension>
-        <mime-type>image/ief</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ifb</extension>
-        <mime-type>text/calendar</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ifm</extension>
-        <mime-type>application/vnd.shana.informed.formdata</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>iges</extension>
-        <mime-type>model/iges</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>igl</extension>
-        <mime-type>application/vnd.igloader</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>igm</extension>
-        <mime-type>application/vnd.insors.igm</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>igs</extension>
-        <mime-type>model/iges</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>igx</extension>
-        <mime-type>application/vnd.micrografx.igx</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>iif</extension>
-        <mime-type>application/vnd.shana.informed.interchange</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>imp</extension>
-        <mime-type>application/vnd.accpac.simply.imp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ims</extension>
-        <mime-type>application/vnd.ms-ims</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>in</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ink</extension>
-        <mime-type>application/inkml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>inkml</extension>
-        <mime-type>application/inkml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>install</extension>
-        <mime-type>application/x-install-instructions</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>iota</extension>
-        <mime-type>application/vnd.astraea-software.iota</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ipfix</extension>
-        <mime-type>application/ipfix</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ipk</extension>
-        <mime-type>application/vnd.shana.informed.package</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>irm</extension>
-        <mime-type>application/vnd.ibm.rights-management</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>irp</extension>
-        <mime-type>application/vnd.irepository.package+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>iso</extension>
-        <mime-type>application/x-iso9660-image</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>itp</extension>
-        <mime-type>application/vnd.shana.informed.formtemplate</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ivp</extension>
-        <mime-type>application/vnd.immervision-ivp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ivu</extension>
-        <mime-type>application/vnd.immervision-ivu</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jad</extension>
-        <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jam</extension>
-        <mime-type>application/vnd.jam</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jar</extension>
-        <mime-type>application/java-archive</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>java</extension>
-        <mime-type>text/x-java-source</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jisp</extension>
-        <mime-type>application/vnd.jisp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jlt</extension>
-        <mime-type>application/vnd.hp-jlyt</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jnlp</extension>
-        <mime-type>application/x-java-jnlp-file</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>joda</extension>
-        <mime-type>application/vnd.joost.joda-archive</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpe</extension>
-        <mime-type>image/jpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpeg</extension>
-        <mime-type>image/jpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpg</extension>
-        <mime-type>image/jpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpgm</extension>
-        <mime-type>video/jpm</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpgv</extension>
-        <mime-type>video/jpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpm</extension>
-        <mime-type>video/jpm</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>js</extension>
-        <mime-type>application/javascript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jsf</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>json</extension>
-        <mime-type>application/json</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jsonml</extension>
-        <mime-type>application/jsonml+json</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jspf</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kar</extension>
-        <mime-type>audio/midi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>karbon</extension>
-        <mime-type>application/vnd.kde.karbon</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kfo</extension>
-        <mime-type>application/vnd.kde.kformula</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kia</extension>
-        <mime-type>application/vnd.kidspiration</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kml</extension>
-        <mime-type>application/vnd.google-earth.kml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kmz</extension>
-        <mime-type>application/vnd.google-earth.kmz</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kne</extension>
-        <mime-type>application/vnd.kinar</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>knp</extension>
-        <mime-type>application/vnd.kinar</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kon</extension>
-        <mime-type>application/vnd.kde.kontour</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kpr</extension>
-        <mime-type>application/vnd.kde.kpresenter</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kpt</extension>
-        <mime-type>application/vnd.kde.kpresenter</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kpxx</extension>
-        <mime-type>application/vnd.ds-keypoint</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ksp</extension>
-        <mime-type>application/vnd.kde.kspread</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ktr</extension>
-        <mime-type>application/vnd.kahootz</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ktx</extension>
-        <mime-type>image/ktx</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ktz</extension>
-        <mime-type>application/vnd.kahootz</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kwd</extension>
-        <mime-type>application/vnd.kde.kword</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kwt</extension>
-        <mime-type>application/vnd.kde.kword</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>lasxml</extension>
-        <mime-type>application/vnd.las.las+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>latex</extension>
-        <mime-type>application/x-latex</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>lbd</extension>
-        <mime-type>application/vnd.llamagraphics.life-balance.desktop</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>lbe</extension>
-        <mime-type>application/vnd.llamagraphics.life-balance.exchange+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>les</extension>
-        <mime-type>application/vnd.hhe.lesson-player</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>lha</extension>
-        <mime-type>application/x-lzh-compressed</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>link66</extension>
-        <mime-type>application/vnd.route66.link66+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>list</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>list3820</extension>
-        <mime-type>application/vnd.ibm.modcap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>listafp</extension>
-        <mime-type>application/vnd.ibm.modcap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>lnk</extension>
-        <mime-type>application/x-ms-shortcut</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>log</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>lostxml</extension>
-        <mime-type>application/lost+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>lrf</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>lrm</extension>
-        <mime-type>application/vnd.ms-lrm</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ltf</extension>
-        <mime-type>application/vnd.frogans.ltf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>lvp</extension>
-        <mime-type>audio/vnd.lucent.voice</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>lwp</extension>
-        <mime-type>application/vnd.lotus-wordpro</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>lzh</extension>
-        <mime-type>application/x-lzh-compressed</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m13</extension>
-        <mime-type>application/x-msmediaview</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m14</extension>
-        <mime-type>application/x-msmediaview</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m1v</extension>
-        <mime-type>video/mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m21</extension>
-        <mime-type>application/mp21</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m2a</extension>
-        <mime-type>audio/mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m2v</extension>
-        <mime-type>video/mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m3a</extension>
-        <mime-type>audio/mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m3u</extension>
-        <mime-type>audio/x-mpegurl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m3u8</extension>
-        <mime-type>application/vnd.apple.mpegurl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m4a</extension>
-        <mime-type>audio/mp4</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m4b</extension>
-        <mime-type>audio/mp4</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m4r</extension>
-        <mime-type>audio/mp4</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m4u</extension>
-        <mime-type>video/vnd.mpegurl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m4v</extension>
-        <mime-type>video/mp4</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ma</extension>
-        <mime-type>application/mathematica</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mac</extension>
-        <mime-type>image/x-macpaint</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mads</extension>
-        <mime-type>application/mads+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mag</extension>
-        <mime-type>application/vnd.ecowin.chart</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>maker</extension>
-        <mime-type>application/vnd.framemaker</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>man</extension>
-        <mime-type>text/troff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mar</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mathml</extension>
-        <mime-type>application/mathml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mb</extension>
-        <mime-type>application/mathematica</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mbk</extension>
-        <mime-type>application/vnd.mobius.mbk</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mbox</extension>
-        <mime-type>application/mbox</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mc1</extension>
-        <mime-type>application/vnd.medcalcdata</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mcd</extension>
-        <mime-type>application/vnd.mcd</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mcurl</extension>
-        <mime-type>text/vnd

<TRUNCATED>

[11/14] eagle git commit: [MINOR] Migrate 0.5.0-incubating-SNAPSHOT to 0.5.0-SNAPSHOT

Posted by ha...@apache.org.
http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/LICENSE
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/LICENSE b/eagle-assembly/src/main/lib/tomcat/LICENSE
deleted file mode 100644
index 0532f5b..0000000
--- a/eagle-assembly/src/main/lib/tomcat/LICENSE
+++ /dev/null
@@ -1,1050 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.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.
-
-
-
-APACHE TOMCAT SUBCOMPONENTS:
-
-Apache Tomcat includes a number of subcomponents with separate copyright notices
-and license terms. Your use of these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-
-For the ecj-x.x.x.jar component:
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are
-distributed by that particular Contributor. A Contribution 'originates' from a
-Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to
-the Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free copyright license to
-reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and such
-derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form.
-This patent license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to
-its Contributions set forth herein, no assurances are provided by any
-Contributor that the Program does not infringe the patent or other intellectual
-property rights of any other entity. Each Contributor disclaims any liability to
-Recipient for claims brought by any other entity based on infringement of
-intellectual property rights or otherwise. As a condition to exercising the
-rights and licenses granted hereunder, each Recipient hereby assumes sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient's responsibility to acquire that license
-before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its
-own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title and
-non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and consequential
-damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by
-that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor,
-and informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the
-Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may
-participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its exercise of
-rights under this Agreement , including but not limited to the risks and costs
-of program errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of the
-terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-(excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted under
-Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
-may assign the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions) may always
-be distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is published,
-Contributor may elect to distribute the Program (including its Contributions)
-under the new version. Except as expressly stated in Sections 2(a) and 2(b)
-above, Recipient receives no rights or licenses to the intellectual property of
-any Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted under
-this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
-
-
-For the Windows Installer component:
-
-    * All NSIS source code, plug-ins, documentation, examples, header files and
-       graphics, with the exception of the compression modules and where
-       otherwise noted, are licensed under the zlib/libpng license.
-    * The zlib compression module for NSIS is licensed under the zlib/libpng
-       license.
-    * The bzip2 compression module for NSIS is licensed under the bzip2 license.
-    * The lzma compression module for NSIS is licensed under the Common Public
-       License version 1.0.
-
-zlib/libpng license
-
-This software is provided 'as-is', without any express or implied warranty. In
-no event will the authors be held liable for any damages arising from the use of
-this software.
-
-Permission is granted to anyone to use this software for any purpose, including
-commercial applications, and to alter it and redistribute it freely, subject to
-the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you must not claim
-       that you wrote the original software. If you use this software in a
-       product, an acknowledgment in the product documentation would be
-       appreciated but is not required.
-   2. Altered source versions must be plainly marked as such, and must not be
-       misrepresented as being the original software.
-   3. This notice may not be removed or altered from any source distribution.
-
-bzip2 license
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-   2. The origin of this software must not be misrepresented; you must not claim
-       that you wrote the original software. If you use this software in a
-       product, an acknowledgment in the product documentation would be
-       appreciated but is not required.
-   3. Altered source versions must be plainly marked as such, and must not be
-       misrepresented as being the original software.
-   4. The name of the author may not be used to endorse or promote products
-       derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGE.
-
-Julian Seward, Cambridge, UK.
-
-jseward@acm.org
-Common Public License version 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and b) in the case of each subsequent
-Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are
-distributed by that particular Contributor. A Contribution 'originates' from a
-Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to
-the Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free copyright license to
-reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and such
-derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form.
-This patent license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to
-its Contributions set forth herein, no assurances are provided by any
-Contributor that the Program does not infringe the patent or other intellectual
-property rights of any other entity. Each Contributor disclaims any liability to
-Recipient for claims brought by any other entity based on infringement of
-intellectual property rights or otherwise. As a condition to exercising the
-rights and licenses granted hereunder, each Recipient hereby assumes sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient's responsibility to acquire that license
-before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its
-own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title and
-non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and consequential
-damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by
-that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor,
-and informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the
-Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to
-control, and cooperate with the Commercial Contributor in, the defense and any
-related settlement negotiations. The Indemnified Contributor may participate in
-any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its exercise of
-rights under this Agreement, including but not limited to the risks and costs of
-program errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of the
-terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to
-a patent applicable to software (including a cross-claim or counterclaim in a
-lawsuit), then any patent licenses granted by that Contributor to such Recipient
-under this Agreement shall terminate as of the date such litigation is filed. In
-addition, if Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted under
-Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
-as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the Agreement
-is published, Contributor may elect to distribute the Program (including its
-Contributions) under the new version. Except as expressly stated in Sections
-2(a) and 2(b) above, Recipient receives no rights or licenses to the
-intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
-
-Special exception for LZMA compression module
-
-Igor Pavlov and Amir Szekely, the authors of the LZMA compression module for
-NSIS, expressly permit you to statically or dynamically link your code (or bind
-by name) to the files from the LZMA compression module for NSIS without
-subjecting your linked code to the terms of the Common Public license version
-1.0. Any modifications or additions to files from the LZMA compression module
-for NSIS, however, are subject to the terms of the Common Public License version
-1.0.
-
-
-For the following XML Schemas for Java EE Deployment Descriptors:
- - javaee_5.xsd
- - javaee_web_services_1_2.xsd
- - javaee_web_services_client_1_2.xsd
- - javaee_6.xsd
- - javaee_web_services_1_3.xsd
- - javaee_web_services_client_1_3.xsd
- - jsp_2_2.xsd
- - web-app_3_0.xsd
- - web-common_3_0.xsd
- - web-fragment_3_0.xsd
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
-   1.1. Contributor. means each individual or entity that creates or contributes
-        to the creation of Modifications.
-
-   1.2. Contributor Version. means the combination of the Original Software,
-        prior Modifications used by a Contributor (if any), and the
-        Modifications made by that particular Contributor.
-
-   1.3. Covered Software. means (a) the Original Software, or (b) Modifications,
-        or (c) the combination of files containing Original Software with files
-        containing Modifications, in each case including portions thereof.
-
-   1.4. Executable. means the Covered Software in any form other than Source
-        Code.
-
-   1.5. Initial Developer. means the individual or entity that first makes
-        Original Software available under this License.
-
-   1.6. Larger Work. means a work which combines Covered Software or portions
-        thereof with code not governed by the terms of this License.
-
-   1.7. License. means this document.
-
-   1.8. Licensable. means having the right to grant, to the maximum extent
-        possible, whether at the time of the initial grant or subsequently
-        acquired, any and all of the rights conveyed herein.
-
-   1.9. Modifications. means the Source Code and Executable form of any of the
-        following:
-
-        A. Any file that results from an addition to, deletion from or
-           modification of the contents of a file containing Original Software
-           or previous Modifications;
-
-        B. Any new file that contains any part of the Original Software or
-           previous Modification; or
-
-        C. Any new file that is contributed or otherwise made available under
-           the terms of this License.
-
-   1.10. Original Software. means the Source Code and Executable form of
-         computer software code that is originally released under this License.
-
-   1.11. Patent Claims. means any patent claim(s), now owned or hereafter
-         acquired, including without limitation, method, process, and apparatus
-         claims, in any patent Licensable by grantor.
-
-   1.12. Source Code. means (a) the common form of computer software code in
-         which modifications are made and (b) associated documentation included
-         in or with such code.
-
-   1.13. You. (or .Your.) means an individual or a legal entity exercising
-         rights under, and complying with all of the terms of, this License. For
-         legal entities, .You. includes any entity which controls, is controlled
-         by, or is under common control with You. For purposes of this
-         definition, .control. means (a) the power, direct or indirect, to cause
-         the direction or management of such entity, whether by contract or
-         otherwise, or (b) ownership of more than fifty percent (50%) of the
-         outstanding shares or beneficial ownership of such entity.
-
-2. License Grants.
-
-      2.1. The Initial Developer Grant.
-
-      Conditioned upon Your compliance with Section 3.1 below and subject to
-      third party intellectual property claims, the Initial Developer hereby
-      grants You a world-wide, royalty-free, non-exclusive license:
-
-        (a) under intellectual property rights (other than patent or trademark)
-            Licensable by Initial Developer, to use, reproduce, modify, display,
-            perform, sublicense and distribute the Original Software (or
-            portions thereof), with or without Modifications, and/or as part of
-            a Larger Work; and
-
-        (b) under Patent Claims infringed by the making, using or selling of
-            Original Software, to make, have made, use, practice, sell, and
-            offer for sale, and/or otherwise dispose of the Original Software
-            (or portions thereof).
-
-        (c) The licenses granted in Sections 2.1(a) and (b) are effective on the
-            date Initial Developer first distributes or otherwise makes the
-            Original Software available to a third party under the terms of this
-            License.
-
-        (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
-            (1) for code that You delete from the Original Software, or (2) for
-            infringements caused by: (i) the modification of the Original
-            Software, or (ii) the combination of the Original Software with
-            other software or devices.
-
-    2.2. Contributor Grant.
-
-    Conditioned upon Your compliance with Section 3.1 below and subject to third
-    party intellectual property claims, each Contributor hereby grants You a
-    world-wide, royalty-free, non-exclusive license:
-
-        (a) under intellectual property rights (other than patent or trademark)
-            Licensable by Contributor to use, reproduce, modify, display,
-            perform, sublicense and distribute the Modifications created by such
-            Contributor (or portions thereof), either on an unmodified basis,
-            with other Modifications, as Covered Software and/or as part of a
-            Larger Work; and
-
-        (b) under Patent Claims infringed by the making, using, or selling of
-            Modifications made by that Contributor either alone and/or in
-            combination with its Contributor Version (or portions of such
-            combination), to make, use, sell, offer for sale, have made, and/or
-            otherwise dispose of: (1) Modifications made by that Contributor (or
-            portions thereof); and (2) the combination of Modifications made by
-            that Contributor with its Contributor Version (or portions of such
-            combination).
-
-        (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on
-            the date Contributor first distributes or otherwise makes the
-            Modifications available to a third party.
-
-        (d) Notwithstanding Section 2.2(b) above, no patent license is granted:
-            (1) for any code that Contributor has deleted from the Contributor
-            Version; (2) for infringements caused by: (i) third party
-            modifications of Contributor Version, or (ii) the combination of
-            Modifications made by that Contributor with other software (except
-            as part of the Contributor Version) or other devices; or (3) under
-            Patent Claims infringed by Covered Software in the absence of
-            Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-      3.1. Availability of Source Code.
-      Any Covered Software that You distribute or otherwise make available in
-      Executable form must also be made available in Source Code form and that
-      Source Code form must be distributed only under the terms of this License.
-      You must include a copy of this License with every copy of the Source Code
-      form of the Covered Software You distribute or otherwise make available.
-      You must inform recipients of any such Covered Software in Executable form
-      as to how they can obtain such Covered Software in Source Code form in a
-      reasonable manner on or through a medium customarily used for software
-      exchange.
-
-      3.2. Modifications.
-      The Modifications that You create or to which You contribute are governed
-      by the terms of this License. You represent that You believe Your
-      Modifications are Your original creation(s) and/or You have sufficient
-      rights to grant the rights conveyed by this License.
-
-      3.3. Required Notices.
-      You must include a notice in each of Your Modifications that identifies
-      You as the Contributor of the Modification. You may not remove or alter
-      any copyright, patent or trademark notices contained within the Covered
-      Software, or any notices of licensing or any descriptive text giving
-      attribution to any Contributor or the Initial Developer.
-
-      3.4. Application of Additional Terms.
-      You may not offer or impose any terms on any Covered Software in Source
-      Code form that alters or restricts the applicable version of this License
-      or the recipients. rights hereunder. You may choose to offer, and to
-      charge a fee for, warranty, support, indemnity or liability obligations to
-      one or more recipients of Covered Software. However, you may do so only on
-      Your own behalf, and not on behalf of the Initial Developer or any
-      Contributor. You must make it absolutely clear that any such warranty,
-      support, indemnity or liability obligation is offered by You alone, and
-      You hereby agree to indemnify the Initial Developer and every Contributor
-      for any liability incurred by the Initial Developer or such Contributor as
-      a result of warranty, support, indemnity or liability terms You offer.
-
-      3.5. Distribution of Executable Versions.
-      You may distribute the Executable form of the Covered Software under the
-      terms of this License or under the terms of a license of Your choice,
-      which may contain terms different from this License, provided that You are
-      in compliance with the terms of this License and that the license for the
-      Executable form does not attempt to limit or alter the recipient.s rights
-      in the Source Code form from the rights set forth in this License. If You
-      distribute the Covered Software in Executable form under a different
-      license, You must make it absolutely clear that any terms which differ
-      from this License are offered by You alone, not by the Initial Developer
-      or Contributor. You hereby agree to indemnify the Initial Developer and
-      every Contributor for any liability incurred by the Initial Developer or
-      such Contributor as a result of any such terms You offer.
-
-      3.6. Larger Works.
-      You may create a Larger Work by combining Covered Software with other code
-      not governed by the terms of this License and distribute the Larger Work
-      as a single product. In such a case, You must make sure the requirements
-      of this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
-      4.1. New Versions.
-      Sun Microsystems, Inc. is the initial license steward and may publish
-      revised and/or new versions of this License from time to time. Each
-      version will be given a distinguishing version number. Except as provided
-      in Section 4.3, no one other than the license steward has the right to
-      modify this License.
-
-      4.2. Effect of New Versions.
-      You may always continue to use, distribute or otherwise make the Covered
-      Software available under the terms of the version of the License under
-      which You originally received the Covered Software. If the Initial
-      Developer includes a notice in the Original Software prohibiting it from
-      being distributed or otherwise made available under any subsequent version
-      of the License, You must distribute and make the Covered Software
-      available under the terms of the version of the License under which You
-      originally received the Covered Software. Otherwise, You may also choose
-      to use, distribute or otherwise make the Covered Software available under
-      the terms of any subsequent version of the License published by the
-      license steward.
-
-      4.3. Modified Versions.
-      When You are an Initial Developer and You want to create a new license for
-      Your Original Software, You may create and use a modified version of this
-      License if You: (a) rename the license and remove any references to the
-      name of the license steward (except to note that the license differs from
-      this License); and (b) otherwise make it clear that the license contains
-      terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-   COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS, WITHOUT
-   WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-   LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
-   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK
-   AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD
-   ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL
-   DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-   SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-   ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED
-   HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-      6.1. This License and the rights granted hereunder will terminate
-           automatically if You fail to comply with terms herein and fail to
-           cure such breach within 30 days of becoming aware of the breach.
-           Provisions which, by their nature, must remain in effect beyond the
-           termination of this License shall survive.
-
-      6.2. If You assert a patent infringement claim (excluding declaratory
-           judgment actions) against Initial Developer or a Contributor (the
-           Initial Developer or Contributor against whom You assert such claim
-           is referred to as .Participant.) alleging that the Participant
-           Software (meaning the Contributor Version where the Participant is a
-           Contributor or the Original Software where the Participant is the
-           Initial Developer) directly or indirectly infringes any patent, then
-           any and all rights granted directly or indirectly to You by such
-           Participant, the Initial Developer (if the Initial Developer is not
-           the Participant) and all Contributors under Sections 2.1 and/or 2.2
-           of this License shall, upon 60 days notice from Participant terminate
-           prospectively and automatically at the expiration of such 60 day
-           notice period, unless if within such 60 day period You withdraw Your
-           claim with respect to the Participant Software against such
-           Participant either unilaterally or pursuant to a written agreement
-           with Participant.
-
-      6.3. In the event of termination under Sections 6.1 or 6.2 above, all end
-           user licenses that have been validly granted by You or any
-           distributor hereunder prior to termination (excluding licenses
-           granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-   UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
-   NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
-   OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF
-   ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL,
-   INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-   LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE,
-   COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
-   LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
-   SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR
-   DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S NEGLIGENCE TO THE EXTENT
-   APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-   EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
-   EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-   The Covered Software is a .commercial item,. as that term is defined in 48
-   C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
-   that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and commercial
-   computer software documentation. as such terms are used in 48 C.F.R. 12.212
-   (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-   through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered
-   Software with only those rights set forth herein. This U.S. Government Rights
-   clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or
-   provision that addresses Government rights in computer software under this
-   License.
-
-9. MISCELLANEOUS.
-
-   This License represents the complete agreement concerning subject matter
-   hereof. If any provision of this License is held to be unenforceable, such
-   provision shall be reformed only to the extent necessary to make it
-   enforceable. This License shall be governed by the law of the jurisdiction
-   specified in a notice contained within the Original Software (except to the
-   extent applicable law, if any, provides otherwise), excluding such
-   jurisdiction's conflict-of-law provisions. Any litigation relating to this
-   License shall be subject to the jurisdiction of the courts located in the
-   jurisdiction and venue specified in a notice contained within the Original
-   Software, with the losing party responsible for costs, including, without
-   limitation, court costs and reasonable attorneys. fees and expenses. The
-   application of the United Nations Convention on Contracts for the
-   International Sale of Goods is expressly excluded. Any law or regulation
-   which provides that the language of a contract shall be construed against
-   the drafter shall not apply to this License. You agree that You alone are
-   responsible for compliance with the United States export administration
-   regulations (and the export control laws and regulation of any other
-   countries) when You use, distribute or otherwise make available any Covered
-   Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-   As between Initial Developer and the Contributors, each party is responsible
-   for claims and damages arising, directly or indirectly, out of its
-   utilization of rights under this License and You agree to work with Initial
-   Developer and Contributors to distribute such responsibility on an equitable
-   basis. Nothing herein is intended or shall be deemed to constitute any
-   admission of liability.
-
-   NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
-   LICENSE (CDDL)
-
-   The code released under the CDDL shall be governed by the laws of the State
-   of California (excluding conflict-of-law provisions). Any litigation relating
-   to this License shall be subject to the jurisdiction of the Federal Courts of
-   the Northern District of California and the state courts of the State of
-   California, with venue lying in Santa Clara County, California.
-

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/NOTICE
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/NOTICE b/eagle-assembly/src/main/lib/tomcat/NOTICE
deleted file mode 100644
index e610066..0000000
--- a/eagle-assembly/src/main/lib/tomcat/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Tomcat
-Copyright 1999-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-The Windows Installer is built with the Nullsoft
-Scriptable Install System (NSIS), which is
-open source software.  The original software and
-related information is available at
-http://nsis.sourceforge.net.
-
-Java compilation software for JSP pages is provided by Eclipse,
-which is open source software.  The original software and
-related information is available at
-http://www.eclipse.org.
-
-For the bayeux implementation
-The org.apache.cometd.bayeux API is derivative work originating at the Dojo Foundation
-* Copyright 2007-2008 Guy Molinari
-* Copyright 2007-2008 Filip Hanik
-* Copyright 2007 Dojo Foundation
-* Copyright 2007 Mort Bay Consulting Pty. Ltd.
-
-The original XML Schemas for Java EE Deployment Descriptors:
- - javaee_5.xsd
- - javaee_web_services_1_2.xsd
- - javaee_web_services_client_1_2.xsd
- - javaee_6.xsd
- - javaee_web_services_1_3.xsd
- - javaee_web_services_client_1_3.xsd
- - jsp_2_2.xsd
- - web-app_3_0.xsd
- - web-common_3_0.xsd
- - web-fragment_3_0.xsd
-may be obtained from http://java.sun.com/xml/ns/javaee/

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/RELEASE-NOTES
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/RELEASE-NOTES b/eagle-assembly/src/main/lib/tomcat/RELEASE-NOTES
deleted file mode 100644
index 8dda10b..0000000
--- a/eagle-assembly/src/main/lib/tomcat/RELEASE-NOTES
+++ /dev/null
@@ -1,230 +0,0 @@
-================================================================================
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-================================================================================
-
-
-                     Apache Tomcat Version 7.0.59
-                            Release Notes
-
-
-=========
-CONTENTS:
-=========
-
-* Dependency Changes
-* API Stability
-* JNI Based Applications
-* Bundled APIs
-* Web application reloading and static fields in shared libraries
-* Tomcat on Linux
-* Enabling SSI and CGI Support
-* Security manager URLs
-* Symlinking static resources
-* Viewing the Tomcat Change Log
-* Cryptographic software notice
-* When all else fails
-
-
-===================
-Dependency Changes:
-===================
-Tomcat 7.0 is designed to run on Java SE 6 and later.
-
-In addition, Tomcat 7.0 uses the Eclipse JDT Java compiler for
-compiling JSP pages.  This means you no longer need to have the complete
-Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment
-(JRE) is sufficient.  The Eclipse JDT Java compiler is bundled with the
-binary Tomcat distributions.  Tomcat can also be configured to use the
-compiler from the JDK to compile JSPs, or any other Java compiler supported
-by Apache Ant.
-
-
-==============
-API Stability:
-==============
-The public interfaces for the following classes are fixed and will not be
-changed at all during the remaining lifetime of the 7.x series:
-- javax/**/*
-
-The public interfaces for the following classes may be added to in order to
-resolve bugs and/or add new features. No existing interface will be removed or
-changed although it may be deprecated.
-- org/apache/catalina/*
-- org/apache/catalina/comet/*
-
-Note: As Tomcat 7 matures, the above list will be added to. The list is not
-      considered complete at this time.
-
-The remaining classes are considered part of the Tomcat internals and may change
-without notice between point releases.
-
-
-=======================
-JNI Based Applications:
-=======================
-Applications that require native libraries must ensure that the libraries have
-been loaded prior to use.  Typically, this is done with a call like:
-
-  static {
-    System.loadLibrary("path-to-library-file");
-  }
-
-in some class.  However, the application must also ensure that the library is
-not loaded more than once.  If the above code were placed in a class inside
-the web application (i.e. under /WEB-INF/classes or /WEB-INF/lib), and the
-application were reloaded, the loadLibrary() call would be attempted a second
-time.
-
-To avoid this problem, place classes that load native libraries outside of the
-web application, and ensure that the loadLibrary() call is executed only once
-during the lifetime of a particular JVM.
-
-
-=============
-Bundled APIs:
-=============
-A standard installation of Tomcat 7.0 makes all of the following APIs available
-for use by web applications (by placing them in "lib"):
-* annotations-api.jar (Annotations package)
-* catalina.jar (Tomcat Catalina implementation)
-* catalina-ant.jar (Tomcat Catalina Ant tasks)
-* catalina-ha.jar (High availability package)
-* catalina-tribes.jar (Group communication)
-* ecj-4.4.jar (Eclipse JDT Java compiler)
-* el-api.jar (EL 2.2 API)
-* jasper.jar (Jasper 2 Compiler and Runtime)
-* jasper-el.jar (Jasper 2 EL implementation)
-* jsp-api.jar (JSP 2.2 API)
-* servlet-api.jar (Servlet 3.0 API)
-* tomcat7-websocket.jar (WebSocket 1.1 implementation)
-* tomcat-api.jar (Interfaces shared by Catalina and Jasper)
-* tomcat-coyote.jar (Tomcat connectors and utility classes)
-* tomcat-dbcp.jar (package renamed database connection pool based on Commons DBCP)
-* tomcat-jdbc.jar (Tomcat's database connection pooling solution)
-* tomcat-util.jar (Various utilities)
-* websocket-api.jar (WebSocket 1.1 API)
-
-You can make additional APIs available to all of your web applications by
-putting unpacked classes into a "classes" directory (not created by default),
-or by placing them in JAR files in the "lib" directory.
-
-To override the XML parser implementation or interfaces, use the endorsed
-mechanism of the JVM. The default configuration defines JARs located in
-"endorsed" as endorsed.
-
-
-================================================================
-Web application reloading and static fields in shared libraries:
-================================================================
-Some shared libraries (many are part of the JDK) keep references to objects
-instantiated by the web application. To avoid class loading related problems
-(ClassCastExceptions, messages indicating that the classloader
-is stopped, etc.), the shared libraries state should be reinitialized.
-
-Something which might help is to avoid putting classes which would be
-referenced by a shared static field in the web application classloader,
-and putting them in the shared classloader instead (JARs should be put in the
-"lib" folder, and classes should be put in the "classes" folder).
-
-
-================
-Tomcat on Linux:
-================
-GLIBC 2.2 / Linux 2.4 users should define an environment variable:
-export LD_ASSUME_KERNEL=2.2.5
-
-Redhat Linux 9.0 users should use the following setting to avoid
-stability problems:
-export LD_ASSUME_KERNEL=2.4.1
-
-There are some Linux bugs reported against the NIO sendfile behavior, make sure you
-have a JDK that is up to date, or disable sendfile behavior in the Connector.<br/>
-6427312: (fc) FileChannel.transferTo() throws IOException "system call interrupted"<br/>
-5103988: (fc) FileChannel.transferTo should return -1 for EAGAIN instead throws IOException<br/>
-6253145: (fc) FileChannel.transferTo on Linux fails when going beyond 2GB boundary<br/>
-6470086: (fc) FileChannel.transferTo(2147483647, 1, channel) cause "Value too large" exception<br/>
-
-
-=============================
-Enabling SSI and CGI Support:
-=============================
-Because of the security risks associated with CGI and SSI available
-to web applications, these features are disabled by default.  
-
-To enable and configure CGI support, please see the cgi-howto.html page.
-
-To enable and configue SSI support, please see the ssi-howto.html page.
-
-
-======================
-Security manager URLs:
-======================
-In order to grant security permissions to JARs located inside the
-web application repository, use URLs of of the following format
-in your policy file:
-
-file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar
-
-
-============================
-Symlinking static resources:
-============================
-By default, Unix symlinks will not work when used in a web application to link
-resources located outside the web application root directory.
-
-This behavior is optional, and the "allowLinking" flag may be used to disable
-the check.
-
-
-==============================
-Viewing the Tomcat Change Log:
-==============================
-See changelog.html in this directory.
-
-
-=============================
-Cryptographic software notice
-=============================
-This distribution includes cryptographic software.  The country in
-which you currently reside may have restrictions on the import,
-possession, use, and/or re-export to another country, of
-encryption software.  BEFORE using any encryption software, please
-check your country's laws, regulations and policies concerning the
-import, possession, or use, and re-export of encryption software, to
-see if this is permitted.  See <http://www.wassenaar.org/> for more
-information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS), has classified this software as Export Commodity
-Control Number (ECCN) 5D002.C.1, which includes information security
-software using or performing cryptographic functions with asymmetric
-algorithms.  The form and manner of this Apache Software Foundation
-distribution makes it eligible for export under the License Exception
-ENC Technology Software Unrestricted (TSU) exception (see the BIS
-Export Administration Regulations, Section 740.13) for both object
-code and source code.
-
-The following provides more details on the included cryptographic
-software:
-  - Tomcat includes code designed to work with JSSE
-  - Tomcat includes code designed to work with OpenSSL
-
-
-====================
-When all else fails:
-====================
-See the FAQ
-http://tomcat.apache.org/faq/

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/RUNNING.txt
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/RUNNING.txt b/eagle-assembly/src/main/lib/tomcat/RUNNING.txt
deleted file mode 100644
index 3b2854e..0000000
--- a/eagle-assembly/src/main/lib/tomcat/RUNNING.txt
+++ /dev/null
@@ -1,478 +0,0 @@
-================================================================================
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-================================================================================
-
-            ===================================================
-            Running The Apache Tomcat 7.0 Servlet/JSP Container
-            ===================================================
-
-Apache Tomcat 7.0 requires a Java Standard Edition Runtime
-Environment (JRE) version 6 or later.
-
-=============================
-Running With JRE 6 Or Later
-=============================
-
-(1) Download and Install a Java SE Runtime Environment (JRE)
-
-(1.1) Download a Java SE Runtime Environment (JRE),
-      release version 6 or later, from
-      http://www.oracle.com/technetwork/java/javase/downloads/index.html
-
-(1.2) Install the JRE according to the instructions included with the
-      release.
-
-      You may also use a full Java Development Kit (JDK) rather than just
-      a JRE.
-
-
-(2) Download and Install Apache Tomcat
-
-(2.1) Download a binary distribution of Tomcat from:
-
-      http://tomcat.apache.org/
-
-(2.2) Unpack the binary distribution so that it resides in its own
-      directory (conventionally named "apache-tomcat-[version]").
-
-      For the purposes of the remainder of this document, the name
-      "CATALINA_HOME" is used to refer to the full pathname of that
-      directory.
-
-NOTE:  As an alternative to downloading a binary distribution, you can
-create your own from the Tomcat source code, as described in
-"BUILDING.txt".  You can either
-
-  a)  Do the full "release" build and find the created distribution in the
-      "output/release" directory and then proceed with unpacking as above, or
-
-  b)  Do a simple build and use the "output/build" directory as
-      "CATALINA_HOME".  Be warned that there are some differences between the
-      contents of the "output/build" directory and a full "release"
-      distribution.
-
-
-(3) Configure Environment Variables
-
-Tomcat is a Java application and does not use environment variables. The
-variables are used by the Tomcat startup scripts. The scripts use the variables
-to prepare the command that starts Tomcat.
-
-(3.1) Set CATALINA_HOME (required) and CATALINA_BASE (optional)
-
-The CATALINA_HOME environment variable should be set to the location of the
-root directory of the "binary" distribution of Tomcat.
-
-An example was given in (2.2) above.
-
-The Tomcat startup scripts have some logic to set this variable
-automatically if it is absent, based on the location of the startup script
-in *nix and on the current directory in Windows. That logic might not work
-in all circumstances, so setting the variable explicitly is recommended.
-
-The CATALINA_BASE environment variable specifies location of the root
-directory of the "active configuration" of Tomcat. It is optional. It
-defaults to be equal to CATALINA_HOME.
-
-Using distinct values for the CATALINA_HOME and CATALINA_BASE variables is
-recommended to simplify further upgrades and maintenance. It is documented
-in the "Multiple Tomcat Instances" section below.
-
-
-(3.2) Set JRE_HOME or JAVA_HOME (required)
-
-These variables are used to specify location of a Java Runtime
-Environment or of a Java Development Kit that is used to start Tomcat.
-
-The JRE_HOME variable is used to specify location of a JRE. The JAVA_HOME
-variable is used to specify location of a JDK.
-
-Using JAVA_HOME provides access to certain additional startup options that
-are not allowed when JRE_HOME is used.
-
-If both JRE_HOME and JAVA_HOME are specified, JRE_HOME is used.
-
-The recommended place to specify these variables is a "setenv" script. See
-below.
-
-
-(3.3) Other variables (optional)
-
-Other environment variables exist, besides the four described above.
-See the comments at the top of catalina.bat or catalina.sh scripts for
-the list and a description of each of them.
-
-One frequently used variable is CATALINA_OPTS. It allows specification of
-additional options for the java command that starts Tomcat.
-
-See the Java documentation for the options that affect the Java Runtime
-Environment.
-
-See the "System Properties" page in the Tomcat Configuration Reference for
-the system properties that are specific to Tomcat.
-
-A similar variable is JAVA_OPTS. It is used less frequently. It allows
-specification of options that are used both to start and to stop Tomcat as well
-as for other commands.
-
-Note: Do not use JAVA_OPTS to specify memory limits. You do not need much
-memory for a small process that is used to stop Tomcat. Those settings
-belong to CATALINA_OPTS.
-
-Another frequently used variable is CATALINA_PID (on *nix only). It
-specifies the location of the file where process id of the forked Tomcat
-java process will be written. This setting is optional. It will enable the
-following features:
-
- *  better protection against duplicate start attempts and
- *  allows forceful termination of Tomcat process when it does not react to
-    the standard shutdown command.
-
-
-(3.4) Using the "setenv" script (optional, recommended)
-
-Apart from CATALINA_HOME and CATALINA_BASE, all environment variables can
-be specified in the "setenv" script. The script is placed either into
-CATALINA_BASE/bin or into CATALINA_HOME/bin directory and is named
-setenv.bat (on Windows) or setenv.sh (on *nix). The file has to be
-readable.
-
-By default the setenv script file is absent. If the script file is present
-both in CATALINA_BASE and in CATALINA_HOME, the one in CATALINA_BASE is
-preferred.
-
-For example, to configure the JRE_HOME and CATALINA_PID variables you can
-create the following script file:
-
-On Windows, %CATALINA_BASE%\bin\setenv.bat:
-
-  set "JRE_HOME=%ProgramFiles%\Java\jre6"
-  exit /b 0
-
-On *nix, $CATALINA_BASE/bin/setenv.sh:
-
-  JRE_HOME=/usr/java/latest
-  CATALINA_PID="$CATALINA_BASE/tomcat.pid"
-
-
-The CATALINA_HOME and CATALINA_BASE variables cannot be configured in the
-setenv script, because they are used to locate that file.
-
-All the environment variables described here and the "setenv" script are
-used only if you use the standard scripts to launch Tomcat. For example, if
-you have installed Tomcat as a service on Windows, the service wrapper
-launches Java directly and does not use the script files.
-
-
-(4) Start Up Tomcat
-
-(4.1) Tomcat can be started by executing one of the following commands:
-
-  On Windows:
-
-      %CATALINA_HOME%\bin\startup.bat
-
-    or
-
-      %CATALINA_HOME%\bin\catalina.bat start
-
-  On *nix:
-
-      $CATALINA_HOME/bin/startup.sh
-
-    or
-
-      $CATALINA_HOME/bin/catalina.sh start
-
-(4.2) After startup, the default web applications included with Tomcat will be
-      available by visiting:
-
-      http://localhost:8080/
-
-(4.3) Further information about configuring and running Tomcat can be found in
-      the documentation included here, as well as on the Tomcat web site:
-
-      http://tomcat.apache.org/
-
-
-(5) Shut Down Tomcat
-
-(5.1) Tomcat can be shut down by executing one of the following commands:
-
-  On Windows:
-
-      %CATALINA_HOME%\bin\shutdown.bat
-
-    or
-
-      %CATALINA_HOME%\bin\catalina.bat stop
-
-  On *nix:
-
-      $CATALINA_HOME/bin/shutdown.sh
-
-    or
-
-      $CATALINA_HOME/bin/catalina.sh stop
-
-==================================================
-Advanced Configuration - Multiple Tomcat Instances
-==================================================
-
-In many circumstances, it is desirable to have a single copy of a Tomcat
-binary distribution shared among multiple users on the same server.  To make
-this possible, you can set the CATALINA_BASE environment variable to the
-directory that contains the files for your 'personal' Tomcat instance.
-
-When running with a separate CATALINA_HOME and CATALINA_BASE, the files
-and directories are split as following:
-
-In CATALINA_BASE:
-
- * bin  - Only the following files:
-
-           * setenv.sh (*nix) or setenv.bat (Windows),
-           * tomcat-juli.jar
-
-          The setenv scripts were described above. The tomcat-juli library
-          is documented in the Logging chapter in the User Guide.
-
- * conf - Server configuration files (including server.xml)
-
- * lib  - Libraries and classes, as explained below
-
- * logs - Log and output files
-
- * webapps - Automatically loaded web applications
-
- * work - Temporary working directories for web applications
-
- * temp - Directory used by the JVM for temporary files (java.io.tmpdir)
-
-
-In CATALINA_HOME:
-
- * bin  - Startup and shutdown scripts
-
-          The following files will be used only if they are absent in
-          CATALINA_BASE/bin:
-
-          setenv.sh (*nix), setenv.bat (Windows), tomcat-juli.jar
-
- * lib  - Libraries and classes, as explained below
-
- * endorsed - Libraries that override standard "Endorsed Standards"
-              libraries provided by JRE. See Classloading documentation
-              in the User Guide for details.
-
-              By default this "endorsed" directory is absent.
-
-In the default configuration the JAR libraries and classes both in
-CATALINA_BASE/lib and in CATALINA_HOME/lib will be added to the common
-classpath, but the ones in CATALINA_BASE will be added first and thus will
-be searched first.
-
-The idea is that you may leave the standard Tomcat libraries in
-CATALINA_HOME/lib and add other ones such as database drivers into
-CATALINA_BASE/lib.
-
-In general it is advised to never share libraries between web applications,
-but put them into WEB-INF/lib directories inside the applications. See
-Classloading documentation in the User Guide for details.
-
-
-It might be useful to note that the values of CATALINA_HOME and
-CATALINA_BASE can be referenced in the XML configuration files processed
-by Tomcat as ${catalina.home} and ${catalina.base} respectively.
-
-For example, the standard manager web application can be kept in
-CATALINA_HOME/webapps/manager and loaded into CATALINA_BASE by using
-the following trick:
-
- * Copy the CATALINA_HOME/webapps/manager/META-INF/context.xml
-   file as CATALINA_BASE/conf/Catalina/localhost/manager.xml
-
- * Add docBase attribute as shown below.
-
-The file will look like the following:
-
-  <?xml version="1.0" encoding="UTF-8"?>
-  <Context docBase="${catalina.home}/webapps/manager"
-    antiResourceLocking="false" privileged="true" >
-    <Valve className="org.apache.catalina.valves.RemoteAddrValve"
-         allow="127\.0\.0\.1" />
-  </Context>
-
-See Deployer chapter in User Guide and Context and Host chapters in the
-Configuration Reference for more information on contexts and web
-application deployment.
-
-
-================
-Troubleshooting
-================
-
-There are only really 2 things likely to go wrong during the stand-alone
-Tomcat install:
-
-(1) The most common hiccup is when another web server (or any process for that
-    matter) has laid claim to port 8080.  This is the default HTTP port that
-    Tomcat attempts to bind to at startup.  To change this, open the file:
-
-       $CATALINA_HOME/conf/server.xml
-
-    and search for '8080'.  Change it to a port that isn't in use, and is
-    greater than 1024, as ports less than or equal to 1024 require superuser
-    access to bind under UNIX.
-
-    Restart Tomcat and you're in business.  Be sure that you replace the "8080"
-    in the URL you're using to access Tomcat.  For example, if you change the
-    port to 1977, you would request the URL http://localhost:1977/ in your
-    browser.
-
-(2) The 'localhost' machine isn't found.  This could happen if you're behind a
-    proxy.  If that's the case, make sure the proxy configuration for your
-    browser knows that you shouldn't be going through the proxy to access the
-    "localhost".
-
-    In Firefox, this is under Tools/Preferences -> Advanced/Network ->
-    Connection -> Settings..., and in Internet Explorer it is Tools ->
-    Internet Options -> Connections -> LAN Settings.
-
-
-====================
-Optional Components
-====================
-
-The following optional components may be included with the Apache Tomcat binary
-distribution. If they are not included, you can install them separately.
-
- 1. Apache Tomcat Native library
-
- 2. Apache Commons Daemon service launcher
-
-Both of them are implemented in C language and as such have to be compiled
-into binary code. The binary code will be specific for a platform and CPU
-architecture and it must match the Java Runtime Environment executables
-that will be used to launch Tomcat.
-
-The Windows-specific binary distributions of Apache Tomcat include binary
-files for these components. On other platforms you would have to look for
-binary versions elsewhere or compile them yourself.
-
-If you are new to Tomcat, do not bother with these components to start with.
-If you do use them, do not forget to read their documentation.
-
-
-Apache Tomcat Native library
------------------------------
-
-It is a library that allows to use the "Apr" variant of HTTP and AJP
-protocol connectors in Apache Tomcat. It is built around OpenSSL and Apache
-Portable Runtime (APR) libraries. Those are the same libraries as used by
-Apache HTTPD Server project.
-
-This feature was especially important in the old days when Java performance
-was poor. It is less important nowadays, but it is still used and respected
-by many. See Tomcat documentation for more details.
-
-For further reading:
-
- - Apache Tomcat documentation
-
-    * Documentation for APR/Native library in the Tomcat User's Guide
-
-      http://tomcat.apache.org/tomcat-7.0-doc/apr.html
-
-    * Documentation for the HTTP and AJP protocol connectors in the Tomcat
-      Configuration Reference
-
-      http://tomcat.apache.org/tomcat-7.0-doc/config/http.html
-
-      http://tomcat.apache.org/tomcat-7.0-doc/config/ajp.html
-
- - Apache Tomcat Native project home
-
-      http://tomcat.apache.org/native-doc/
-
- - Other projects
-
-    * OpenSSL
-
-      http://openssl.org/
-
-    * Apache Portable Runtime
-
-      http://apr.apache.org/
-
-    * Apache HTTP Server
-
-      http://httpd.apache.org/
-
-To disable Apache Tomcat Native library:
-
- - To disable Apache Tomcat Native library when it is installed, or
- - To remove the warning that is logged during Tomcat startup when the
-   library is not installed:
-
-   Edit the "conf/server.xml" file and remove "AprLifecycleListener" from
-   it.
-
-The binary file of Apache Tomcat Native library is usually named
-
-  - "tcnative-1.dll" on Windows
-  - "libtcnative-1.so" on *nix systems
-
-
-Apache Commons Daemon
-----------------------
-
-Apache Commons Daemon project provides wrappers that can be used to
-install Apache Tomcat as a service on Windows or as a daemon on *nix
-systems.
-
-The Windows-specific implementation of Apache Commons Daemon is called
-"procrun". The *nix-specific one is called "jsvc".
-
-For further reading:
-
- - Apache Commons Daemon project
-
-      http://commons.apache.org/daemon/
-
- - Apache Tomcat documentation
-
-    * Installing Apache Tomcat
-
-      http://tomcat.apache.org/tomcat-7.0-doc/setup.html
-
-    * Windows service HOW-TO
-
-      http://tomcat.apache.org/tomcat-7.0-doc/windows-service-howto.html
-
-The binary files of Apache Commons Daemon in Apache Tomcat distributions
-for Windows are named:
-
-  - "tomcat7.exe"
-  - "tomcat7w.exe"
-
-These files are renamed copies of "prunsrv.exe" and "prunmgr.exe" from
-Apache Commons Daemon distribution. The file names have a meaning: they are
-used as the service name to register the service in Windows, as well as the
-key name to store distinct configuration for this installation of
-"procrun". If you would like to install several instances of Tomcat 7.0
-in parallel, you have to further rename those files, using the same naming
-scheme.

http://git-wip-us.apache.org/repos/asf/eagle/blob/8b3729f9/eagle-assembly/src/main/lib/tomcat/bin/bootstrap.jar
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/bootstrap.jar b/eagle-assembly/src/main/lib/tomcat/bin/bootstrap.jar
deleted file mode 100644
index 8f43864..0000000
Binary files a/eagle-assembly/src/main/lib/tomcat/bin/bootstrap.jar and /dev/null differ