http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/RegionManager.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/RegionManager.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/RegionManager.js
deleted file mode 100644
index c9e3b17..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/RegionManager.js
+++ /dev/null
@@ -1,83 +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.
-*/
-
-/*
- * 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.
- */
-
- define([
-       'backbone',
-       'communicator'
-],
-function( Backbone, Communicator ) {
-    'use strict';
-
-       var RegionManager = Backbone.Marionette.Controller.extend({
-
-               initialize: function( options ) {
-                       console.log("Initialize a Region Manager");
-
-                       /* internal region manager */
-                       this._regionManager = new 
Backbone.Marionette.RegionManager();
-
-                       /* event API */
-                       Communicator.reqres.setHandler("RM:addRegion", 
this.addRegion, this);
-                       Communicator.reqres.setHandler("RM:removeRegion", 
this.removeRegion, this);
-                       Communicator.reqres.setHandler("RM:getRegion", 
this.getRegion, this);
-               },
-
-               /* add region facade */
-               addRegion: function( regionName, regionId ) {
-                       var region = this.getRegion( regionName );
-
-                       if( region ) {
-                               console.log("REGION ALREADY CREATED TO JUST 
RETURN REF");
-                               return region;
-                       }
-
-                       return this._regionManager.addRegion( regionName, 
regionId );
-               },
-
-               /* remove region facade */
-               removeRegion: function( regionName ) {
-                       this._regionManager.removeRegion( regionName );
-               },
-
-               /* get region facade */
-               getRegion: function( regionName ) {
-                       return this._regionManager.get( regionName );
-               }
-       });
-
-       return new RegionManager();
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VAuditLogListBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VAuditLogListBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VAuditLogListBase.js
deleted file mode 100644
index 53ec922..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VAuditLogListBase.js
+++ /dev/null
@@ -1,73 +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.
- */
-
-
-define(['require',
-       'collections/BaseCollection',
-       'utils/Globals',
-       'models/VAuditLog'
-],function(require,BaseCollection,Globals,VAuditLog){
-       'use strict';
-
-       var VAuditLogListBase = BaseCollection.extend(
-       /** @lends VAuditLogListBase.prototype */
-       {
-               url: Globals.baseURL + 'audit/logs',
-
-               model : VAuditLog,
-
-               /**
-                * VAuditLogListBase initialize method
-                * @augments BaseCollection
-                * @constructs
-                */
-               initialize : function() {
-                       this.modelName = 'VAuditLog';
-                       this.modelAttrName = 'logList';
-                       this.bindErrorEvents();
-            this._changes = { };
-                       this.on('change', this._onChange);
-               },
-               /*************************
-                * Non - CRUD operations
-                *************************/
-
-               getAuditSchemaFieldsName : function(token, options){
-                       var url = Globals.baseURL  + 'audit/logs/schema/fields';
-
-                       options = _.extend({
-                               data : $.param(token),
-                               contentType : 'application/json',
-                               dataType : 'json'
-                       }, options);
-
-                       return this.constructor.nonCrudOperation.call(this, 
url, 'GET', options);
-               }
-       },{
-       /**
-       * Table Cols to be passed to Backgrid
-       * UI has to use this as base and extend this.
-       *
-       */
-
-               tableCols : {}
-       });
-
-    return VAuditLogListBase;
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VEventHistoryListBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VEventHistoryListBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VEventHistoryListBase.js
deleted file mode 100644
index 596695b..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VEventHistoryListBase.js
+++ /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.
- */
-
-
-define(['require',
-    'collections/BaseCollection',
-    'utils/Globals',
-    'models/VEventHistory'
-],function(require,BaseCollection,Globals,VEventHistory) {
-    'use strict';
-
-    var VEventHistoryListBase = BaseCollection.extend(
-        /** @lends VEventHistoryListBase.prototype */
-        {
-            url: Globals.baseURL + 'history',
-
-            model: VEventHistory,
-
-            /**
-             * VEventHistoryListBase initialize method
-             * @augments BaseCollection
-             * @constructs
-             */
-            initialize: function() {
-                this.modelName = 'VUserConfig';
-                this.modelAttrName = 'userConfigList'; //getting collection 
from ajax data no need to get data directly from collection
-                this.bindErrorEvents();
-            },
-
-            /*************************
-             * Non - CRUD operations
-             *************************/
-
-            saveEventHistory: function(postData, options) {
-                var url = Globals.baseURL + 'history';
-
-                options = _.extend({
-                    data: JSON.stringify(postData),
-                    contentType: 'application/json',
-                    dataType: 'json'
-                }, options);
-
-                return this.constructor.nonCrudOperation.call(this, url, 
'POST', options);
-            },
-            saveDashboard: function(postData, options) {
-                var url = Globals.baseURL + 'history';
-
-                options = _.extend({
-                    data: JSON.stringify(postData),
-                    contentType: 'application/json',
-                    dataType: 'json'
-                }, options);
-
-                return this.constructor.nonCrudOperation.call(this, url, 
'POST', options);
-            },
-            deleteEventHistory: function(postData, options) {
-                var url = Globals.baseURL + 'history/' + postData.id;
-
-                options = _.extend({
-                    contentType: 'application/json',
-                    dataType: 'json'
-                }, options);
-
-                return this.constructor.nonCrudOperation.call(this, url, 
'DELETE', options);
-            },
-        }, {
-            tableCols: {}
-        });
-
-    return VEventHistoryListBase;
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VGroupListBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VGroupListBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VGroupListBase.js
deleted file mode 100644
index 0c81cc3..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VGroupListBase.js
+++ /dev/null
@@ -1,82 +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.
- */
-
-
-define(['require',
-       'collections/BaseCollection',
-       'utils/Globals',
-       'models/VGroup'
-],function(require,BaseCollection,Globals,VGroup){
-       'use strict';
-
-       var VGroupListBase = BaseCollection.extend(
-       /** @lends VGroupListBase.prototype */
-       {
-               url: Globals.baseURL + 'service/logs/hosts',
-
-               model : VGroup,
-
-               /**
-                * VGroupListBase initialize method
-                * @augments BaseCollection
-                * @constructs
-                */
-               initialize : function() {
-                       this.modelName = 'VGroup';
-                       this.modelAttrName = 'groupList';
-                       this.bindErrorEvents();
-            this._changes = { };
-                       this.on('change', this._onChange);
-               },
-
-               _onChange : function(m){
-            this._changes[m.id] = m;
-               },
-
-               changed_models: function() {
-            return _.chain(this._changes).values();
-        },
-
-               /*************************
-                * Non - CRUD operations
-                *************************/
-
-               getUsersOfGroup : function(groupId, options){
-                       var url = Globals.baseURL  + 'xusers/'  + groupId + 
'/users';
-
-                       options = _.extend({
-                               //data : JSON.stringify(postData),
-                               contentType : 'application/json',
-                               dataType : 'json'
-                       }, options);
-
-                       return this.constructor.nonCrudOperation.call(this, 
url, 'GET', options);
-               },
-       },{
-       /**
-       * Table Cols to be passed to Backgrid
-       * UI has to use this as base and extend this.
-       *
-       */
-
-               tableCols : {}
-       });
-
-    return VGroupListBase;
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VLogLevelListBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VLogLevelListBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VLogLevelListBase.js
deleted file mode 100644
index 0e3de20..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VLogLevelListBase.js
+++ /dev/null
@@ -1,96 +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.
- */
-
- 
-define(['require',
-       'collections/BaseCollection',
-       'utils/Globals',
-       'models/VLogLevel'
-],function(require,BaseCollection,Globals,VLogLevel){
-       'use strict';   
-
-       var VLogLevelListBase = BaseCollection.extend(
-       /** @lends VLogLevelListBase.prototype */
-       {
-               url: Globals.baseURL + 'service/logs/levels/count',
-
-               model : VLogLevel,
-
-               /**
-                * VLogLevelListBase initialize method
-                * @augments BaseCollection
-                * @constructs
-                */
-               initialize : function() {
-                       this.modelName = 'VLogLevel';
-                       this.modelAttrName = 'vCounts';
-                       this.bindErrorEvents();
-            this._changes = { };
-                       this.on('change', this._onChange);
-               },
-               
-               _onChange : function(m){
-            this._changes[m.id] = m;
-               },
-
-               changed_models: function() {
-            return _.chain(this._changes).values();
-        },
-
-               /*************************
-                * Non - CRUD operations
-                *************************/
-
-               getUsersOfGroup : function(groupId, options){
-                       var url = Globals.baseURL  + 'xusers/'  + groupId + 
'/users';
-                       
-                       options = _.extend({
-                               //data : JSON.stringify(postData),
-                               contentType : 'application/json',
-                               dataType : 'json'
-                       }, options);
-
-                       return this.constructor.nonCrudOperation.call(this, 
url, 'GET', options);
-               },
-
-               setUsersVisibility : function(postData , options){
-                       var url = Globals.baseURL  + 
'xusers/secure/users/visibility';
-
-                       options = _.extend({
-                               data : JSON.stringify(postData),
-                               contentType : 'application/json',
-                               dataType : 'json'
-                       }, options);
-
-                       return this.constructor.nonCrudOperation.call(this, 
url, 'PUT', options);
-               },
-       },{
-       /**
-       * Table Cols to be passed to Backgrid
-       * UI has to use this as base and extend this.
-       *
-       */
-
-               tableCols : {}
-       });
-
-    return VLogLevelListBase;
-});
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VLogListBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VLogListBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VLogListBase.js
deleted file mode 100644
index 5fc4bac..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VLogListBase.js
+++ /dev/null
@@ -1,127 +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.
- */
-
- 
-define(['require',
-       'collections/BaseCollection',
-       'utils/Globals',
-       'models/VLog'
-],function(require,BaseCollection,Globals,VLog){
-       'use strict';   
-
-       var VLogListBase = BaseCollection.extend(
-       /** @lends VLogListBase.prototype */
-       {
-               url: Globals.baseURL + 'dashboard/solr/logs',
-
-               model : VLog,
-
-               /**
-                * VLogListBase initialize method
-                * @augments BaseCollection
-                * @constructs
-                */
-               initialize : function() {
-                       this.modelName = 'VLog';
-                       this.modelAttrName = 'logList';
-                       this.bindErrorEvents();
-            this._changes = { };
-                       this.on('change', this._onChange);
-               },
-               
-               _onChange : function(m){
-            this._changes[m.id] = m;
-               },
-
-               changed_models: function() {
-            return _.chain(this._changes).values();
-        },
-
-               /*************************
-                * Non - CRUD operations
-                *************************/
-
-               cancelFindRequest : function(token, options){
-                       var url = Globals.baseURL  + 
'service/logs/request/cancel';
-                       
-                       options = _.extend({
-                               data : $.param(token),
-                               contentType : 'application/json',
-                               dataType : 'json'
-                       }, options);
-
-                       return this.constructor.nonCrudOperation.call(this, 
url, 'GET', options);
-               },
-               getServiceLogFields : function(token, options){
-                       var url = Globals.baseURL  + 'service/logs/fields';
-                       
-                       options = _.extend({
-                               data : $.param(token),
-                               contentType : 'application/json',
-                               dataType : 'json'
-                       }, options);
-                       return this.constructor.nonCrudOperation.call(this, 
url, 'GET', options);
-               },
-    getServiceLogSchemaFields : function(token, options){
-      var url = Globals.baseURL  + 'service/logs/schema/fields';
-
-      options = _.extend({
-        data: $.param(token),
-        contentType: 'application/json',
-        dataType: 'json'
-      }, options);
-
-      return this.constructor.nonCrudOperation.call(this, url, 'GET', options);
-               },
-    getTruncatedLogs : function(token, options){
-                       var url = Globals.baseURL  + 'service/logs/truncated';
-                       
-                       options = _.extend({
-                               data : $.param(token),
-                               contentType : 'application/json',
-                               dataType : 'json'
-                       }, options);
-
-                       return this.constructor.nonCrudOperation.call(this, 
url, 'GET', options);
-               },
-               getServicesInfo : function(options){
-                       var url = Globals.baseURL  + 
'service/logs/serviceconfig';
-                       
-                       options = _.extend({
-                               //data : $.param(token),
-                               contentType : 'application/json',
-                               dataType : 'json'
-                       }, options);
-
-                       return this.constructor.nonCrudOperation.call(this, 
url, 'GET', options);
-               },
-       },{
-       /**
-       * Table Cols to be passed to Backgrid
-       * UI has to use this as base and extend this.
-       *
-       */
-
-               tableCols : {}
-       });
-
-    return VLogListBase;
-});
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VNameValueListBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VNameValueListBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VNameValueListBase.js
deleted file mode 100644
index 71e80d9..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VNameValueListBase.js
+++ /dev/null
@@ -1,57 +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.
- */
-
-
-define(['require',
-       'collections/BaseCollection',
-       'utils/Globals',
-       'models/VNameValue'
-],function(require,BaseCollection,Globals,VNameValue){
-       'use strict';
-
-       var VNameValueListBase = BaseCollection.extend(
-       /** @lends VNameValueListBase.prototype */
-       {
-               url: Globals.baseURL + 'service/logs/hosts',
-
-               model : VNameValue,
-
-               /**
-                * VNameValueListBase initialize method
-                * @augments BaseCollection
-                * @constructs
-                */
-               initialize : function() {
-                       this.modelName = 'VNameValue';
-                       this.modelAttrName = 'vnameValues';
-                       this.bindErrorEvents();
-               }
-
-       },{
-       /**
-       * Table Cols to be passed to Backgrid
-       * UI has to use this as base and extend this.
-       *
-       */
-
-               tableCols : {}
-       });
-
-    return VNameValueListBase;
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VNodeListBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VNodeListBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VNodeListBase.js
deleted file mode 100644
index 78949e3..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collection_bases/VNodeListBase.js
+++ /dev/null
@@ -1,74 +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.
- */
-
- 
-define(['require',
-       'collections/BaseCollection',
-       'utils/Globals',
-       'models/VNode'
-],function(require,BaseCollection,Globals,VNode){
-       'use strict';   
-
-       var VNodeListBase = BaseCollection.extend(
-       /** @lends VNodeListBase.prototype */
-       {
-               url: Globals.baseURL + 'service/logs/tree',
-
-               model : VNode,
-
-               /**
-                * VNodeListBase initialize method
-                * @augments BaseCollection
-                * @constructs
-                */
-               initialize : function() {
-                       this.modelName = 'VNode';
-                       this.modelAttrName = 'vNodeList';
-                       this.bindErrorEvents();
-               },
-               
-               /*************************
-                * Non - CRUD operations
-                *************************/
-
-               cancelFindRequest : function(token, options){
-                       var url = Globals.baseURL  + 
'service/logs/request/cancel';
-                       
-                       options = _.extend({
-                               data : $.param(token),
-                               contentType : 'application/json',
-                               dataType : 'json'
-                       }, options);
-
-                       return this.constructor.nonCrudOperation.call(this, 
url, 'GET', options);
-               },
-       },{
-       /**
-       * Table Cols to be passed to Backgrid
-       * UI has to use this as base and extend this.
-       *
-       */
-
-               tableCols : {}
-       });
-
-    return VNodeListBase;
-});
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/BaseCollection.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/BaseCollection.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/BaseCollection.js
deleted file mode 100644
index 82fe6a9..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/BaseCollection.js
+++ /dev/null
@@ -1,172 +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.
- */
-define(['require',
-       'backbone',
-       'utils/Globals',
-       'utils/Utils',
-       'backbone-pageable'
-],function(require,Backbone,Globals,Utils) {
-       'use strict';
-       
-       var BaseCollection = Backbone.PageableCollection.extend(
-       /** @lends BaseCollection.prototype */
-       {
-               /**
-                * BaseCollection's initialize function
-                * @augments Backbone.PageableCollection
-                * @constructs
-                */
-
-               initialize : function() {
-               },
-               bindErrorEvents :function(){
-                       this.bind("error", Utils.defaultErrorHandler);
-               },
-               /**
-                * state required for the PageableCollection 
-                */
-               state : {
-                       firstPage: 0,
-                       pageSize : Globals.settings.PAGE_SIZE
-               },
-               mode : 'server',
-               /**
-                * queryParams required for the PageableCollection 
-                * Server sends us this :
-                * pageSize: "2"
-                * resultSize: "2"
-                * startIndex: "0"
-                * totalCount: "15"
-                */
-               queryParams: {
-                       pageSize        : 'pageSize',
-                       sortKey         : 'sortBy',
-                       order           : 'sortType',
-                       totalRecords: 'totalCount',
-                       startIndex : function(){
-                               return this.state.currentPage * 
this.state.pageSize;
-                       }
-               },
-
-               /**
-                * override the parseState of PageableCollection for our use
-                */
-               parseState: function (resp, queryParams, state, options) {
-                       if(!this.modelAttrName){
-                               throw new Error("this.modelAttrName not defined 
for " + this);
-                       }
-                       var serverState = _.omit(resp,this.modelAttrName);
-                       var newState = _.clone(state);
-
-                       _.each(_.pairs(_.omit(queryParams, "directions")), 
function (kvp) {
-                               var k = kvp[0], v = kvp[1];
-                               var serverVal = serverState[v];
-                               if (!_.isUndefined(serverVal) && 
!_.isNull(serverVal)){
-                                       if((k == 'pageSize') || (k == 
'totalRecords')){
-                                               newState[k] = 
parseInt(serverState[v],10);
-                                       } else {
-                                               newState[k] = serverState[v];
-                                       }
-                               }
-                       });
-
-                       if (serverState.sortType) {
-                               newState.order = 
_.invert(queryParams.directions)[serverState.sortType] * 1;
-                       }
-                       
-                       var startIndex = parseInt(serverState.startIndex,10);
-                       var totalCount = parseInt(serverState.totalCount,10);
-                       var pageSize = parseInt(serverState.pageSize,10);
-
-                       newState.pageSize = pageSize ? pageSize : 
state.pageSize;
-                       newState.currentPage = startIndex === 0 ? 0 : 
Math.ceil(startIndex / newState.pageSize);
-                       //newState.totalPages = totalCount === 0 ? 0 : 
Math.ceil(totalCount / serverState.pageSize);
-
-                       return newState;
-               },
-
-               /**
-                * override the parseRecords of PageableCollection for our use
-                */
-               parseRecords : function(resp, options){
-                       if(!this.modelAttrName){
-                               throw new Error("this.modelAttrName not defined 
for " + this);
-                       }
-                       return resp[this.modelAttrName];
-               },
-               ////////////////////////////////////////////////////////////
-               // Overriding backbone.paginator page handlers methods   //
-               ////////////////////////////////////////////////////////////
-           getFirstPage: function (options) {
-               return this.getPage("first", _.extend({reset:true}, options));
-           },
-
-           getPreviousPage: function (options) {
-                       return this.getPage("prev", _.extend({reset:true}, 
options));
-           },
-
-           getNextPage: function (options) {
-                       return this.getPage("next", _.extend({reset:true}, 
options));
-           },
-
-           getLastPage: function (options) {
-                       return this.getPage("last", _.extend({reset:true}, 
options));
-           },
-           getPage : function(index, options){
-               if(index === "last"){
-                       this.queryParams.lastPage = true;
-               }else{
-                       delete this.queryParams.lastPage;
-               }
-               var fn = Backbone.PageableCollection.prototype.getPage;
-               fn.apply(this,arguments);
-
-           },
-           /////////////////////////////
-           // End overriding methods //
-           /////////////////////////////
-
-       }, {
-               //static functions
-
-               /**
-                * function to get table cols for backgrid, this function 
assumes that the 
-                * collection has a static tableCols member.
-                */
-               getTableCols : function(cols, collection){
-                       var retCols = _.map(cols, function(v, k, l){
-                               var defaults = 
collection.constructor.tableCols[k];
-                               if(! defaults){
-                                       defaults = {};
-                               }
-                               return _.extend({ 'name' : k }, defaults, v );
-                       });
-
-                       return retCols;
-               },
-               nonCrudOperation : function(url, requestMethod, options){
-                       return Backbone.sync.call(this, null, this, _.extend({
-                               url: url,
-                               type: requestMethod
-                       }, options));
-               }
-
-       });
-
-       return BaseCollection;
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/SchemaFieldList.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/SchemaFieldList.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/SchemaFieldList.js
deleted file mode 100644
index a1c2799..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/SchemaFieldList.js
+++ /dev/null
@@ -1,29 +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.
- */
-
-define(['require', 'backbone'], function(require, Backbone) {
-  'use strict';
-
-  var SchemaField = Backbone.Model.extend({
-  });
-
-  return Backbone.Collection.extend({
-    model: SchemaField,
-    url: '../static/schema_fields.json'
-  });
-});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VAuditLogList.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VAuditLogList.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VAuditLogList.js
deleted file mode 100644
index a6cfeff..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VAuditLogList.js
+++ /dev/null
@@ -1,36 +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.
- */
-
- 
-define(['require',
-       'collection_bases/VAuditLogListBase'
-],function(require,VAuditLogListBase){
-       'use strict';   
-
-       var VAuditLogList = VAuditLogListBase.extend(
-       /** @lends VUserList.prototype */
-       {
-       },{
-               // static class members
-       });
-
-    return VAuditLogList;
-});
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VEventHistoryList.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VEventHistoryList.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VEventHistoryList.js
deleted file mode 100644
index 0b13d49..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VEventHistoryList.js
+++ /dev/null
@@ -1,33 +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.
- */
-
-
-define(['require',
-       'collection_bases/VEventHistoryListBase'
-],function(require,VEventHistoryListBase) {
-    'use strict';
-
-    var VEventHistoryList = VEventHistoryListBase.extend(
-        /** @lends VEventHistoryList.prototype */
-        {}, {
-            // static class members
-        });
-
-    return VEventHistoryList;
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VGroupList.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VGroupList.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VGroupList.js
deleted file mode 100644
index ac5ab39..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VGroupList.js
+++ /dev/null
@@ -1,36 +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.
- */
-
- 
-define(['require',
-       'collection_bases/VGroupListBase'
-],function(require,VGroupListBase){
-       'use strict';   
-       
-       var VGroupList = VGroupListBase.extend(
-       /** @lends VUserList.prototype */
-       {
-       },{
-               // static class members
-       });
-
-    return VGroupList;
-});
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VLogLevelList.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VLogLevelList.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VLogLevelList.js
deleted file mode 100644
index 105dbc9..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VLogLevelList.js
+++ /dev/null
@@ -1,36 +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.
- */
-
- 
-define(['require',
-       'collection_bases/VLogLevelListBase'
-],function(require,VLogLevelListBase){
-       'use strict';   
-
-       var VLogLevelList = VLogLevelListBase.extend(
-       /** @lends VUserList.prototype */
-       {
-       },{
-               // static class members
-       });
-
-    return VLogLevelList;
-});
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VLogList.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VLogList.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VLogList.js
deleted file mode 100644
index a7517ee..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VLogList.js
+++ /dev/null
@@ -1,36 +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.
- */
-
- 
-define(['require',
-       'collection_bases/VLogListBase'
-],function(require,VLogListBase){
-       'use strict';   
-
-       var VLogList = VLogListBase.extend(
-       /** @lends VUserList.prototype */
-       {
-       },{
-               // static class members
-       });
-
-    return VLogList;
-});
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VNameValueList.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VNameValueList.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VNameValueList.js
deleted file mode 100644
index c0560a4..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VNameValueList.js
+++ /dev/null
@@ -1,36 +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.
- */
-
- 
-define(['require',
-       'collection_bases/VNameValueListBase'
-],function(require,VNameValueListBase){
-       'use strict';   
-
-       var VNameValueList = VNameValueListBase.extend(
-       /** @lends VUserList.prototype */
-       {
-       },{
-               // static class members
-       });
-
-    return VNameValueList;
-});
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VNodeList.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VNodeList.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VNodeList.js
deleted file mode 100644
index f8ed529..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/collections/VNodeList.js
+++ /dev/null
@@ -1,36 +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.
- */
-
- 
-define(['require',
-       'collection_bases/VNodeListBase'
-],function(require,VNodeListBase){
-       'use strict';   
-
-       var VNodeList = VNodeListBase.extend(
-       /** @lends VNodeList.prototype */
-       {
-       },{
-               // static class members
-       });
-
-    return VNodeList;
-});
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/communicator.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/communicator.js 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/communicator.js
deleted file mode 100644
index 8b6afd0..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/communicator.js
+++ /dev/null
@@ -1,61 +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.
-*/
-
-/*
- * 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.
- */
-
- define([
-       'backbone',
-       'backbone.marionette'
-],
-function( Backbone ) {
-    'use strict';
-
-       var Communicator = Backbone.Marionette.Controller.extend({
-               initialize: function( options ) {
-                       console.log("initialize a Communicator");
-
-                       // create a pub sub
-                       this.vent = new Backbone.Wreqr.EventAggregator();
-
-                       //create a req/res
-                       this.reqres = new Backbone.Wreqr.RequestResponse();
-
-                       // create commands
-                       this.command = new Backbone.Wreqr.Commands();
-               }
-       });
-
-       return new Communicator();
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/controllers/Controller.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/controllers/Controller.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/controllers/Controller.js
deleted file mode 100644
index 47d542e..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/controllers/Controller.js
+++ /dev/null
@@ -1,240 +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.
-*/
-
-/**
- * @file Controlling all the routes in the application through router
- */
-define(['require',
-    'backbone',
-    'models/VAppState',
-    'App','utils/Globals',
-    'backbone.marionette'
-],function(require,Backbone,AppStateMod,App,XAGlobals) {
-    'use strict';
-    
-    var AppRouting  = {};
-
-
-    /**
-     * Mention routes and its route handler function for overall application
-     */
-    AppRouting.Router = Backbone.Marionette.AppRouter.extend({
-
-        appRoutes: {
-            ""                                 : "dashboardAction",
-            "!/dashboard"       : "dashboardAction",
-            "!/logout"                 : "logoutAction"
-        },
-
-       /**
-        *  Override execute for Gloabal Loader it is an syn method 
-        *  which is resolved in commonControllerRoutesAction
-        *  But for now not required
-        */
-    /*    execute: function(callback, args) {
-            this.appLoaderShow();
-            try {
-                if (callback) callback.apply(this, args);
-            } catch (e) {
-                FSUtils.hideAppLoader();
-            }
-        },
-        appLoaderShow: function() {
-            var that = this
-            App.appDeff = $.Deferred(),
-                FSUtils.showAppLoader();
-            $.when(App.appDeff).done(function() {
-                FSUtils.hideAppLoader();
-            });
-
-        }*/
-
-    });
-
-    /**
-     * This is the controller object for every routes present in the 
application
-     */
-    AppRouting.Controller = Backbone.Marionette.Controller.extend({
-        /** @lends AppRouting.Controller */
-
-        /** intialize a new Controller */
-        initialize: function(){
-            this.showRegions();
-            //this.FSAppTabs = new FSAppTabs();
-            this.globalVent = new Backbone.Wreqr.EventAggregator();
-        },
-
-        /** setting up user profile values to be used overall in the 
application */
-        setGlobalValues: function(){
-            require(['models/VUser'], function(VUser){
-                // get logged in user's profile
-                var userMod = new VUser();
-                userMod.getUserProfile({
-                    success: function(data, textStatus, jqXHR){
-                        userMod.trigger('sync');
-                        AppStateMod.set('userProfile', data);
-                    },
-                    error: function(jqXHR, textStatus, errorThrown){
-                        userMod.trigger('error', userMod, jqXHR);
-                    }
-                });
-            });
-        },
-
-        /** show the Top bar and side bar */
-        showRegions: function(){
-            var that = this;
-            require(["moment", "utils/Utils", 
"jstimezonedetect","moment-tz","utils/ViewUtils","WorldMapGenerator"],
-                function(moment, Utils, 
jstz,momentTz,ViewUtils,WorldMapGenerator) {
-                    var storeTimezone = 
Utils.localStorage.checkLocalStorage('timezone');
-                    var systemZone = jstz.determine().name();
-                    if (!storeTimezone.value || storeTimezone.value == 
"undefined") {
-                       
-                        Utils.localStorage.setLocalStorage('timezone', 
systemZone);
-                        storeTimezone.value = systemZone;
-                    }
-                    if(storeTimezone.value.split(',').length>1){
-                      var timezone =  storeTimezone.value.split(',')[0];
-                    }else{
-                      var timezone =  systemZone;
-                    }
-                    moment.tz.setDefault(timezone);
-                    ViewUtils.setdefaultParams(); // setting default params 
after moment timezone is set
-                    require(['views/common/Header'],
-                        function(HeaderView) {
-                            App.rHeader.show(new HeaderView({
-                                globalVent: that.globalVent
-                        }));
-                    });
-            });
-            
-        },
-
-        /** function which trigger the TopBarView to show the page content in 
the respective tab */
-        commonControllerRoutesAction: function(View, viewObj, viewOptions){
-//            var ErrorLayoutView = require('views/common/ErrorLayoutView'),
-//                error403tmpl = require('hbs!tmpl/site/error403');
-//
-//            if(!this.isAccessGranted(viewOptions)){
-//                View = ErrorLayoutView;
-//                viewObj = App.getView(FSGlobals.AppTabs.ERROR.value);
-//                viewOptions = {errorTmpl: error403tmpl};
-//            }
-//
-//            if(viewObj === null) {
-//
-//                viewObj = new View(_.extend({}, viewOptions));
-//
-//                App.saveView(viewObj);
-//            }
-//            //Resolving deff for global Loader
-//           /* if(App.appDeff){
-//                App.appDeff.resolve();
-//            }*/
-//            this.FSAppTabs.showView(viewObj);
-        },
-
-        /**
-         * check whether logged-in user has access to that module
-         * @param  {Object}  viewOptions - options for the view to be shown
-         * @return {Boolean} has access or not
-         */
-        isAccessGranted: function(viewOptions){
-            var str = Backbone.history.fragment.replace(/!\//g, "");
-            if (viewOptions && viewOptions._multipleTabs) {
-                str = str && str.split("/")[0];
-            }
-            var hasAccess = false;
-            if (str === "") {
-                hasAccess = true;
-            } else {
-                var isCheckAccess = this.checkAccess(str) || 
this.isSpecialMenuAccess(str);
-                hasAccess = !!isCheckAccess;
-            }
-            return hasAccess;
-        },
-
-        /**
-         * check whether logged-in user has access to that module from the 
list received from server
-         * @param  {String} routeName - name of the menu item clicked
-         * @return {Object} return object match found or else return undefined 
value
-         */
-        checkAccess: function(routeName){
-            return App.menuListCol.findWhere({
-                menuCode: routeName.toUpperCase()
-            });
-        },
-
-        /**
-         * whether route has been given special permission
-         * @param  {String} routeName - name of the menu item clicked
-         * @return {Boolean} - route has been given special permission or not
-         */
-        isSpecialMenuAccess: function(routeName){
-            return FSLinks.isSpecialMenuAccess(routeName);
-        },
-
-        /*********************
-         * Dashboard Actions *
-         *********************/
-        dashboardAction: function() {
-            var that = this;
-            AppStateMod.set({'currentTab': XAGlobals.AppTabs.MAINVIEW.value });
-            require(['views/dashboard/MainLayoutView'],
-                function(view){
-               App.rContent.show(new view({
-                    globalVent:that.globalVent
-                }));
-
-            });
-        },
-        
-        logoutAction: function() {
-            if (sessionStorage) {
-                sessionStorage.clear();
-            }
-            window.location.replace("logout.html");
-        },
-
-        databaseAction: function(){
-            var that = this;
-            AppStateMod.set({'currentTab': FSGlobals.AppTabs.DATABASES.value 
});
-
-//            require(['views/infraConfig/DatabaseConfigLayoutView',
-//                'collections/VDatabaseList'],
-//                function(view, VDatabaseList){
-//
-//                var viewObj = App.getView(FSGlobals.AppTabs.DATABASES.value);
-//                var databaseListCol = new VDatabaseList();
-//                var viewOptions = {
-//                    collection: databaseListCol
-//                };
-//
-//                that.commonControllerRoutesAction(view, viewObj, 
viewOptions);
-//
-//                databaseListCol.fetch({reset: true });
-//            });
-        }
-
-    });
-
-    return {
-               Controller: AppRouting.Controller,
-               Router: AppRouting.Router
-       };
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VAuditLogBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VAuditLogBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VAuditLogBase.js
deleted file mode 100644
index 8513ed2..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VAuditLogBase.js
+++ /dev/null
@@ -1,61 +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.
- */
-
- 
-define(['require',
-       'models/BaseModel',
-       'utils/Globals'
-],function(require,BaseModel,Globals){
-       'use strict';   
-
-       var VAuditLogBase = BaseModel.extend(
-       /** @lends VAuditLogBase.prototype */
-       {
-               urlRoot: Globals.baseURL + '',
-               
-               defaults: {},
-               
-               idAttribute: 'id',
-
-               /**
-                * VAuditLogBase initialize method
-                * @augments BaseModel
-                * @constructs
-                */
-               initialize: function() {
-                       this.modelName = 'VAuditLogBase';
-               },
-               auditLiveFeed : function(token, options){
-                       var url = Globals.baseURL  + 'audit/logs/live/count';
-                       
-                       options = _.extend({
-                               data : $.param(token),
-                               contentType : 'application/json',
-                               dataType : 'json'
-                       }, options);
-
-                       return this.constructor.nonCrudOperation.call(this, 
url, 'GET', options);
-               }
-       }, {
-               // static class members
-       });
-
-    return VAuditLogBase;
-       
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VCommonModelBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VCommonModelBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VCommonModelBase.js
deleted file mode 100644
index bbc3e36..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VCommonModelBase.js
+++ /dev/null
@@ -1,51 +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.
- */
-
- 
-define(['require',
-       'models/BaseModel',
-       'utils/Globals'
-],function(require,BaseModel,Globals){
-       'use strict';   
-
-       var VCommonModelBase = BaseModel.extend(
-       /** @lends VCommonModelBase.prototype */
-       {
-               urlRoot: Globals.baseURL + 'service/logs/tree',
-               
-               defaults: {},
-               
-               idAttribute: 'id',
-
-               /**
-                * VCommonModelBase initialize method
-                * @augments BaseModel
-                * @constructs
-                */
-               initialize: function() {
-                       this.modelName = 'VCommonModelBase';
-               }
-
-       }, {
-               // static class members
-       });
-
-    return VCommonModelBase;
-       
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VEventHistoryBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VEventHistoryBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VEventHistoryBase.js
deleted file mode 100644
index a15cdbd..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VEventHistoryBase.js
+++ /dev/null
@@ -1,51 +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.
- */
-
-
-define(['require',
-    'models/BaseModel',
-    'utils/Globals'
-],function(require,BaseModel,Globals){
-    'use strict';
-
-    var VEventHistory = BaseModel.extend(
-        /** @lends VEventHistory.prototype */
-        {
-            urlRoot: Globals.baseURL + 'service/logs/aggregated',
-
-            defaults: {},
-
-            idAttribute: 'id',
-
-            /**
-             * VEventHistory initialize method
-             * @augments BaseModel
-             * @constructs
-             */
-            initialize: function() {
-                this.modelName = 'VGraphInfoBase';
-            }
-
-        }, {
-            // static class members
-        });
-
-    return VEventHistory;
-
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VGraphInfoBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VGraphInfoBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VGraphInfoBase.js
deleted file mode 100644
index 46e826c..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VGraphInfoBase.js
+++ /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.
- */
-
- 
-define(['require',
-       'models/BaseModel',
-       'utils/Globals'
-],function(require,BaseModel,Globals){
-       'use strict';   
-
-       var VLogBase = BaseModel.extend(
-       /** @lends VLogBase.prototype */
-       {
-               urlRoot: Globals.baseURL + 'service/logs/aggregated',
-               
-               defaults: {},
-               
-               idAttribute: 'id',
-
-               /**
-                * VLogBase initialize method
-                * @augments BaseModel
-                * @constructs
-                */
-               initialize: function() {
-                       this.modelName = 'VGraphInfoBase';
-               },
-               getCriticalLogsInfo : function(params,options){
-                       var url = Globals.baseURL  + 
'dashboard/getCricticalMessageSummary';
-                       
-                       options = _.extend({
-                               data : $.param(params),
-                               contentType : 'application/json',
-                               dataType : 'json'
-                       }, options);
-
-                       return this.constructor.nonCrudOperation.call(this, 
url, 'GET', options);
-               },
-
-       }, {
-               // static class members
-       });
-
-    return VLogBase;
-       
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VGroupBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VGroupBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VGroupBase.js
deleted file mode 100644
index cd48797..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VGroupBase.js
+++ /dev/null
@@ -1,51 +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.
- */
-
- 
-define(['require',
-       'models/BaseModel',
-       'utils/Globals'
-],function(require,BaseModel,Globals){
-       'use strict';   
-
-       var VGroupBase = BaseModel.extend(
-       /** @lends VGroupBase.prototype */
-       {
-               urlRoot: Globals.baseURL + '',
-               
-               defaults: {},
-               
-               idAttribute: 'id',
-
-               /**
-                * VGroupBase initialize method
-                * @augments BaseModel
-                * @constructs
-                */
-               initialize: function() {
-                       this.modelName = 'VGroupBase';
-               }
-
-       }, {
-               // static class members
-       });
-
-    return VGroupBase;
-       
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VLogBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VLogBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VLogBase.js
deleted file mode 100644
index 577aff0..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VLogBase.js
+++ /dev/null
@@ -1,51 +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.
- */
-
- 
-define(['require',
-       'models/BaseModel',
-       'utils/Globals'
-],function(require,BaseModel,Globals){
-       'use strict';   
-
-       var VLogBase = BaseModel.extend(
-       /** @lends VLogBase.prototype */
-       {
-               urlRoot: Globals.baseURL + 'xusers/secure/users',
-               
-               defaults: {},
-               
-               idAttribute: 'id',
-
-               /**
-                * VLogBase initialize method
-                * @augments BaseModel
-                * @constructs
-                */
-               initialize: function() {
-                       this.modelName = 'VLogBase';
-               }
-
-       }, {
-               // static class members
-       });
-
-    return VLogBase;
-       
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VLogLevelBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VLogLevelBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VLogLevelBase.js
deleted file mode 100644
index daaaa32..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VLogLevelBase.js
+++ /dev/null
@@ -1,51 +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.
- */
-
- 
-define(['require',
-       'models/BaseModel',
-       'utils/Globals'
-],function(require,BaseModel,Globals){
-       'use strict';   
-
-       var VLogLevelBase = BaseModel.extend(
-       /** @lends VLogLevelBase.prototype */
-       {
-               urlRoot: Globals.baseURL + 'service/logs/levels/count',
-               
-               defaults: {},
-               
-               idAttribute: 'id',
-
-               /**
-                * VLogLevelBase initialize method
-                * @augments BaseModel
-                * @constructs
-                */
-               initialize: function() {
-                       this.modelName = 'VLogLevelBase';
-               }
-
-       }, {
-               // static class members
-       });
-
-    return VLogLevelBase;
-       
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VNameValueBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VNameValueBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VNameValueBase.js
deleted file mode 100644
index 0ae67b1..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VNameValueBase.js
+++ /dev/null
@@ -1,51 +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.
- */
-
- 
-define(['require',
-       'models/BaseModel',
-       'utils/Globals'
-],function(require,BaseModel,Globals){
-       'use strict';   
-
-       var VNameValueBase = BaseModel.extend(
-       /** @lends VNameValueBase.prototype */
-       {
-               urlRoot: Globals.baseURL + '',
-               
-               defaults: {},
-               
-               idAttribute: 'id',
-
-               /**
-                * VNameValueBase initialize method
-                * @augments BaseModel
-                * @constructs
-                */
-               initialize: function() {
-                       this.modelName = 'VNameValueBase';
-               }
-
-       }, {
-               // static class members
-       });
-
-    return VNameValueBase;
-       
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VNodeBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VNodeBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VNodeBase.js
deleted file mode 100644
index 50774e5..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VNodeBase.js
+++ /dev/null
@@ -1,51 +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.
- */
-
- 
-define(['require',
-       'models/BaseModel',
-       'utils/Globals'
-],function(require,BaseModel,Globals){
-       'use strict';   
-
-       var VNodeBase = BaseModel.extend(
-       /** @lends VNodeBase.prototype */
-       {
-               urlRoot: Globals.baseURL + 'xusers/secure/users',
-               
-               defaults: {},
-               
-               idAttribute: 'id',
-
-               /**
-                * VNodeBase initialize method
-                * @augments BaseModel
-                * @constructs
-                */
-               initialize: function() {
-                       this.modelName = 'VNodeBase';
-               }
-
-       }, {
-               // static class members
-       });
-
-    return VNodeBase;
-       
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VUserFilterBase.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VUserFilterBase.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VUserFilterBase.js
deleted file mode 100644
index a672a94..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/model_bases/VUserFilterBase.js
+++ /dev/null
@@ -1,51 +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.
- */
-
-
-define(['require',
-       'models/BaseModel',
-       'utils/Globals'
-],function(require,BaseModel,Globals){
-       'use strict';
-
-       var VUserFilterBase = BaseModel.extend(
-       /** @lends VUserFilterBase.prototype */
-       {
-               urlRoot: Globals.baseURL + 'history/filters',
-
-               defaults: {},
-
-               idAttribute: 'id',
-
-               /**
-                * VUserFilterBase initialize method
-                * @augments BaseModel
-                * @constructs
-                */
-               initialize: function() {
-                       this.modelName = 'VUserFilterBase';
-               }
-
-       }, {
-               // static class members
-       });
-
-    return VUserFilterBase;
-
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/BaseModel.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/BaseModel.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/BaseModel.js
deleted file mode 100644
index e20584a..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/BaseModel.js
+++ /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.
- */
-
- 
-/**
- *
- * Base Model file from which all models will extend/derive.
- */
-
-define(['require',
-       'backbone',
-       'utils/Utils'
-],function(require,Backbone,Utils){
-       'use strict';
-       
-       var BaseModel = Backbone.Model.extend(
-       /** @lends BaseModel.prototype */
-       {
-               /**
-                * BaseModel's initialize function
-                * @augments Backbone.Model
-                * @constructs
-                */
-               initialize : function() {
-                       
-               },
-               bindErrorEvents :function(){
-                       this.bind("error", Utils.defaultErrorHandler);
-               },
-               /**
-                * toString for a model. Every model should implement this 
function.
-                */
-               toString : function() {
-                       throw new Error('ERROR: toString() not defined for ' + 
this.modelName);
-               },
-
-               /**
-                * Silent'ly set the attributes. ( do not trigger events )
-                */
-               silent_set: function(attrs) {
-                       return this.set(attrs, {
-                               silent: true
-                       });
-               },
-               parse: function(response){
-                       for(var key in this.modelRel)
-                               {
-                                       var embeddedClass = this.modelRel[key];
-                                       var embeddedData = response[key];
-                                       response[key] = new 
embeddedClass(embeddedData);
-                               }
-                               return response;
-               }
-
-       }, {
-               nestCollection : function(model, attributeName, 
nestedCollection) {
-                       //setup nested references
-                       for (var i = 0; i < nestedCollection.length; i++) {
-                               model.attributes[attributeName][i] = 
nestedCollection.at(i).attributes;
-                       }
-                       //create empty arrays if none
-
-                       nestedCollection.bind('add', function (initiative) {
-                               if (!model.get(attributeName)) {
-                                       model.attributes[attributeName] = [];
-                               }
-                               
model.get(attributeName).push(initiative.attributes);
-                       });
-
-                       nestedCollection.bind('remove', function (initiative) {
-                               var updateObj = {};
-                               updateObj[attributeName] = 
_.without(model.get(attributeName), initiative.attributes);
-                               model.set(updateObj);
-                       });
-
-                       model.parse = function(response) {
-                               if (response && response[attributeName]) {
-                                       
model[attributeName].reset(response[attributeName]);
-                               }
-                               return 
Backbone.Model.prototype.parse.call(model, response);
-                       }
-                       return nestedCollection;
-               },
-
-               nonCrudOperation : function(url, requestMethod, options){
-                       return Backbone.sync.call(this, null, this, _.extend({
-                               url: url,
-                               type: requestMethod
-                       }, options));
-               }
-       });
-
-       return BaseModel;
-});

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VAppState.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VAppState.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VAppState.js
deleted file mode 100644
index ab73ab7..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VAppState.js
+++ /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.
- */
-
- /*
- * The singleton class for App State model to be used globally
- */
-
-define(['require',
-       'models/BaseModel',
-       'utils/Globals'
-],function(require,BaseModel,Globals) {
-       'use strict';
-
-       var VAppState = BaseModel.extend({
-               defaults : {
-                       currentTab : Globals.AppTabs.DASHBOARD.value
-               },
-               initialize : function() {
-                       this.modelName = 'VAppState';
-               //      this.listenTo(this, 'change:currentAccount', 
this.accountChanged);
-               }
-               
-       });
-
-       // Make this a singleton!!
-       return new VAppState();
-});
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VAuditLog.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VAuditLog.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VAuditLog.js
deleted file mode 100644
index b9e3820..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VAuditLog.js
+++ /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.
- */
-
- 
-define(['require',
-       'model_bases/VAuditLogBase',
-       'utils/Enums'
-],function(require,VAuditLogBase,Enums){
-       'use strict';   
-
-       var VAuditLog = VAuditLogBase.extend(
-       /** @lends VAuditLog.prototype */
-       {
-               /**
-                * VAuditLogBase initialize method
-                * @augments FSBaseModel
-                * @constructs
-                */
-               initialize: function() {
-                       this.modelName = 'VAuditLog';
-                       this.bindErrorEvents();
-               },
-       }, {
-               // static class members
-       });
-
-    return VAuditLog;
-       
-});
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VCommonModel.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VCommonModel.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VCommonModel.js
deleted file mode 100644
index b25bfc8..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VCommonModel.js
+++ /dev/null
@@ -1,48 +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.
- */
-
- 
-define(['require',
-       'model_bases/VCommonModelBase',
-       'utils/Enums'
-],function(require,VCommonModelBase,Enums){
-       'use strict';   
-
-       var VCommonModel = VCommonModelBase.extend(
-       /** @lends VCommonModel.prototype */
-       {
-               /**
-                * VCommonModelBase initialize method
-                * @augments FSBaseModel
-                * @constructs
-                */
-               initialize: function() {
-                       this.modelName = 'VCommonModel';
-                       this.bindErrorEvents();
-               }
-       
-       }, {
-               // static class members
-       });
-
-    return VCommonModel;
-       
-});
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VEventHistory.js
----------------------------------------------------------------------
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VEventHistory.js
 
b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VEventHistory.js
deleted file mode 100644
index 3d2e89d..0000000
--- 
a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/scripts/models/VEventHistory.js
+++ /dev/null
@@ -1,48 +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.
- */
-
-
-define(['require',
-    'model_bases/VEventHistoryBase'
-],function(require,VEventHistoryBase){
-    'use strict';
-
-    var VEventHistory = VEventHistoryBase.extend(
-        /** @lends VEventHistory.prototype */
-        {
-            /**
-             * VEventHistory initialize method
-             * @augments FSBaseModel
-             * @constructs
-             */
-            initialize: function() {
-                this.modelName = 'VEventHistory';
-                this.bindErrorEvents();
-            },
-            toString: function(){
-                return this.modelName;
-            }
-
-        }, {
-            // static class members
-        });
-
-    return VEventHistory;
-
-});

Reply via email to