incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [03/19] Moving blur console to the root of the project.
Date Tue, 17 Jun 2014 20:24:11 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java b/contrib/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java
deleted file mode 100644
index 8e5a8b8..0000000
--- a/contrib/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package org.apache.blur.console.util;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.blur.console.model.ResultRow;
-import org.apache.blur.thirdparty.thrift_0_9_0.TException;
-import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.blur.thrift.generated.BlurException;
-import org.apache.blur.thrift.generated.BlurQuery;
-import org.apache.blur.thrift.generated.BlurResult;
-import org.apache.blur.thrift.generated.BlurResults;
-import org.apache.blur.thrift.generated.Column;
-import org.apache.blur.thrift.generated.FetchRecordResult;
-import org.apache.blur.thrift.generated.FetchResult;
-import org.apache.blur.thrift.generated.FetchRowResult;
-import org.apache.blur.thrift.generated.Query;
-import org.apache.blur.thrift.generated.Record;
-import org.apache.blur.thrift.generated.Row;
-import org.apache.blur.thrift.generated.ScoreType;
-import org.apache.blur.thrift.generated.Selector;
-import org.apache.blur.user.UserContext;
-import org.apache.commons.lang.StringUtils;
-
-/**
- * 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.
- */
-
-public class SearchUtil {
-	private static final String TOTAL_KEY = "total";
-	private static final String DATA_KEY = "results";
-	private static final String FAMILY_KEY = "families";
-	
-	private static final String ROW_ROW_OPTION = "rowrow";
-	private static final String RECORD_RECORD_OPTION = "recordrecord";
-	
-	public static Map<String, Object> search(Map<String, String[]> params, String remoteHost) throws IOException, BlurException, TException {
-		String table = params.get("table")[0];
-		String query = params.get("query")[0];
-		String rowQuery = params.get("rowRecordOption")[0];
-		String start = params.get("start")[0];
-		String fetch = params.get("fetch")[0];
-		String[] families = params.get("families[]");
-		
-		if (query.indexOf("rowid:") >= 0) {
-			return fetchRow(table, query, families, remoteHost);
-		}
-		
-		if (families == null || families.length == 0) {
-			return fullTextSearch(table, query, remoteHost);
-		}
-		
-		return searchAndFetch(table, query, rowQuery, start, fetch, families, remoteHost);
-	}
-	
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private static Map<String, Object> searchAndFetch(String table, String query, String rowQuery, String start, String fetch, String[] families, String remoteHost) throws IOException, BlurException, TException {
-		try {
-			Iface client = Config.getClient(remoteHost);
-			
-			boolean recordsOnly = RECORD_RECORD_OPTION.equalsIgnoreCase(rowQuery);
-			
-			BlurQuery blurQuery = new BlurQuery();
-			
-			Query q = new Query(query, ROW_ROW_OPTION.equalsIgnoreCase(rowQuery), ScoreType.SUPER, null, null);
-			blurQuery.setQuery(q);
-			blurQuery.setStart(Long.parseLong(start));
-			blurQuery.setFetch(Integer.parseInt(fetch));
-			
-			Selector s = new Selector();
-			s.setRecordOnly(recordsOnly);
-			s.setColumnFamiliesToFetch(new HashSet<String>(Arrays.asList(families)));
-			blurQuery.setSelector(s);
-			
-			BlurResults blurResults = client.query(table, blurQuery);
-			
-			Map<String, Object> results = new HashMap<String, Object>();
-			results.put(TOTAL_KEY, blurResults.getTotalResults());
-			
-			Map<String, List> rows = new HashMap<String, List>();
-			for (BlurResult result : blurResults.getResults()) {
-				FetchResult fetchResult = result.getFetchResult();
-				
-				if (recordsOnly) {
-					// Record Result
-					FetchRecordResult recordResult = fetchResult.getRecordResult();
-					Record record = recordResult.getRecord();
-					
-					String family = record.getFamily();
-					
-					List<Map<String, String>> fam = (List<Map<String, String>>) getFam(family, rows, recordsOnly);
-					fam.add(buildRow(record.getColumns(), record.getRecordId()));
-				} else {
-					// Row Result
-					FetchRowResult rowResult = fetchResult.getRowResult();
-					Row row = rowResult.getRow();
-					if (row.getRecords() == null || row.getRecords().size() == 0) {
-						for(String family : families) {
-							List<ResultRow> fam = (List<ResultRow>) getFam(family, rows, recordsOnly);
-							getRow(row.getId(), fam);
-						}
-					} else {
-						for (Record record : row.getRecords()) {
-							String family = record.getFamily();
-							
-							List<ResultRow> fam = (List<ResultRow>) getFam(family, rows, recordsOnly);
-							ResultRow rowData = getRow(row.getId(), fam);
-							rowData.getRecords().add(buildRow(record.getColumns(), record.getRecordId()));
-						}
-					}
-				}
-			}
-			
-			results.put(FAMILY_KEY, new HashSet<String>(Arrays.asList(families)));
-			results.put(DATA_KEY, rows);
-			
-			return results;
-		} finally {
-			UserContext.reset();
-		}
-	}
-	
-	private static Map<String, Object> fullTextSearch(String table, String query, String remoteHost) throws IOException, BlurException, TException {
-		try {
-			Iface client = Config.getClient(remoteHost);
-			
-			BlurQuery blurQuery = new BlurQuery();
-			
-			Query q = new Query(query, true, ScoreType.SUPER, null, null);
-			blurQuery.setQuery(q);
-			BlurResults blurResults = client.query(table, blurQuery);
-			
-			Map<String, Object> results = new HashMap<String, Object>();
-			results.put(TOTAL_KEY, blurResults.getTotalResults());
-			return results;
-		} finally {
-			UserContext.reset();
-		}
-	}
-	
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private static Map<String, Object> fetchRow(String table, String query, String[] families, String remoteHost) throws IOException, BlurException, TException {
-		try {
-			Iface client = Config.getClient(remoteHost);
-			
-			Selector selector = new Selector();
-			String rowid = StringUtils.remove(query, "rowid:");
-			selector.setRowId(rowid);
-			selector.setColumnFamiliesToFetch(new HashSet<String>(Arrays.asList(families)));
-			
-			FetchResult fetchRow = client.fetchRow(table, selector);
-			
-			Map<String, Object> results = new HashMap<String, Object>();
-			results.put(TOTAL_KEY, fetchRow.getRowResult().getRow() == null ? 0 : 1);
-			
-			Map<String, List> rows = new HashMap<String, List>();
-			Row row = fetchRow.getRowResult().getRow();
-			if (row != null && row.getRecords() != null) {
-				for (Record record : row.getRecords()) {
-					String family = record.getFamily();
-					
-					List<ResultRow> fam = (List<ResultRow>) getFam(family, rows, false);
-					ResultRow rowData = getRow(row.getId(), fam);
-					rowData.getRecords().add(buildRow(record.getColumns(), record.getRecordId()));
-				}
-			}
-			results.put(DATA_KEY, rows);
-			results.put(FAMILY_KEY, new HashSet<String>(Arrays.asList(families)));
-			
-			return results;
-		} finally {
-			UserContext.reset();
-		}
-	}
-	
-	private static Map<String, String> buildRow(List<Column> columns, String recordid) {
-		Map<String, String> map = new TreeMap<String, String>();
-		map.put("recordid", recordid);
-		
-		for (Column column : columns) {
-			map.put(column.getName(), column.getValue());
-		}
-		
-		return map;
-	}
-	
-	@SuppressWarnings("rawtypes")
-	private static List getFam(String fam, Map<String, List> results, boolean recordOnly) {
-		List famResults = results.get(fam);
-		
-		if (famResults == null) {
-			if (recordOnly) {
-				famResults = new ArrayList<Map<String, String>>();				
-			} else {
-				famResults = new ArrayList<ResultRow>();
-			}
-			results.put(fam, famResults);
-		}
-		
-		return famResults;
-	}
-	
-	private static ResultRow getRow(String rowid, List<ResultRow> rows) {
-		ResultRow row = null;
-		for(ResultRow r : rows) {
-			if (r.getRowid().equals(rowid)) {
-				row = r;
-				break;
-			}
-		}
-		
-		if (row == null) {
-			row = new ResultRow(rowid);
-			rows.add(row);
-		}
-		
-		return row;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java b/contrib/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
deleted file mode 100644
index 4b12308..0000000
--- a/contrib/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.blur.console.util;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.blur.thirdparty.thrift_0_9_0.TException;
-import org.apache.blur.thrift.BlurClient;
-import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.blur.thrift.generated.BlurException;
-import org.apache.blur.thrift.generated.ColumnDefinition;
-import org.apache.blur.thrift.generated.Schema;
-import org.apache.blur.thrift.generated.TableDescriptor;
-import org.apache.blur.thrift.generated.TableStats;
-
-public class TableUtil {
-	
-	@SuppressWarnings("rawtypes")
-	public static Map<String, List> getTableSummaries() throws IOException, BlurException, TException {
-		Iface client = BlurClient.getClient(Config.getConnectionString());
-		
-		List<Map<String, Object>> summaries = new ArrayList<Map<String, Object>>();
-		
-		List<String> clusters = client.shardClusterList();
-		
-		for (String cluster : clusters) {
-			List<String> tables = client.tableListByCluster(cluster);
-			for (String table : tables) {
-				Map<String, Object> tableInfo = new HashMap<String, Object>();
-				TableDescriptor descriptor = client.describe(table);
-				
-				tableInfo.put("cluster", cluster);
-				tableInfo.put("name", table);
-				tableInfo.put("enabled", descriptor.isEnabled());
-				
-				if (descriptor.isEnabled()) {
-					TableStats stats = client.tableStats(table);
-					tableInfo.put("rows", stats.getRowCount());
-					tableInfo.put("records", stats.getRecordCount());
-					
-					Schema schema = client.schema(table);
-					tableInfo.put("families", new ArrayList<String>(schema.getFamilies().keySet()));
-				} else {
-					tableInfo.put("rows", "?");
-					tableInfo.put("records", "?");
-					tableInfo.put("families", new ArrayList<String>());
-				}
-				
-				summaries.add(tableInfo);
-			}
-		}
-		
-		Map<String, List> data = new HashMap<String, List>();
-		data.put("tables", summaries);
-		data.put("clusters", clusters);
-		
-		return data;
-	}
-	
-	public static Map<String, Map<String, Map<String, Object>>> getSchema(String table) throws IOException, BlurException, TException {
-		Iface client = BlurClient.getClient(Config.getConnectionString());
-		
-		Schema schema = client.schema(table);
-		
-		Map<String, Map<String, Map<String, Object>>> schemaInfo = new TreeMap<String, Map<String,Map<String, Object>>>();
-		for (Map.Entry<String, Map<String, ColumnDefinition>> famEntry : schema.getFamilies().entrySet()) {
-			Map<String, Map<String, Object>> columns = new TreeMap<String, Map<String, Object>>();
-			for(Map.Entry<String, ColumnDefinition> colEntry : famEntry.getValue().entrySet()) {
-				Map<String, Object> info = new HashMap<String, Object>();
-				ColumnDefinition def = colEntry.getValue();
-				info.put("fieldLess", def.isFieldLessIndexed());
-				info.put("type", def.getFieldType());
-				info.put("extra", def.getProperties());
-				columns.put(colEntry.getKey(), info);
-			}
-			schemaInfo.put(famEntry.getKey(), columns);
-		}
-		
-		return schemaInfo;
-	}
-	
-	public static List<String> getTerms(String table, String family, String column, String startWith) throws IOException, BlurException, TException {
-		Iface client = BlurClient.getClient(Config.getConnectionString());
-		
-		return client.terms(table, family, column, startWith, (short)10);
-	}
-	
-	public static void disableTable(String table) throws BlurException, TException, IOException {
-		Iface client = BlurClient.getClient(Config.getConnectionString());
-		
-		client.disableTable(table);
-	}
-	public static void enableTable(String table) throws BlurException, TException, IOException {
-		Iface client = BlurClient.getClient(Config.getConnectionString());
-		
-		client.enableTable(table);
-	}
-	public static void deleteTable(String table, boolean includeFiles) throws BlurException, TException, IOException {
-		Iface client = BlurClient.getClient(Config.getConnectionString());
-		
-		client.removeTable(table, includeFiles);
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/resources/checkstyle.xml
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/resources/checkstyle.xml b/contrib/blur-console/src/main/resources/checkstyle.xml
deleted file mode 100644
index 9667c40..0000000
--- a/contrib/blur-console/src/main/resources/checkstyle.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-
-<?xml version="1.0"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-	license agreements. See the NOTICE file distributed with this work for additional 
-	information regarding copyright ownership. The ASF licenses this file to 
-	you under the Apache License, Version 2.0 (the "License"); you may not use 
-	this file except in compliance with the License. You may obtain a copy of 
-	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. -->
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module name="Checker">
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-
-    <module name="TreeWalker">
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport"/>
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength"/>
-        <module name="LineLength"/>
-        <module name="MethodLength"/>
-        <module name="ParameterNumber"/>
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad">
-	    	<property name="option" value="space" />
-		</module>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter" />
-        <module name="WhitespaceAround"/>
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <module name="DoubleCheckedLocking"/>
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <module name="HiddenField"/>
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <module name="MagicNumber"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="RedundantThrows"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier"/>
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="GenericIllegalRegexp">
-            <property name="format" value="\s+$"/>
-            <property name="message" value="Line has trailing spaces."/>
-        </module>
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
-
-		<!-- Optional Checks -->
-        <module name="usage.OneMethodPrivateField"/>
-        <module name="usage.UnusedLocalVariable"/>
-        <module name="usage.UnusedParameter"/>
-    </module>
-</module>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/resources/log4j.xml b/contrib/blur-console/src/main/resources/log4j.xml
deleted file mode 100644
index 87d29b0..0000000
--- a/contrib/blur-console/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-  <appender name="console" class="org.apache.log4j.ConsoleAppender"> 
-    <param name="Target" value="System.out"/> 
-    <layout class="org.apache.log4j.PatternLayout"> 
-      <param name="ConversionPattern" value="%-5p %c{1} - %m%n"/> 
-    </layout> 
-  </appender> 
-
-  <root> 
-    <priority value ="warn" /> 
-    <appender-ref ref="console" /> 
-  </root>
-  
-</log4j:configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/scripts/grunt.sh
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/scripts/grunt.sh b/contrib/blur-console/src/main/scripts/grunt.sh
deleted file mode 100755
index f202477..0000000
--- a/contrib/blur-console/src/main/scripts/grunt.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do
-  DIR="$(cd -P "$(dirname "$SOURCE")" && pwd)"
-  SOURCE="$(readlink "$SOURCE")"
-  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
-done
-DIR="$(cd -P "$(dirname "$SOURCE")" && pwd)"
-
-# Check for grunt-cli installed: log `npm install -g grunt-cli`
-command -v grunt >/dev/null 2>&1 || { echo >&2 "[ERROR] grunt not found! install: npm install -g grunt-cli"; exit 1; }
-
-# Check for bower: log `npm install -g bower`
-command -v bower >/dev/null 2>&1 || { echo >&2 "[ERROR] bower not found! install: npm install -g bower"; exit 1; }
-
-# run `npm install` in src/main/webapp
-cd $DIR/../webapp >/dev/null 
-npm install --quiet
-
-# Run `bower list` for previous `bower list` output
-mkdir -p ${DIR}/../../../target
-filename=${DIR}/../../../target/.webapp-build.$(id -un)
-filename_previous=${DIR}/../../../target/.webapp-build.previous.$(id -un)
-
-touch $filename
-mv $filename $filename_previous
-bower list --offline > $filename
-
-if diff $filename $filename_previous >/dev/null ; then
-  grunt $1
-else
-  grunt deps $1
-fi
-
-cd - >/dev/null
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/.bowerrc
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/.bowerrc b/contrib/blur-console/src/main/webapp/.bowerrc
deleted file mode 100644
index 4e5e51b..0000000
--- a/contrib/blur-console/src/main/webapp/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "directory": "libs"
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/.editorconfig
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/.editorconfig b/contrib/blur-console/src/main/webapp/.editorconfig
deleted file mode 100644
index 8a80734..0000000
--- a/contrib/blur-console/src/main/webapp/.editorconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-
-[*]
-
-# Change these settings to your own preference
-indent_style = space
-indent_size = 4
-
-# We recommend you to keep these unchanged
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/.gitattributes
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/.gitattributes b/contrib/blur-console/src/main/webapp/.gitattributes
deleted file mode 100644
index 2125666..0000000
--- a/contrib/blur-console/src/main/webapp/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* text=auto
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/.gitignore
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/.gitignore b/contrib/blur-console/src/main/webapp/.gitignore
deleted file mode 100644
index 80661cd..0000000
--- a/contrib/blur-console/src/main/webapp/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-build/
-libs/*
-jsc/*
-public/*
-test/reports
-.tmp
-.sass-cache

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/.jshintrc
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/.jshintrc b/contrib/blur-console/src/main/webapp/.jshintrc
deleted file mode 100644
index abc9b0a..0000000
--- a/contrib/blur-console/src/main/webapp/.jshintrc
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "node": true,
-    "browser": true,
-    "esnext": true,
-    "bitwise": true,
-    "camelcase": false,
-    "curly": true,
-    "eqeqeq": true,
-    "immed": true,
-    "indent": 4,
-    "latedef": true,
-    "newcap": true,
-    "noarg": true,
-    "quotmark": "single",
-    "undef": true,
-    "unused": true,
-    "strict": true,
-    "trailing": true,
-    "smarttabs": true,
-    "jquery": true
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/Gruntfile.js
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/Gruntfile.js b/contrib/blur-console/src/main/webapp/Gruntfile.js
deleted file mode 100644
index f3802b3..0000000
--- a/contrib/blur-console/src/main/webapp/Gruntfile.js
+++ /dev/null
@@ -1,289 +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.
-*/
-
-'use strict';
-
-module.exports = function (grunt) {
-
-    // Load grunt tasks automatically
-    require('load-grunt-tasks')(grunt);
-
-    // Time how long tasks take. Can help when optimizing build times
-    require('time-grunt')(grunt);
-
-    var all_js_files = [
-        'libs/jquery/dist/jquery.js',
-        'js/utils/*\.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/tooltip.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/modal.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/transition.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/popover.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/collapse.js',
-        'libs/twbs-bootstrap-sass/vendor/assets/javascripts/bootstrap/tab.js',
-        'libs/flot/jquery.flot.js',
-        'libs/flot/jquery.flot.pie.js',
-        'libs/flot/jquery.flot.categories.js',
-        'libs/flot/jquery.flot.stack.js',
-        'libs/typeahead.js/dist/typeahead.jquery.js',
-        'js/blurconsole.js',
-        'js/*\.js'
-    ];
-
-    // Define the configuration for all the tasks
-    grunt.initConfig({
-        pkg: grunt.file.readJSON('package.json'),
-        banner: grunt.file.read('banner'),
-
-        clean: ['public'],
-
-        bower: {
-            install: {
-                options: {
-                    targetDir: './libs',
-                    install: true,
-                    copy: false,
-                    quiet: true
-                }
-            },
-            prune: {
-                options: {
-                    targetDir: './libs',
-                    copy: false,
-                    offline: true,
-                    quiet: true
-                }
-            }
-        },
-
-        // Compiles Sass to CSS and generates necessary files if requested
-        sass: {
-            options: {
-                sourcemap: true,
-                lineNumbers: true,
-                loadPath: ['libs']
-            },
-            development: {
-                files: {
-                    'public/css/blurconsole.css': 'sass/blurconsole.scss'
-                }
-            },
-            production: {
-                files: {
-                    'public/css/blurconsole.css': 'sass/blurconsole.scss'
-                },
-                options: {
-                    style: 'compressed'
-                }
-            }
-        },
-
-        uglify: {
-            js: {
-                options: {
-                    sourceMap: true,
-                    sourceMapIncludeSources: true,
-                    banner:'/*\n<%= banner %>\n*/',
-                    compress: {
-                        drop_console: true
-                    }
-                },
-                files: {
-                    'public/js/blurconsole.js': all_js_files
-                }
-            }
-        },
-
-        // Make sure code styles are up to par and there are no obvious mistakes
-        jshint: {
-            options: {
-                jshintrc: true,
-            },
-            development: {
-                src: ['js/**/*\.js', '!js/utils/**/*\.js']
-            },
-            ci: {
-                src: ['js/**/*\.js'],
-                options: {
-                    reporter: 'checkstyle',
-                    reporterOutput: 'build/jshint-checkstyle.xml'
-                }
-            }
-        },
-
-        // Watches files for changes and runs tasks based on the changed files
-        watch: {
-            options: {
-                dateFormat: function(time) {
-                    grunt.log.ok('The watch finished in ' + (time / 1000).toFixed(2) + 's. Waiting...');
-                },
-                spawn: false,
-                interrupt: false
-            },
-            css: {
-                files: ['sass/**/*.scss', 'libs/**/*.css', 'libs/**/*.scss'],
-                tasks: ['sass:development', 'version-assets-css-map', 'version-assets-css', 'notify:css']
-            },
-            js: {
-                files: ['js/**/*.js'],
-                tasks: ['jshint:development', 'uglify:js', 'version-assets-js-map', 'version-assets-js']
-            },
-            html: {
-                files: ['index.html', 'views/*.html'],
-                tasks: ['copy:main', 'version-assets']
-            },
-            livereload: {
-                options: {
-                    livereload: '<%= connect.options.livereload %>'
-                },
-                files: [
-                    './{,*/}*.html',
-                    './img/{,*/}*.{gif,jpeg,jpg,png,svg,webp}'
-                ]
-            }
-        },
-
-        notify: {
-            css: {
-                options: {
-                    title: 'Blur Console',
-                    message: 'Sass finished'
-                }
-            }
-        },
-
-        mochaSelenium: {
-            options: {
-                screenshotAfterEach: true,
-                screenshotDir: 'test/reports',
-                reporter: 'spec',
-                viewport: { width: 900, height: 700 },
-                timeout: 30e3,
-                slow: 10e3,
-                implicitWaitTimeout: 100,
-                asyncScriptTimeout: 5000,
-                usePromises: true,
-                useChaining: true,
-                ignoreLeaks: false
-            },
-            firefox: { src: ['test/functional/spec/**/*.js'], options: { browserName: 'firefox' } },
-            chrome: { src: ['text/function/spec/**/*.js'], options: { browserName: 'chrome' } }
-        },
-
-        karma: {
-            unit: {
-                configFile: 'karma.conf.js',
-                runnerPort: 9999,
-                singleRun: true
-            }
-        },
-
-        connect: {
-            options: {
-                port: 3000,
-                livereload: 4000,
-                // Change this to '0.0.0.0' to access the server from outside
-                hostname: '0.0.0.0',
-                base: 'public'
-            },
-            livereload: {
-                options: {
-                    open: 'http://0.0.0.0:3000/?fakeIt=true'
-                }
-            }
-        },
-
-        copy: {
-            main: {
-                files: [
-                    {expand: true, src: ['index.html','img/*','views/*'], dest: 'public/'},
-                    {expand: true, flatten: true, src: ['libs/modernizr/modernizr.js'], dest: 'public/js'},
-                    {expand: true, flatten: true, src: ['libs/twbs-bootstrap-sass/vendor/assets/fonts/bootstrap/*'], dest: 'public/css'}
-                ]
-            }
-        }
-    });
-
-    grunt.loadNpmTasks('grunt-bower-task');
-    grunt.loadNpmTasks('grunt-exec');
-    grunt.loadNpmTasks('grunt-contrib-clean');
-    grunt.loadNpmTasks('grunt-contrib-sass');
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.loadNpmTasks('grunt-notify');
-    grunt.loadNpmTasks('grunt-mocha-selenium');
-    grunt.loadNpmTasks('grunt-karma');
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-copy');
-
-    var initialHintSrc = grunt.config('jshint.development.src');
-    grunt.event.on('watch', function(action, filepath){
-        var matchingHint = grunt.file.match(initialHintSrc, filepath);
-        grunt.config('jshint.development.src', matchingHint);
-    });
-
-    grunt.registerTask('deps', 'Install Webapp Dependencies', ['bower:install', 'bower:prune']);
-    grunt.registerTask('test:functional:chrome', 'Run JavaScript Functional Tests in Chrome', ['mochaSelenium:chrome']);
-    grunt.registerTask('test:functional:firefox', 'Run JavaScript Functional Tests in Firefox', ['mochaSelenium:firefox']);
-    grunt.registerTask('test:functional', 'Run JavaScript Functional Tests', ['test:functional:chrome', 'test:functional:firefox']);
-    grunt.registerTask('test:unit', 'Run JavaScript Unit Tests', ['karma']);
-    grunt.registerTask('test:style', 'Run JavaScript CodeStyle reports', ['jshint:ci'/*, 'plato:ci' */]);
-    grunt.registerTask('style:development', 'Run JavaScript CodeStyle reports', ['jshint:development']);
-    grunt.registerTask('development', 'Build for development', ['clean', 'sass:development', 'uglify:js', 'copy:main', 'version-assets']);
-    grunt.registerTask('production', 'Build for production', ['clean', 'sass:production', 'uglify:js', 'copy:main', 'version-assets']);
-    grunt.registerTask('serve', 'Run development server', ['clean','development', 'connect:livereload','watch']);
-    grunt.registerTask('default', ['clean', 'style:development', 'development', 'watch']);
-    grunt.registerTask('version-assets-css-map', function() {
-        var Version = require("node-version-assets");
-        var versionInstance = new Version({
-            assets: ['public/css/blurconsole.css.map'],
-            grepFiles: ['public/css/blurconsole.css'],
-            keepOriginal: true
-        });
-        versionInstance.run(this.async());
-    });
-    grunt.registerTask('version-assets-js-map', function() {
-        var Version = require("node-version-assets");
-        var versionInstance = new Version({
-            assets: ['public/js/blurconsole.js.map'],
-            grepFiles: ['public/js/blurconsole.js'],
-            keepOriginal: true
-        });
-        versionInstance.run(this.async());
-    });
-    grunt.registerTask('version-assets-js', function() {
-        var Version = require("node-version-assets");
-        var versionInstance = new Version({
-            assets: ['public/js/blurconsole.js'],
-            grepFiles: ['public/index.html'],
-            keepOriginal: true
-        });
-        versionInstance.run(this.async());
-    });
-    grunt.registerTask('version-assets-css', function() {
-        var Version = require("node-version-assets");
-        var versionInstance = new Version({
-            assets: ['public/css/blurconsole.css'],
-            grepFiles: ['public/index.html'],
-            keepOriginal: true
-        });
-        versionInstance.run(this.async());
-    });
-    grunt.registerTask('version-assets', 'version the static assets just created', ['version-assets-js-map', 'version-assets-js', 'version-assets-css-map', 'version-assets-css']);
-};

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

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/bower.json
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/bower.json b/contrib/blur-console/src/main/webapp/bower.json
deleted file mode 100644
index 6c54da7..0000000
--- a/contrib/blur-console/src/main/webapp/bower.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "blur-console",
-  "version": "0.0.1",
-  "private": true,
-  "dependencies": {
-    "twbs-bootstrap-sass": "3.1.1",
-    "modernizr": "2.7.1",
-    "jquery": "1.11.0",
-    "flot":"0.8.2",
-    "typeahead.js":"0.10.2"
-  },
-  "devDependencies": {
-    "mocha": "~1.18.0",
-    "chai": "~1.9.0"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/img/ajax-loader.gif
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/img/ajax-loader.gif b/contrib/blur-console/src/main/webapp/img/ajax-loader.gif
deleted file mode 100644
index c8c22f2..0000000
Binary files a/contrib/blur-console/src/main/webapp/img/ajax-loader.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/index.html b/contrib/blur-console/src/main/webapp/index.html
deleted file mode 100644
index f38c923..0000000
--- a/contrib/blur-console/src/main/webapp/index.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
- -->
-
-<!doctype html>
-<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
-<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
-<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>Blur Console</title>
-        <meta name="description" content="System Monitor and Console for Blur">
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" href="css/blurconsole.css">
-        <script src="js/modernizr.js"></script>
-    </head>
-    <body>
-        <nav class="navbar navbar-inverse navbar-fixed-top">
-            <a class="navbar-brand" href="#">Blur Console</a>
-            <div class="pull-right">
-                <button type="button" id="view_logging_trigger" class="btn btn-default btn-sm">
-                    Logs
-                    <span class="badge badge-warning"></span>
-                </button>
-            </div>
-        </nav>
-        <nav class="side-nav">
-            <ul>
-                <li title="Dashboard" data-toggle="tooltip" data-placement="right" data-container="body">
-                    <a href="#!tab=dashboard"><i class="glyphicon glyphicon-dashboard"></i></a>
-                </li>
-                <li title="Tables" data-toggle="tooltip" data-placement="right" data-container="body">
-                    <a href="#!tab=tables"><i class="glyphicon glyphicon-list"></i></a>
-                </li>
-                <li title="Queries" data-toggle="tooltip" data-placement="right" data-container="body">
-                    <a href="#!tab=queries"><i class="glyphicon glyphicon-tasks"></i></a>
-                </li>
-                <li title="Search" data-toggle="tooltip" data-placement="right" data-container="body">
-                    <a href="#!tab=search"><i class="glyphicon glyphicon-search"></i></a>
-                </li>
-            </ul>
-        </nav>
-        <div id="blurconsole"></div>
-        <script src="js/blurconsole.js"></script>
-        <script type="text/javascript">
-            $(function () { blurconsole.initModule( $('#blurconsole') ); });
-        </script>
-    </body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/js/blurconsole.b_utils.js
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/js/blurconsole.b_utils.js b/contrib/blur-console/src/main/webapp/js/blurconsole.b_utils.js
deleted file mode 100644
index 8ffd146..0000000
--- a/contrib/blur-console/src/main/webapp/js/blurconsole.b_utils.js
+++ /dev/null
@@ -1,121 +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.
-*/
-/*global blurconsole:false */
-blurconsole.browserUtils = (function(){
-	'use strict';
-
-	function table(def, data) {
-		var tableMarkup;
-
-		tableMarkup = '<table class="table table-bordered table-condensed table-hover table-striped"><thead><tr>';
-
-		// Add headers
-		$.each(def, function(idx, colDef){
-			tableMarkup += '<th>' + colDef.label + '</th>';
-		});
-
-		tableMarkup += '</tr></thead><tbody>';
-
-		// Add content
-		if (data && data.length > 0) {
-			$.each(data, function(ir, row){
-				tableMarkup += '<tr>';
-				$.each(def, function(ic, col) {
-					tableMarkup += '<td>';
-					if ($.isFunction(col.key)) {
-						tableMarkup += col.key(row);
-					} else {
-						tableMarkup += row[col.key];
-					}
-					tableMarkup += '</td>';
-				});
-				tableMarkup += '</tr>';
-			});
-		} else {
-			tableMarkup += '<tr><td colspan="' + def.length + '">There are no items here</td></tr>';
-		}
-
-		tableMarkup += '</tbody></table>';
-		return tableMarkup;
-	}
-
-	function modal(id, title, content, buttons, size) {
-		var mSize, markup, mButtons = buttons;
-
-		switch(size) {
-		case 'large':
-			mSize = 'modal-lg';
-			break;
-		case 'medium':
-			mSize = 'modal-md';
-			break;
-		default:
-			mSize = 'modal-sm';
-		}
-
-		markup = '<div class="modal fade" id="' + id + '">';
-		markup += '<div class="modal-dialog ' + mSize + '">';
-		markup += '<div class="modal-content">';
-		markup += '<div class="modal-header"><button type="button" class="close" data-dismiss="modal">&times;</button><h4 class="modal-title">' + title + '</h4></div>';
-		markup += '<div class="modal-body">' + ($.type(content) === 'string' ? content : $(content).html()) + '</div>';
-
-		if (mButtons) {
-			if (!$.isArray(mButtons)) {
-				mButtons = [mButtons];
-			}
-
-			markup += '<div class="modal-footer">';
-			$.each(mButtons, function(i, button) {
-				markup += '<button type="button" class="btn ' + button.classes + '" id="' + button.id + '" ';
-
-				if (button.data) {
-					$.each(button.data, function(key, dataAttr) {
-						markup += 'data-' + key + '="' + dataAttr + '" ';
-					});
-				}
-
-				markup += '>' + button.label + '</button> ';
-			});
-			markup += '</div>';
-		}
-
-		markup += '</div></div></div>';
-
-		return markup;
-	}
-
-	function cleanId(str) {
-		return str.replace(/([;&,\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '_');
-	}
-
-	function booleanImg(val) {
-		if (val && (val === true || val === 'yes' || val === 'true')) {
-			return '<div class="label label-success"><i class="glyphicon glyphicon-ok-sign"></i></div>';
-		}
-		return '<div class="label label-danger"><i class="glyphicon glyphicon-minus-sign"></i></div>';
-	}
-
-	return {
-		table: table,
-		modal : modal,
-		cleanId : cleanId,
-		booleanImg : booleanImg
-	};
-}());
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/js/blurconsole.dashboard.js
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/js/blurconsole.dashboard.js b/contrib/blur-console/src/main/webapp/js/blurconsole.dashboard.js
deleted file mode 100644
index 005645f..0000000
--- a/contrib/blur-console/src/main/webapp/js/blurconsole.dashboard.js
+++ /dev/null
@@ -1,271 +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.
-*/
-
-/*
- * blurconsole.dashboard.js
- * Dashboard feature module for Blur Console
- */
-/*global blurconsole:false */
-blurconsole.dashboard = (function () {
-	'use strict';
-	//------------------- Configuration and State -------------------------
-	var
-		configMap = {
-			view: 'views/dashboard.tpl.html',
-			pieOptions : {
-				series : {
-					pie : {
-						show : true,
-						radius : 1,
-						label : {
-							show : true,
-							radius : 2/3,
-							formatter : function(label, series) {
-								return '<div style="font-size:10pt;font-weight:bold;text-align:center;padding:2px;color:white">' + label + '<br/>' + Math.round(series.percent) + '% (' + series.data[0][1] + ')</div>';
-							},
-							threshold : 0.1
-						}
-					}
-				},
-				legend : {
-					show : false
-				},
-				title: 'Test title'
-			}
-		},
-		stateMap = {
-			$container : null,
-			zookeeperNodes: 'chart',
-			controllerNodes: 'chart'
-		},
-		jqueryMap = {};
-
-	//--------------------- Utilities ---------------------
-	function _setJqueryMap() {
-		var $container = stateMap.$container;
-		jqueryMap = {
-			$container : $container,
-			$zkChartHolder : $('#zookeeperNodes'),
-			$zkInfoHolder : $('#zookeeperInfo'),
-			$controllerChartHolder : $('#controllerNodes'),
-			$controllerInfoHolder : $('#controllerInfo'),
-			$shardChartHolder : $('#shardNodes'),
-			$tableChartHolder : $('#tableCounts'),
-			$queryLoadChartHolder : $('#queryLoad')
-		};
-	}
-
-	function _registerPageEvents() {
-		$(document).on('click', '.swapper-trigger', _swapNodeChartAndData);
-		$(window).on('resize', _adjustChartsSizes);
-	}
-
-	function _unregisterPageEvents() {
-		$(document).off('click', '.swapper-trigger');
-		$(window).off('resize');
-	}
-
-	//----------------------- Event Handlers and DOM Modifiers ------------------
-	function _updateAllCharts() {
-		_updateNodeCharts();
-		_loadTableColumnChart();
-		_loadQueryPerfLineChart();
-	}
-
-	function _updateNodeCharts() {
-		if (blurconsole.model.nodes.isDataLoaded()) {
-			_loadZkPieChart();
-			_loadControllerPieChart();
-			_loadShardsPieChart();
-		}
-	}
-
-	function _swapNodeChartAndData(evt) {
-		var parent = $(evt.currentTarget).closest('div.swapper-parent');
-		var chart = parent.find('.swapper-chart');
-		var info = parent.find('.swapper-info');
-
-		chart.toggleClass('hidden');
-		info.toggleClass('hidden');
-	}
-
-	function _loadZkPieChart() {
-		$.plot(jqueryMap.$zkChartHolder, blurconsole.model.metrics.getZookeeperChartData(), configMap.pieOptions);
-		jqueryMap.$zkInfoHolder.html(_buildNodeTable(blurconsole.model.nodes.getOnlineZookeeperNodes(), blurconsole.model.nodes.getOfflineZookeeperNodes()));
-	}
-
-	function _loadControllerPieChart() {
-		$.plot(jqueryMap.$controllerChartHolder, blurconsole.model.metrics.getControllerChartData(), configMap.pieOptions);
-		jqueryMap.$controllerInfoHolder.html(_buildNodeTable(blurconsole.model.nodes.getOnlineControllerNodes(), blurconsole.model.nodes.getOfflineControllerNodes()));
-	}
-
-	function _loadShardsPieChart() {
-		if (jqueryMap.$shardChartHolder.find('img').length > 0) {
-			jqueryMap.$shardChartHolder.html('');
-		}
-
-		$.each(blurconsole.model.metrics.getClusters(), function(idx, cluster) {
-			var clusterData = blurconsole.model.metrics.getShardChartData(cluster);
-
-			if (clusterData) {
-				var clusterHolder = jqueryMap.$shardChartHolder.find('#cluster_' + cluster + '_chart_holder');
-				var clusterInfo = jqueryMap.$shardChartHolder.find('#cluster_' + cluster + '_info');
-
-				if (clusterHolder.length === 0) {
-					var wrapper = $('<div class="swapper-parent"></div>');
-					wrapper.append($('<div class="text-center"><strong>' + cluster + '</strong> <small class="text-muted"><i class="glyphicon glyphicon-retweet swapper-trigger" title="Swap Chart/Info"></i></small></div>'));
-					clusterHolder = $('<div id="cluster_'+ cluster + '_chart_holder" class="shardClusterChartHolder simple-chart swapper-chart"></div>');
-					wrapper.append(clusterHolder);
-					var parentSize = jqueryMap.$shardChartHolder.parent()[0].clientWidth - 150;
-					clusterHolder.css({
-						'height' : parentSize,
-						'width' : parentSize
-					});
-					clusterInfo = $('<div id="cluster_' + cluster + '_info" class="swapper-info hidden"></div>');
-					wrapper.append(clusterInfo);
-
-					jqueryMap.$shardChartHolder.append(wrapper);
-				}
-
-				$.plot(clusterHolder, clusterData, configMap.pieOptions);
-				clusterInfo.html(_buildNodeTable([], blurconsole.model.nodes.getOfflineShardNodes(cluster)));
-			}
-		});
-	}
-
-	function _loadTableColumnChart() {
-		if (blurconsole.model.tables.isDataLoaded()) {
-			$.plot(jqueryMap.$tableChartHolder, blurconsole.model.metrics.getTableChartData(), {
-				bars : {
-					show : true,
-					barWidth : 0.6,
-					align : 'center'
-				},
-				yaxis : {
-					min : 0,
-					tickDecimals : 0
-				},
-				xaxis : {
-					mode : 'categories'
-				}
-			});
-		}
-	}
-
-	function _loadQueryPerfLineChart() {
-		$.plot(jqueryMap.$queryLoadChartHolder, blurconsole.model.metrics.getQueryLoadChartData(), {
-			series : {
-				shadowSize : 0
-			},
-			yaxis : {
-				min : 0
-			},
-			xaxis : {
-				show : false
-			}
-		});
-	}
-
-	function _buildNodeTable(online, offline) {
-		var table = '<table class="table table-condensed"><thead><tr><th>Offline Node</th></tr></thead><tbody>';
-		if (offline.length === 0) {
-			table += '<tr><td>Everything is Online!</td></tr>';
-		} else {
-			$.each(offline, function(idx, node) {
-				table += '<tr><td>' + node + '</td></tr>';
-			});
-		}
-		table += '</tbody></table>';
-
-		if (online.length > 0) {
-			table += '<table class="table table-condensed"><thead><tr><th>Online Node</th></tr></thead><tbody>';
-			$.each(online, function(idx, node) {
-				table += '<tr><td>' + node + '</td></tr>';
-			});
-			table += '</tbody></table>';
-		}
-		return $(table);
-	}
-
-	function _adjustChartSize(holder) {
-		var size;
-		size = jqueryMap[holder].parent()[0].clientWidth - 150;
-		jqueryMap[holder].css({
-			'height' : size,
-			'width' : size
-		});
-	}
-
-	function _adjustChartsSizes() {
-		_adjustChartSize('$zkChartHolder');
-		_adjustChartSize('$controllerChartHolder');
-		_adjustChartSize('$tableChartHolder');
-		_adjustChartSize('$queryLoadChartHolder');
-
-		var size = jqueryMap.$shardChartHolder.parent()[0].clientWidth - 150;
-		var shardCharts = jqueryMap.$shardChartHolder.find('.shardClusterChartHolder');
-		shardCharts.each(function(){
-			$(this).css({
-				'height' : size,
-				'width' : size
-			});
-		});
-		_updateAllCharts();
-	}
-
-	function _checkForSlowQueries() {
-		if (blurconsole.model.metrics.getSlowQueryWarnings()) {
-			$('#slow-query-warnings').slideDown();
-		} else {
-			$('#slow-query-warnings').slideUp();
-		}
-	}
-
-	//----------------------- Public API ----------------------------
-
-	function initModule( $container ) {
-		$container.load ( configMap.view, function() {
-			stateMap.$container = $container;
-			_setJqueryMap();
-			_updateAllCharts();
-			_checkForSlowQueries();
-			$.gevent.subscribe(jqueryMap.$container, 'node-status-updated', _updateNodeCharts);
-			$.gevent.subscribe(jqueryMap.$container, 'tables-updated', _loadTableColumnChart);
-			$.gevent.subscribe(jqueryMap.$container, 'query-perf-updated', _loadQueryPerfLineChart);
-			$.gevent.subscribe(jqueryMap.$container, 'queries-updated', _checkForSlowQueries);
-			_adjustChartsSizes();
-			_registerPageEvents();
-		});
-		return true;
-	}
-
-	function unloadModule() {
-		$.gevent.unsubscribe(jqueryMap.$container, 'node-status-updated');
-		$.gevent.unsubscribe(jqueryMap.$container, 'tables-updated');
-		$.gevent.unsubscribe(jqueryMap.$container, 'query-perf-updated');
-		$.gevent.unsubscribe(jqueryMap.$container, 'queries-updated');
-		_unregisterPageEvents();
-	}
-
-	return {
-		initModule   : initModule,
-		unloadModule : unloadModule
-	};
-}());
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/js/blurconsole.data.js
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/js/blurconsole.data.js b/contrib/blur-console/src/main/webapp/js/blurconsole.data.js
deleted file mode 100644
index b89ff80..0000000
--- a/contrib/blur-console/src/main/webapp/js/blurconsole.data.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-/*global blurconsole:false */
-blurconsole.data = (function() {
-	'use strict';
-
-	//------------------- Private methods --------------------------
-	function _logError (errorMsg, status, module, callback) {
-		blurconsole.model.logs.logError(status + ' - ' + errorMsg, module);
-		if (callback) {
-			callback('error');
-		}
-	}
-
-	//------------------- Public API -------------------------------
-	function getTableList(callback) {
-		$.getJSON('/service/tables', callback).fail(function(xhr) {
-			_logError(xhr.responseText, xhr.status, 'tables', callback);
-		});
-	}
-
-	function getNodeList(callback) {
-		$.getJSON('/service/nodes', callback).fail(function(xhr) {
-			_logError(xhr.responseText, xhr.status, 'tables', callback);
-		});
-	}
-	function getQueryPerformance(callback) {
-		$.getJSON('/service/queries/performance', callback).fail(function(xhr) {
-			_logError(xhr.responseText, xhr.status, 'tables', callback);
-		});
-	}
-
-	function getQueries(callback) {
-		$.getJSON('/service/queries', callback).fail(function(xhr) {
-			_logError(xhr.responseText, xhr.status, 'tables', callback);
-		});
-	}
-
-	function cancelQuery(table, uuid) {
-		$.ajax('/service/queries/' + uuid + '/cancel', {
-			data: {
-				table: table
-			},
-			error: function(xhr) {
-				_logError(xhr.responseText, xhr.status, 'tables');
-			}
-		});
-	}
-
-	function disableTable(table) {
-		$.ajax('/service/tables/' + table + '/disable', {
-			error: function(xhr) {
-				_logError(xhr.responseText, xhr.status, 'tables');
-			}
-		});
-	}
-
-	function enableTable (table){
-		$.ajax('/service/tables/' + table + '/enable', {
-			error: function(xhr) {
-				_logError(xhr.responseText, xhr.status, 'tables');
-			}
-		});
-	}
-
-	function deleteTable (table, includeFiles) {
-		$.ajax('/service/tables/' + table + '/delete', {
-			data: {
-				includeFiles: includeFiles
-			},
-			error: function(xhr) {
-				_logError(xhr.responseText, xhr.status, 'tables');
-			}
-		});
-	}
-
-	function getSchema(table, callback) {
-		$.getJSON('/service/tables/' + table + '/schema', callback).fail(function(xhr) {
-			_logError(xhr.responseText, xhr.status, 'tables');
-		});
-	}
-
-	function findTerms (table, family, column, startsWith, callback) {
-		$.getJSON('/service/tables/' + table + '/' + family + '/' + column + '/terms', {startsWith: startsWith}, callback).fail(function(xhr) {
-			_logError(xhr.responseText, xhr.status, 'tables');
-		});
-	}
-
-	function sendSearch(query, table, args, callback) {
-		var params = $.extend({table:table, query:query}, args);
-		$.ajax('/service/search', {
-			'type': 'POST',
-			'data': params,
-			'success': callback,
-			'error': function(xhr) {
-				_logError(xhr.responseText, xhr.status, 'tables');
-			}
-		});
-	}
-
-	return {
-		getTableList : getTableList,
-		getNodeList : getNodeList,
-		getQueryPerformance : getQueryPerformance,
-		getQueries : getQueries,
-		cancelQuery : cancelQuery,
-		disableTable : disableTable,
-		enableTable : enableTable,
-		deleteTable : deleteTable,
-		getSchema : getSchema,
-		findTerms : findTerms,
-		sendSearch : sendSearch
-	};
-}());
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/js/blurconsole.fake.js
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/js/blurconsole.fake.js b/contrib/blur-console/src/main/webapp/js/blurconsole.fake.js
deleted file mode 100644
index 14abc17..0000000
--- a/contrib/blur-console/src/main/webapp/js/blurconsole.fake.js
+++ /dev/null
@@ -1,281 +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.
-*/
-/*global blurconsole:false */
-blurconsole.fake = (function() {
-	'use strict';
-	var frozen = false;
-	var tableList, schema, nodeList, queries;
-
-	//----------------------- Private Methods ----------------------
-	function _randomNumber(max, includeZero) {
-		var random = Math.random()*max;
-
-		if (!includeZero) {
-			random++;
-		}
-
-		return Math.floor(random);
-	}
-
-	function _randomBoolean() {
-		return _randomNumber(2) % 2 === 0;
-	}
-
-	function _randomString() {
-		var text = '';
-		var possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
-		for( var i=0; i < Math.floor(Math.random() * 30 + 1); i++ ) {
-			text += possible.charAt(Math.floor(Math.random() * possible.length));
-		}
-
-		return text;
-	}
-
-	function _buildSchema() {
-		var schema = {}, familyCount = _randomNumber(20), types = ['string', 'long', 'int', 'date', 'stored', 'customType'];
-
-		for(var f=0; f < familyCount; f++) {
-			var c, fam = {}, columnCount = _randomNumber(30);
-			for(c=0; c < columnCount; c++) {
-				var col_name = 'col' + c;
-				if(_randomNumber(10) === 1) {
-					col_name += '.sub';
-				}
-				fam[col_name] = {
-					'fieldLess' : _randomBoolean(),
-					'type' : types[_randomNumber(6, true)],
-					'extra' : null
-				};
-
-				if (_randomBoolean()) {
-					var e, extraPropCount = _randomNumber(3), props = {};
-					for (e=0; e < extraPropCount; e++) {
-						props['extra'+e] = 'val'+e;
-					}
-					fam[col_name].extra = props;
-				}
-			}
-			schema['fam'+f] = fam;
-		}
-		return schema;
-	}
-
-	function _sendCallback(callback, data) {
-		setTimeout(function() {
-			callback(data);
-		}, _randomNumber(1000));
-	}
-
-	function _toggleFreeze() {
-		var button = $('#fake_freeze');
-		if(button.html() === 'Freeze'){
-			frozen = true;
-			button.html('Unfreeze');
-			console.log('Fake data frozen');
-		} else {
-			frozen = false;
-			button.html('Freeze');
-			console.log('Fake data resumed');
-		}
-	}
-
-	//-------------------------- Public API ---------------------------
-	function getTableList(callback) {
-		//console.log('getting fake table list');
-		if(!frozen || !tableList) {
-			var clusters = ['prodA', 'prodB'], data = [];
-
-			for (var i = 0; i < 5; i++) {
-				var cluster = clusters[_randomNumber(2, true)];
-				var rows = _randomNumber(1000);
-				var records = _randomNumber(10000)+1000;
-				var enabled = _randomBoolean();
-
-				data.push({cluster:cluster, name:'testtable'+i, enabled:enabled, rows:rows, records:records, families: blurconsole.utils.keys(_buildSchema())});
-
-			}
-			tableList = {'tables':data, 'clusters':clusters};
-		}
-		_sendCallback(callback, tableList);
-	}
-
-	function getNodeList(callback) {
-		//console.log('getting fake node list');
-		if(!frozen || !nodeList) {
-			var controllers = {online:[], offline:[]},
-				clusters = [{name:'prodA', online:[], offline:[]}, {name:'prodB', online:[], offline:[]}],
-				zookeepers = {online: [], offline:[]};
-
-			for(var i = 0; i < 3; i++) {
-				var state = _randomBoolean();
-				if (state) {
-					controllers.online.push('controller' + i + '.localhost');
-					clusters[0].online.push('prodA.shard' + i + '.localhost');
-					clusters[1].online.push('prodB.shard' + i + '.localhost');
-					zookeepers.online.push('zookeeper' + i + '.localhost');
-				} else {
-					controllers.offline.push('controller' + i + '.localhost');
-					clusters[0].offline.push('prodA.shard' + i + '.localhost');
-					clusters[1].offline.push('prodB.shard' + i + '.localhost');
-					zookeepers.offline.push('zookeeper' + i + '.localhost');
-				}
-			}
-			nodeList = {controllers: controllers, clusters: clusters, zookeepers: zookeepers};
-		}
-		_sendCallback(callback, nodeList);
-	}
-
-	function getQueryPerformance(callback) {
-		//console.log('getting fake query performance');
-		_sendCallback(callback, _randomNumber(1000, true));
-	}
-
-	function getQueries(callback) {
-		//console.log('getting fake queries');
-		if(!frozen || !queries) {
-			var randomQueries = [];
-
-			for (var i=0; i < _randomNumber(50); i++) {
-				randomQueries.push({
-					uuid: _randomString(),
-					user: 'user_' + _randomNumber(10, true),
-					query: _randomString(),
-					table: 'testtable' + _randomNumber(5, true),
-					state: _randomNumber(3, true),
-					percent: _randomNumber(100, true),
-					startTime: new Date().getTime()
-				});
-			}
-			queries = { slowQueries : _randomNumber(10) === 1, queries : randomQueries };
-		}
-		_sendCallback(callback, queries);
-	}
-
-	function cancelQuery(table, uuid) {
-		console.log('Fake sending request to cancel query [' + uuid + '] on table [' + table + ']');
-	}
-
-	function disableTable(table) {
-		console.log('Fake sending request to disable table [' + table + ']');
-	}
-
-	function enableTable(table) {
-		console.log('Fake sending request to enable table [' + table + ']');
-	}
-
-	function deleteTable(table, includeFiles) {
-		console.log('Fake sending request to delete table [' + table + '] with files [' + includeFiles + ']');
-	}
-
-	function getSchema(table, callback) {
-		console.log('getting fake schema for table [' + table + ']');
-		if(!frozen || !schema){
-			schema = _buildSchema();
-		}
-		_sendCallback(callback, schema);
-	}
-
-	function findTerms(table, family, column, startsWith, callback) {
-		console.log('getting fake terms from [' + table + '] for family [' + family + '] and column [' + column + '] starting with [' + startsWith + ']');
-		var terms = [];
-
-		for (var i = 0; i < 10; i++) {
-			var randStr = _randomString();
-			if (startsWith) {
-				randStr = startsWith + randStr;
-			}
-			terms.push(randStr);
-		}
-
-		terms = terms.sort(function (a, b) {
-			return a.toLowerCase().localeCompare(b.toLowerCase());
-		});
-		_sendCallback(callback, terms);
-	}
-
-	function sendSearch(query, table, args, callback) {
-		console.log('sending fake search [' + query + '] on table [' + table + ']');
-
-		var fams = args.families, results = {}, total = (fams !== null && fams.indexOf('rowid') >= 0) ? 1 : _randomNumber(1000);
-
-		if (fams !== null) {
-			$.each(fams, function(i, fam){
-				var cols = _randomNumber(30, true), toFetch = (fams !== null && fams.indexOf('rowid') >= 0)? 1 : args.fetch;
-				if (total - args.start < toFetch) {
-					toFetch = total - args.start;
-				}
-
-				if (args.rowRecordOption === 'recordrecord') {
-					results[fam] = [];
-					for (var recordIndex = 0; recordIndex < _randomNumber(toFetch); recordIndex++) {
-						var recordRow = {};
-						recordRow.recordid = _randomNumber(1000000).toString();
-						for (var recordColIndex=0; recordColIndex < cols; recordColIndex++) {
-							recordRow['col'+recordColIndex] = _randomString();
-						}
-						results[fam].push(recordRow);
-					}
-				} else {
-					results[fam] = [];
-					for (var rowIndex = 0; rowIndex < _randomNumber(toFetch); rowIndex++) {
-						var rowid = _randomNumber(10000000).toString();
-						results[fam][rowIndex] = {rowid: rowid, records: []};
-						for (var rowRecordIndex = 0; rowRecordIndex < _randomNumber(10); rowRecordIndex++) {
-							var row = {};
-							row.recordid = _randomNumber(1000000).toString();
-							for (var rowRecordColIndex=0; rowRecordColIndex < cols; rowRecordColIndex++) {
-								row['col'+rowRecordColIndex] = _randomString();
-							}
-							results[fam][rowIndex]['records'].push(row);
-						}
-					}
-				}
-			});
-		}
-
-		if (fams.indexOf('rowid') >= 0) {
-			_sendCallback(callback, { total: total, results: results, families: fams });
-		} else if (fams === null || fams.length === 0) {
-			_sendCallback(callback, { total: total });
-		} else {
-			_sendCallback(callback, { families: fams, results: results, total: total });
-		}
-	}
-	function initModule() {
-		$('nav.navbar .pull-right').append('<button type="button" id="fake_freeze" class="btn btn-default btn-sm">Freeze</button>');
-		$('#fake_freeze').click(_toggleFreeze);
-	}
-
-	return {
-		initModule: initModule,
-		getTableList : getTableList,
-		getNodeList : getNodeList,
-		getQueryPerformance : getQueryPerformance,
-		getQueries : getQueries,
-		cancelQuery : cancelQuery,
-		disableTable : disableTable,
-		enableTable : enableTable,
-		deleteTable : deleteTable,
-		getSchema : getSchema,
-		findTerms : findTerms,
-		sendSearch : sendSearch
-	};
-}());
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/js/blurconsole.js
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/js/blurconsole.js b/contrib/blur-console/src/main/webapp/js/blurconsole.js
deleted file mode 100644
index 310df79..0000000
--- a/contrib/blur-console/src/main/webapp/js/blurconsole.js
+++ /dev/null
@@ -1,35 +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.
-*/
-
-/*
- * blur.js
- * Root namespace module
- */
-var blurconsole = (function () {
-	'use strict';
-
-	//---------------------- Public API -------------------------
-	function initModule( $container ) {
-		blurconsole.model.initModule();
-		blurconsole.shell.initModule( $container );
-	}
-
-	return { initModule: initModule };
-}());
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e599710c/contrib/blur-console/src/main/webapp/js/blurconsole.logging.js
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/webapp/js/blurconsole.logging.js b/contrib/blur-console/src/main/webapp/js/blurconsole.logging.js
deleted file mode 100644
index e3a35d5..0000000
--- a/contrib/blur-console/src/main/webapp/js/blurconsole.logging.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.
-*/
-
-/*global blurconsole:false */
-blurconsole.logging = (function () {
-	'use strict';
-
-	//------------------------ Configuration and State -----------------------
-	var configMap = {
-		emptyLogMsg: 'No Errors! Yay!',
-		mainHtml: '<div class="log_display"></div>',
-		buttons: [
-			{ 'classes': 'btn-default', 'id': 'clear-log-button', 'label': 'Clear Logs' },
-			{ 'classes': 'btn-primary', 'id': 'close-logs', 'label': 'Close', 'data': {'dismiss':'modal'} }
-		]
-	},
-	jqueryMap = {
-		modal: null
-	};
-
-	//------------------ Event Handling and DOM Methods -------------
-	function _showLogging() {
-		if (jqueryMap.modal === null) {
-			jqueryMap.modal = $(blurconsole.browserUtils.modal('error_log_modal', 'Error Logs', configMap.mainHtml, configMap.buttons, 'large'));
-			jqueryMap.modal.modal()
-			.on('shown.bs.modal', function(){
-				jqueryMap.logHolder = $('.log_display', jqueryMap.modal);
-				_drawLogs();
-			})
-			.on('click', '#clear-log-button', _clearLogging);
-		} else {
-			jqueryMap.modal.modal('show');
-		}
-	}
-
-	function _clearLogging() {
-		jqueryMap.logHolder.html(configMap.emptyLogMsg);
-		blurconsole.model.logs.clearErrors();
-	}
-
-	function _drawLogs() {
-		var errors = blurconsole.model.logs.getLogs();
-
-		if (jqueryMap.logHolder) {
-			if (errors.length === 0) {
-				jqueryMap.logHolder.html(configMap.emptyLogMsg);
-			} else {
-				var errorList = '<ul>';
-				errors.sort(function(a, b) {
-					return a.timestamp.getTime() > b.timestamp.getTime();
-				});
-				$.each(errors, function(i, error){
-					errorList += '<li><strong>' + error.error + ' (' + error.module + ')</strong><div class="pull-right"><em>' + error.timestamp.toTimeString() + '</em></div></li>';
-				});
-				errorList += '</ul>';
-				jqueryMap.logHolder.html(errorList);
-			}
-		}
-	}
-
-	//------------------ Public API ---------------------------------
-	function initModule() {
-		$.gevent.subscribe($(document), 'show-logging', _showLogging);
-		$.gevent.subscribe($(document), 'logging-updated', _drawLogs);
-	}
-
-	return {
-		initModule : initModule
-	};
-}());
\ No newline at end of file


Mime
View raw message