incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [4/4] git commit: Standardized the tabs and spaces usage (2 spaces per tab)
Date Tue, 08 Jul 2014 20:57:04 GMT
Standardized the tabs and spaces usage (2 spaces per tab)


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/79786aca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/79786aca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/79786aca

Branch: refs/heads/apache-blur-0.2
Commit: 79786acad07a609e1d2f746db4c5c12dd7464d3e
Parents: 696bba3
Author: Chris Rohr <rohr.chris@gmail.com>
Authored: Tue Jul 8 16:56:53 2014 -0400
Committer: Chris Rohr <rohr.chris@gmail.com>
Committed: Tue Jul 8 16:56:53 2014 -0400

----------------------------------------------------------------------
 blur-console/checkstyle.xml                     |   18 +-
 blur-console/pom.xml                            |  450 +++----
 blur-console/src/assemble/webapp.xml            |    2 +-
 .../org/apache/blur/console/JettyServer.java    |   74 +-
 .../main/java/org/apache/blur/console/Main.java |   22 +-
 .../apache/blur/console/model/ResultRow.java    |   38 +-
 .../console/servlets/BaseConsoleServlet.java    |   30 +-
 .../blur/console/servlets/NodesServlet.java     |   56 +-
 .../blur/console/servlets/QueriesServlet.java   |  102 +-
 .../blur/console/servlets/SearchServlet.java    |   52 +-
 .../blur/console/servlets/TablesServlet.java    |  192 +--
 .../org/apache/blur/console/util/Config.java    |  228 ++--
 .../org/apache/blur/console/util/HttpUtil.java  |   16 +-
 .../org/apache/blur/console/util/NodeUtil.java  |  206 ++--
 .../org/apache/blur/console/util/QueryUtil.java |   90 +-
 .../apache/blur/console/util/SearchUtil.java    |  384 +++---
 .../org/apache/blur/console/util/TableUtil.java |  170 +--
 .../src/main/webapp/js/blurconsole.b_utils.js   |  198 ++--
 .../src/main/webapp/js/blurconsole.dashboard.js |  434 +++----
 .../src/main/webapp/js/blurconsole.data.js      |  194 +--
 .../src/main/webapp/js/blurconsole.fake.js      |  518 ++++----
 blur-console/src/main/webapp/js/blurconsole.js  |   14 +-
 .../src/main/webapp/js/blurconsole.logging.js   |  114 +-
 .../src/main/webapp/js/blurconsole.model.js     | 1102 +++++++++---------
 .../src/main/webapp/js/blurconsole.schema.js    |  324 ++---
 .../src/main/webapp/js/blurconsole.search.js    |  880 +++++++-------
 .../src/main/webapp/js/blurconsole.shell.js     |  288 ++---
 .../src/main/webapp/js/blurconsole.tables.js    |  382 +++---
 .../src/main/webapp/js/blurconsole.utils.js     |  144 +--
 .../main/webapp/less/blurconsole.dashboard.less |   40 +-
 .../main/webapp/less/blurconsole.queries.less   |    2 +-
 .../main/webapp/less/blurconsole.schema.less    |   50 +-
 .../main/webapp/less/blurconsole.search.less    |   50 +-
 .../src/main/webapp/test/unit/utilsTest.js      |    4 +-
 .../apache/blur/console/util/ConfigTest.java    |   46 +-
 .../apache/blur/console/util/NodeUtilTest.java  |   62 +-
 .../apache/blur/console/util/QueryUtilTest.java |  104 +-
 .../apache/blur/console/util/TableUtilTest.java |   90 +-
 38 files changed, 3585 insertions(+), 3585 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/checkstyle.xml
----------------------------------------------------------------------
diff --git a/blur-console/checkstyle.xml b/blur-console/checkstyle.xml
index 81208b1..4e448ae 100644
--- a/blur-console/checkstyle.xml
+++ b/blur-console/checkstyle.xml
@@ -1,14 +1,14 @@
 <?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. -->
+  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">

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/pom.xml
----------------------------------------------------------------------
diff --git a/blur-console/pom.xml b/blur-console/pom.xml
index 88cea5d..dce7499 100644
--- a/blur-console/pom.xml
+++ b/blur-console/pom.xml
@@ -1,141 +1,141 @@
 <?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. -->
+  license agreements. See the NOTICE file distributed with this work for additional
+  information regarding copyright ownership. The ASF licenses this file to
+  you under the Apache License, Version 2.0 (the "License"); you may not use
+  this file except in compliance with the License. You may obtain a copy of
+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+  by applicable law or agreed to in writing, software distributed under the
+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+  OF ANY KIND, either express or implied. See the License for the specific
+  language governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.blur</groupId>
-		<artifactId>blur</artifactId>
-		<version>0.2.2-incubating</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+  <parent>
+    <groupId>org.apache.blur</groupId>
+    <artifactId>blur</artifactId>
+    <version>0.2.2-incubating</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
 
-	<groupId>org.apache.blur</groupId>
-	<artifactId>blur-console</artifactId>
-	<version>${projectVersion}</version>
-	<packaging>jar</packaging>
-	<name>Blur Console</name>
+  <groupId>org.apache.blur</groupId>
+  <artifactId>blur-console</artifactId>
+  <version>${projectVersion}</version>
+  <packaging>jar</packaging>
+  <name>Blur Console</name>
 
-	<properties>
-		<!-- Grunt Execution Target. Valid values are [ development | production
-			] -->
-		<grunt.target>development</grunt.target>
+  <properties>
+    <!-- Grunt Execution Target. Valid values are [ development | production
+      ] -->
+    <grunt.target>development</grunt.target>
 
-		<!-- Maven Plugin Versions -->
-		<plugin.maven.exec.version>1.2.1</plugin.maven.exec.version>
-	</properties>
+    <!-- Maven Plugin Versions -->
+    <plugin.maven.exec.version>1.2.1</plugin.maven.exec.version>
+  </properties>
 
-	<dependencies>
-		<!-- Blur Dependencies -->
-		<dependency>
-			<groupId>org.apache.blur</groupId>
-			<artifactId>blur-thrift</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.blur</groupId>
-			<artifactId>blur-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+  <dependencies>
+    <!-- Blur Dependencies -->
+    <dependency>
+      <groupId>org.apache.blur</groupId>
+      <artifactId>blur-thrift</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.blur</groupId>
+      <artifactId>blur-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-		<!-- Development and Runtime Libraries -->
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.8.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-			<version>1.8.1</version>
-		</dependency>
+    <!-- Development and Runtime Libraries -->
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>1.8.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+      <version>1.8.1</version>
+    </dependency>
 
-		<!-- Test Dependancies -->
-		<dependency>
-			<groupId>org.apache.blur</groupId>
-			<artifactId>blur-core</artifactId>
-			<version>${project.version}</version>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.blur</groupId>
-			<artifactId>blur-util</artifactId>
-			<version>${project.version}</version>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+    <!-- Test Dependancies -->
+    <dependency>
+      <groupId>org.apache.blur</groupId>
+      <artifactId>blur-core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.blur</groupId>
+      <artifactId>blur-util</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>**/blur-console-build.properties</include>
-				</includes>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>false</filtering>
-				<excludes>
-					<exclude>**/blur-console-build.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>**/blur-console-build.properties</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+        <excludes>
+          <exclude>**/blur-console-build.properties</exclude>
+        </excludes>
+      </resource>
+    </resources>
 
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<!-- plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-			</plugin -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-			</plugin>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <!-- plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+      </plugin -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+      </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
             </plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>**/ConsoleTestSuite.*</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5.1</version>
-				<inherited>true</inherited>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/ConsoleTestSuite.*</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
@@ -159,13 +159,13 @@
                 </executions>
             </plugin>
             <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-checkstyle-plugin</artifactId>
-		        <version>2.12.1</version>
-		        <configuration>
-		          <configLocation>checkstyle.xml</configLocation>
-		        </configuration>
-		    </plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>2.12.1</version>
+            <configuration>
+              <configLocation>checkstyle.xml</configLocation>
+            </configuration>
+        </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
@@ -190,8 +190,8 @@
                     </execution>
                 </executions>
             </plugin>
-		</plugins>
-	</build>
+    </plugins>
+  </build>
 
     <reporting>
         <plugins>
@@ -235,99 +235,99 @@
             <properties>
                 <projectVersion>${project.parent.version}-hadoop1</projectVersion>
             </properties>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.hadoop</groupId>
-					<artifactId>hadoop-test</artifactId>
-					<version>${hadoop.version}</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>hadoop2-mr1</id>
-			<activation>
-				<property>
-					<name>hadoop2-mr1</name>
-				</property>
-			</activation>
-			<properties>
-				<projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion>
-			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.hadoop</groupId>
-					<artifactId>hadoop-client</artifactId>
-					<version>${hadoop.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.hadoop</groupId>
-					<artifactId>hadoop-minicluster</artifactId>
-					<version>${hadoop.version}</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>hadoop2</id>
-			<activation>
-				<property>
-					<name>hadoop2</name>
-				</property>
-			</activation>
-			<properties>
-				<projectVersion>${project.parent.version}-hadoop2</projectVersion>
-			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.hadoop</groupId>
-					<artifactId>hadoop-client</artifactId>
-					<version>${hadoop.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.hadoop</groupId>
-					<artifactId>hadoop-minicluster</artifactId>
-					<version>${hadoop.version}</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>web-war</id>
-			<properties>
-				<grunt.target>production</grunt.target>
-			</properties>
-		</profile>
-		<profile>
-			<id>grunt</id>
-			<activation>
-				<property>
-					<name>env.BLUR_CONSOLE_DEV</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>${plugin.maven.exec.version}</version>
-						<executions>
-							<!-- Install all webapp dependencies -->
-							<execution>
-								<id>WebApp Dependencies and Minification</id>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<configuration>
-									<executable>${basedir}/src/main/scripts/grunt.sh</executable>
-									<commandlineArgs>${grunt.target}</commandlineArgs>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-test</artifactId>
+          <version>${hadoop.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>hadoop2-mr1</id>
+      <activation>
+        <property>
+          <name>hadoop2-mr1</name>
+        </property>
+      </activation>
+      <properties>
+        <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-client</artifactId>
+          <version>${hadoop.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-minicluster</artifactId>
+          <version>${hadoop.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>hadoop2</id>
+      <activation>
+        <property>
+          <name>hadoop2</name>
+        </property>
+      </activation>
+      <properties>
+        <projectVersion>${project.parent.version}-hadoop2</projectVersion>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-client</artifactId>
+          <version>${hadoop.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-minicluster</artifactId>
+          <version>${hadoop.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>web-war</id>
+      <properties>
+        <grunt.target>production</grunt.target>
+      </properties>
+    </profile>
+    <profile>
+      <id>grunt</id>
+      <activation>
+        <property>
+          <name>env.BLUR_CONSOLE_DEV</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>${plugin.maven.exec.version}</version>
+            <executions>
+              <!-- Install all webapp dependencies -->
+              <execution>
+                <id>WebApp Dependencies and Minification</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <executable>${basedir}/src/main/scripts/grunt.sh</executable>
+                  <commandlineArgs>${grunt.target}</commandlineArgs>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/assemble/webapp.xml
----------------------------------------------------------------------
diff --git a/blur-console/src/assemble/webapp.xml b/blur-console/src/assemble/webapp.xml
index c7d1d56..2d69a71 100644
--- a/blur-console/src/assemble/webapp.xml
+++ b/blur-console/src/assemble/webapp.xml
@@ -18,7 +18,7 @@ under the License.
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+      xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
   <id>webapp</id>
   <formats>
     <format>jar</format>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/JettyServer.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/JettyServer.java b/blur-console/src/main/java/org/apache/blur/console/JettyServer.java
index 2bcbf88..5158e28 100644
--- a/blur-console/src/main/java/org/apache/blur/console/JettyServer.java
+++ b/blur-console/src/main/java/org/apache/blur/console/JettyServer.java
@@ -28,9 +28,9 @@ import org.mortbay.jetty.webapp.WebAppContext;
 import java.net.URL;
 
 public class JettyServer {
-	private int port;
-	private Server server;
-	private boolean devMode;
+  private int port;
+  private Server server;
+  private boolean devMode;
 
     private static final String DEV_WEBAPPDIR = "../classes/";
     private static final String PROD_WEBAPPDIR = "webapp/";
@@ -38,50 +38,50 @@ public class JettyServer {
 
     private final Log log = LogFactory.getLog(JettyServer.class);
 
-	public JettyServer(int port, boolean devMode) {
-		this.port = port;
-		this.devMode = devMode;
-	}
+  public JettyServer(int port, boolean devMode) {
+    this.port = port;
+    this.devMode = devMode;
+  }
 
-	public JettyServer start() {
-		createServer();
-		return this;
-	}
+  public JettyServer start() {
+    createServer();
+    return this;
+  }
 
-	public void join() {
-		try {
-			server.join();
-		} catch (InterruptedException e) {
-			log.info("Server shutting down");
-		}
-	}
+  public void join() {
+    try {
+      server.join();
+    } catch (InterruptedException e) {
+      log.info("Server shutting down");
+    }
+  }
 
-	private void createServer() {
-		server = new Server(port);
+  private void createServer() {
+    server = new Server(port);
 
-		// for localhost:port/console/index.html and whatever else is in the webapp directory
-	    URL warUrl = null;
+    // for localhost:port/console/index.html and whatever else is in the webapp directory
+      URL warUrl = null;
         if (devMode) {
             warUrl = this.getClass().getClassLoader().getResource(DEV_WEBAPPDIR);
         } else {
             warUrl = this.getClass().getClassLoader().getResource(PROD_WEBAPPDIR);
         }
-	    String warUrlString = warUrl.toExternalForm();
-	    server.setHandler(new WebAppContext(warUrlString, CONTEXTPATH));
+      String warUrlString = warUrl.toExternalForm();
+      server.setHandler(new WebAppContext(warUrlString, CONTEXTPATH));
 
-	    // for localhost:port/service/dashboard, etc.
-	    final Context context = new Context(server, "/service", Context.SESSIONS);
+      // for localhost:port/service/dashboard, etc.
+      final Context context = new Context(server, "/service", Context.SESSIONS);
         context.addServlet(new ServletHolder(new AuthServlet()), "/auth/*");
-	    context.addServlet(new ServletHolder(new NodesServlet()), "/nodes/*");
-	    context.addServlet(new ServletHolder(new TablesServlet()), "/tables/*");
-	    context.addServlet(new ServletHolder(new QueriesServlet()), "/queries/*");
-	    context.addServlet(new ServletHolder(new SearchServlet()), "/search/*");
+      context.addServlet(new ServletHolder(new NodesServlet()), "/nodes/*");
+      context.addServlet(new ServletHolder(new TablesServlet()), "/tables/*");
+      context.addServlet(new ServletHolder(new QueriesServlet()), "/queries/*");
+      context.addServlet(new ServletHolder(new SearchServlet()), "/search/*");
 
-	    try {
-			server.start();
-		} catch (Exception e) {
-			log.error("Error starting Blur Console Jetty Server.  Exiting", e);
-			System.exit(1);
-		}
-	}
+      try {
+      server.start();
+    } catch (Exception e) {
+      log.error("Error starting Blur Console Jetty Server.  Exiting", e);
+      System.exit(1);
+    }
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/Main.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/Main.java b/blur-console/src/main/java/org/apache/blur/console/Main.java
index 2df9783..9aabbb5 100644
--- a/blur-console/src/main/java/org/apache/blur/console/Main.java
+++ b/blur-console/src/main/java/org/apache/blur/console/Main.java
@@ -21,16 +21,16 @@ import org.apache.blur.console.util.Config;
 import org.apache.commons.lang.ArrayUtils;
 
 public class Main {
-	public static void main(String[] args) throws Exception {
-		boolean devMode = ArrayUtils.contains(args, "--dev");
-		if (devMode) {
-			Config.setupMiniCluster();
-		}
-		Config.setupConfig();
-		JettyServer server = new JettyServer(Config.getConsolePort(), devMode).start();
-		server.join();
-		if (devMode) {
-			Config.shutdownMiniCluster();
-		}
+  public static void main(String[] args) throws Exception {
+    boolean devMode = ArrayUtils.contains(args, "--dev");
+    if (devMode) {
+      Config.setupMiniCluster();
+    }
+    Config.setupConfig();
+    JettyServer server = new JettyServer(Config.getConsolePort(), devMode).start();
+    server.join();
+    if (devMode) {
+      Config.shutdownMiniCluster();
+    }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/model/ResultRow.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/model/ResultRow.java b/blur-console/src/main/java/org/apache/blur/console/model/ResultRow.java
index b8e4399..a4dc582 100644
--- a/blur-console/src/main/java/org/apache/blur/console/model/ResultRow.java
+++ b/blur-console/src/main/java/org/apache/blur/console/model/ResultRow.java
@@ -22,27 +22,27 @@ import java.util.List;
 import java.util.Map;
 
 public class ResultRow {
-	private String rowid;
-	private List<Map<String, String>> records = new ArrayList<Map<String, String>>();
+  private String rowid;
+  private List<Map<String, String>> records = new ArrayList<Map<String, String>>();
 
-	public ResultRow() {
+  public ResultRow() {
 
-	}
+  }
 
-	public ResultRow(String rowid) {
-		this.rowid = rowid;
-	}
+  public ResultRow(String rowid) {
+    this.rowid = rowid;
+  }
 
-	public String getRowid() {
-		return rowid;
-	}
-	public void setRowid(String rowid) {
-		this.rowid = rowid;
-	}
-	public List<Map<String, String>> getRecords() {
-		return records;
-	}
-	public void setRecords(List<Map<String, String>> records) {
-		this.records = records;
-	}
+  public String getRowid() {
+    return rowid;
+  }
+  public void setRowid(String rowid) {
+    this.rowid = rowid;
+  }
+  public List<Map<String, String>> getRecords() {
+    return records;
+  }
+  public void setRecords(List<Map<String, String>> records) {
+    this.records = records;
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/servlets/BaseConsoleServlet.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/servlets/BaseConsoleServlet.java b/blur-console/src/main/java/org/apache/blur/console/servlets/BaseConsoleServlet.java
index c155813..c9683d5 100644
--- a/blur-console/src/main/java/org/apache/blur/console/servlets/BaseConsoleServlet.java
+++ b/blur-console/src/main/java/org/apache/blur/console/servlets/BaseConsoleServlet.java
@@ -27,18 +27,18 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public abstract class BaseConsoleServlet extends HttpServlet {
-	private static final long serialVersionUID = -5156028303476799953L;
+  private static final long serialVersionUID = -5156028303476799953L;
     private static final Log log = LogFactory.getLog(BaseConsoleServlet.class);
     private static final String UNAUTHORIZED = "User is unauthorized to perform this action";
 
-	protected void sendError(HttpServletResponse response, Exception e) throws IOException {
-		log.error("Error processing request.", e);
-		String body = e.getMessage();
-		response.setContentType("application/json");
-		response.setContentLength(body.getBytes().length);
-		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-		IOUtils.write(body, response.getOutputStream());
-	}
+  protected void sendError(HttpServletResponse response, Exception e) throws IOException {
+    log.error("Error processing request.", e);
+    String body = e.getMessage();
+    response.setContentType("application/json");
+    response.setContentLength(body.getBytes().length);
+    response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+    IOUtils.write(body, response.getOutputStream());
+  }
 
     protected void sendUnauthorized(HttpServletResponse response) throws IOException {
         response.setContentType("application/json");
@@ -47,13 +47,13 @@ public abstract class BaseConsoleServlet extends HttpServlet {
         IOUtils.write(UNAUTHORIZED, response.getOutputStream());
     }
 
-	protected void sendGenericOk(HttpServletResponse response) throws IOException {
+  protected void sendGenericOk(HttpServletResponse response) throws IOException {
         String responseBody = "success";
-		response.setContentType("text/plain");
-		response.setContentLength(responseBody.getBytes().length);
-		response.setStatus(HttpServletResponse.SC_OK);
-		IOUtils.write(responseBody, response.getOutputStream());
-	}
+    response.setContentType("text/plain");
+    response.setContentLength(responseBody.getBytes().length);
+    response.setStatus(HttpServletResponse.SC_OK);
+    IOUtils.write(responseBody, response.getOutputStream());
+  }
 
     protected void sendNotFound(HttpServletResponse response, String path) throws IOException {
         response.setStatus(HttpServletResponse.SC_NOT_FOUND);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/servlets/NodesServlet.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/servlets/NodesServlet.java b/blur-console/src/main/java/org/apache/blur/console/servlets/NodesServlet.java
index d2e1bd4..6cb22ae 100644
--- a/blur-console/src/main/java/org/apache/blur/console/servlets/NodesServlet.java
+++ b/blur-console/src/main/java/org/apache/blur/console/servlets/NodesServlet.java
@@ -31,32 +31,32 @@ import org.apache.commons.io.IOUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 
 public class NodesServlet extends BaseConsoleServlet {
-	private static final long serialVersionUID = 6522056391102413432L;
-
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String path = req.getPathInfo();
-		if (path == null) {
-			sendNodeStatus(res);
-		} else {
-			sendNotFound(res, req.getRequestURI());
-		}
-	}
-
-	private void sendNodeStatus(HttpServletResponse response) throws IOException {
-		Map<String, Object> nodeData = new HashMap<String, Object>();
-
-		try {
-			nodeData.put("zookeepers", NodeUtil.getZookeeperStatus());
-			nodeData.put("controllers", NodeUtil.getControllerStatus());
-			nodeData.put("clusters", NodeUtil.getClusterStatus());
-		} catch (IOException e) {
-			throw new IOException(e);
-		} catch (Exception e) {
-			sendError(response, e);
-			return;
-		}
-
-		HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(nodeData), HttpUtil.JSON);
-	}
+  private static final long serialVersionUID = 6522056391102413432L;
+
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+    String path = req.getPathInfo();
+    if (path == null) {
+      sendNodeStatus(res);
+    } else {
+      sendNotFound(res, req.getRequestURI());
+    }
+  }
+
+  private void sendNodeStatus(HttpServletResponse response) throws IOException {
+    Map<String, Object> nodeData = new HashMap<String, Object>();
+
+    try {
+      nodeData.put("zookeepers", NodeUtil.getZookeeperStatus());
+      nodeData.put("controllers", NodeUtil.getControllerStatus());
+      nodeData.put("clusters", NodeUtil.getClusterStatus());
+    } catch (IOException e) {
+      throw new IOException(e);
+    } catch (Exception e) {
+      sendError(response, e);
+      return;
+    }
+
+    HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(nodeData), HttpUtil.JSON);
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/servlets/QueriesServlet.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/servlets/QueriesServlet.java b/blur-console/src/main/java/org/apache/blur/console/servlets/QueriesServlet.java
index 913c6de..dadd970 100644
--- a/blur-console/src/main/java/org/apache/blur/console/servlets/QueriesServlet.java
+++ b/blur-console/src/main/java/org/apache/blur/console/servlets/QueriesServlet.java
@@ -33,62 +33,62 @@ import org.apache.commons.io.IOUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 
 public class QueriesServlet extends BaseConsoleServlet {
-	private static final long serialVersionUID = -5725846390100596115L;
-	private static Pattern queryCancelPattern = Pattern.compile("/(.*)/cancel");
+  private static final long serialVersionUID = -5725846390100596115L;
+  private static Pattern queryCancelPattern = Pattern.compile("/(.*)/cancel");
 
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String path = req.getPathInfo();
-		Matcher m;
-		if (path == null) {
-			sendQueries(res);
-		} else if ("/performance".equalsIgnoreCase(path)) {
-			sendCurrentQueryCount(res);
-		} else if ((m = queryCancelPattern.matcher(path)).matches()) {
-			cancelQuery(res, m.group(1), req.getParameter("table"));
-		} else {
-			sendNotFound(res, req.getRequestURI());
-		}
-	}
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+    String path = req.getPathInfo();
+    Matcher m;
+    if (path == null) {
+      sendQueries(res);
+    } else if ("/performance".equalsIgnoreCase(path)) {
+      sendCurrentQueryCount(res);
+    } else if ((m = queryCancelPattern.matcher(path)).matches()) {
+      cancelQuery(res, m.group(1), req.getParameter("table"));
+    } else {
+      sendNotFound(res, req.getRequestURI());
+    }
+  }
 
-	private void sendCurrentQueryCount(HttpServletResponse response) throws IOException {
-		int count;
-		try {
-			count = QueryUtil.getCurrentQueryCount();
-		} catch (IOException e) {
-			throw new IOException(e);
-		} catch (Exception e) {
-			sendError(response, e);
-			return;
-		}
+  private void sendCurrentQueryCount(HttpServletResponse response) throws IOException {
+    int count;
+    try {
+      count = QueryUtil.getCurrentQueryCount();
+    } catch (IOException e) {
+      throw new IOException(e);
+    } catch (Exception e) {
+      sendError(response, e);
+      return;
+    }
 
-		HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(count), HttpUtil.JSON);
-	}
+    HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(count), HttpUtil.JSON);
+  }
 
-	private void sendQueries(HttpServletResponse response) throws IOException {
-		Map<String, Object> queries = new HashMap<String, Object>();
-		try {
-			queries = QueryUtil.getQueries();
-		} catch (IOException e) {
-			throw new IOException(e);
-		} catch (Exception e) {
-			sendError(response, e);
-			return;
-		}
+  private void sendQueries(HttpServletResponse response) throws IOException {
+    Map<String, Object> queries = new HashMap<String, Object>();
+    try {
+      queries = QueryUtil.getQueries();
+    } catch (IOException e) {
+      throw new IOException(e);
+    } catch (Exception e) {
+      sendError(response, e);
+      return;
+    }
 
-		HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(queries), HttpUtil.JSON);
-	}
+    HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(queries), HttpUtil.JSON);
+  }
 
-	private void cancelQuery(HttpServletResponse response, String uuid, String table) throws IOException {
-		try {
-			QueryUtil.cancelQuery(table, uuid);
-		} catch (IOException e) {
-			throw new IOException(e);
-		} catch (Exception e) {
-			sendError(response, e);
-			return;
-		}
+  private void cancelQuery(HttpServletResponse response, String uuid, String table) throws IOException {
+    try {
+      QueryUtil.cancelQuery(table, uuid);
+    } catch (IOException e) {
+      throw new IOException(e);
+    } catch (Exception e) {
+      sendError(response, e);
+      return;
+    }
 
-		sendGenericOk(response);
-	}
+    sendGenericOk(response);
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/servlets/SearchServlet.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/servlets/SearchServlet.java b/blur-console/src/main/java/org/apache/blur/console/servlets/SearchServlet.java
index 54e73e1..5452353 100644
--- a/blur-console/src/main/java/org/apache/blur/console/servlets/SearchServlet.java
+++ b/blur-console/src/main/java/org/apache/blur/console/servlets/SearchServlet.java
@@ -32,30 +32,30 @@ import org.codehaus.jackson.map.ObjectMapper;
 
 
 public class SearchServlet extends BaseConsoleServlet {
-	private static final long serialVersionUID = 8236015799570635548L;
-
-	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String path = req.getPathInfo();
-		if (path == null) {
-			String remoteHost = req.getRemoteHost();
-			search(res, req.getParameterMap(), remoteHost);
-		} else {
-			sendNotFound(res, req.getRequestURI());
-		}
-	}
-
-	private void search(HttpServletResponse res, Map<String, String[]> params, String remoteHost) throws IOException {
-		Map<String, Object> results = new HashMap<String, Object>();
-		try {
-			results = SearchUtil.search(params, remoteHost);
-		} catch (IOException e) {
-			throw new IOException(e);
-		} catch (Exception e) {
-			sendError(res, e);
-			return;
-		}
-
-		HttpUtil.sendResponse(res, new ObjectMapper().writeValueAsString(results), HttpUtil.JSON);
-	}
+  private static final long serialVersionUID = 8236015799570635548L;
+
+  @Override
+  protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+    String path = req.getPathInfo();
+    if (path == null) {
+      String remoteHost = req.getRemoteHost();
+      search(res, req.getParameterMap(), remoteHost);
+    } else {
+      sendNotFound(res, req.getRequestURI());
+    }
+  }
+
+  private void search(HttpServletResponse res, Map<String, String[]> params, String remoteHost) throws IOException {
+    Map<String, Object> results = new HashMap<String, Object>();
+    try {
+      results = SearchUtil.search(params, remoteHost);
+    } catch (IOException e) {
+      throw new IOException(e);
+    } catch (Exception e) {
+      sendError(res, e);
+      return;
+    }
+
+    HttpUtil.sendResponse(res, new ObjectMapper().writeValueAsString(results), HttpUtil.JSON);
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/servlets/TablesServlet.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/servlets/TablesServlet.java b/blur-console/src/main/java/org/apache/blur/console/servlets/TablesServlet.java
index 2fb3ecd..79aa90e 100644
--- a/blur-console/src/main/java/org/apache/blur/console/servlets/TablesServlet.java
+++ b/blur-console/src/main/java/org/apache/blur/console/servlets/TablesServlet.java
@@ -34,110 +34,110 @@ import org.apache.blur.console.util.TableUtil;
 import org.codehaus.jackson.map.ObjectMapper;
 
 public class TablesServlet extends BaseConsoleServlet {
-	private static final long serialVersionUID = -5725846390100596115L;
-	private static Pattern tableSchemaPattern = Pattern.compile("/(.*)/schema");
-	private static Pattern tableEnablePattern = Pattern.compile("/(.*)/enable");
-	private static Pattern tableDisablePattern = Pattern.compile("/(.*)/disable");
-	private static Pattern tableDeletePattern = Pattern.compile("/(.*)/delete");
-	private static Pattern tableTermsPattern = Pattern.compile("/(.*)/(.*)/(.*)/terms");
+  private static final long serialVersionUID = -5725846390100596115L;
+  private static Pattern tableSchemaPattern = Pattern.compile("/(.*)/schema");
+  private static Pattern tableEnablePattern = Pattern.compile("/(.*)/enable");
+  private static Pattern tableDisablePattern = Pattern.compile("/(.*)/disable");
+  private static Pattern tableDeletePattern = Pattern.compile("/(.*)/delete");
+  private static Pattern tableTermsPattern = Pattern.compile("/(.*)/(.*)/(.*)/terms");
 
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String path = req.getPathInfo();
-		Matcher m;
-		if (path == null) {
-			summary(res);
-		} else if ((m = tableSchemaPattern.matcher(path)).matches()) {
-			schema(res, m.group(1));
-		} else if ((m = tableTermsPattern.matcher(path)).matches()) {
-			terms(res, m.group(1), m.group(2), m.group(3), req.getParameter("startsWith"));
-		} else if ((m = tableEnablePattern.matcher(path)).matches()) {
-			enable(res, m.group(1));
-		} else if ((m = tableDisablePattern.matcher(path)).matches()) {
-			disable(res, m.group(1));
-		} else if ((m = tableDeletePattern.matcher(path)).matches()) {
-			delete(res, m.group(1), req.getParameter("includeFiles"));
-		} else {
-			sendNotFound(res, req.getRequestURI());
-		}
-	}
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+    String path = req.getPathInfo();
+    Matcher m;
+    if (path == null) {
+      summary(res);
+    } else if ((m = tableSchemaPattern.matcher(path)).matches()) {
+      schema(res, m.group(1));
+    } else if ((m = tableTermsPattern.matcher(path)).matches()) {
+      terms(res, m.group(1), m.group(2), m.group(3), req.getParameter("startsWith"));
+    } else if ((m = tableEnablePattern.matcher(path)).matches()) {
+      enable(res, m.group(1));
+    } else if ((m = tableDisablePattern.matcher(path)).matches()) {
+      disable(res, m.group(1));
+    } else if ((m = tableDeletePattern.matcher(path)).matches()) {
+      delete(res, m.group(1), req.getParameter("includeFiles"));
+    } else {
+      sendNotFound(res, req.getRequestURI());
+    }
+  }
 
-	@SuppressWarnings("rawtypes")
-	private void summary(HttpServletResponse response) throws IOException {
-		Map<String, List> tableSummaries = new HashMap<String, List>();
-		try {
-			tableSummaries = TableUtil.getTableSummaries();
-		} catch (IOException e) {
-			throw new IOException(e);
-		} catch (Exception e) {
-			sendError(response, e);
-			return;
-		}
+  @SuppressWarnings("rawtypes")
+  private void summary(HttpServletResponse response) throws IOException {
+    Map<String, List> tableSummaries = new HashMap<String, List>();
+    try {
+      tableSummaries = TableUtil.getTableSummaries();
+    } catch (IOException e) {
+      throw new IOException(e);
+    } catch (Exception e) {
+      sendError(response, e);
+      return;
+    }
 
-		HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(tableSummaries), HttpUtil.JSON);
-	}
+    HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(tableSummaries), HttpUtil.JSON);
+  }
 
-	private void schema(HttpServletResponse response, String table) throws IOException {
-		Object schema;
-		try {
-			schema = TableUtil.getSchema(table);
-		} catch (IOException e) {
-			throw new IOException(e);
-		} catch (Exception e) {
-			sendError(response, e);
-			return;
-		}
+  private void schema(HttpServletResponse response, String table) throws IOException {
+    Object schema;
+    try {
+      schema = TableUtil.getSchema(table);
+    } catch (IOException e) {
+      throw new IOException(e);
+    } catch (Exception e) {
+      sendError(response, e);
+      return;
+    }
 
-		HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(schema), HttpUtil.JSON);
-	}
+    HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(schema), HttpUtil.JSON);
+  }
 
-	private void terms(HttpServletResponse res, String table, String family, String column, String startsWith) throws IOException {
-		List<String> terms = new ArrayList<String>();
-		try {
-			terms = TableUtil.getTerms(table, family, column, startsWith);
-		} catch (IOException e) {
-			throw new IOException(e);
-		} catch (Exception e) {
-			sendError(res, e);
-			return;
-		}
+  private void terms(HttpServletResponse res, String table, String family, String column, String startsWith) throws IOException {
+    List<String> terms = new ArrayList<String>();
+    try {
+      terms = TableUtil.getTerms(table, family, column, startsWith);
+    } catch (IOException e) {
+      throw new IOException(e);
+    } catch (Exception e) {
+      sendError(res, e);
+      return;
+    }
 
-		HttpUtil.sendResponse(res, new ObjectMapper().writeValueAsString(terms), HttpUtil.JSON);
-	}
+    HttpUtil.sendResponse(res, new ObjectMapper().writeValueAsString(terms), HttpUtil.JSON);
+  }
 
-	private void enable(HttpServletResponse response, String table) throws IOException {
-		try {
-			TableUtil.enableTable(table);
-		} catch (IOException e) {
-			throw new IOException(e);
-		} catch (Exception e) {
-			sendError(response, e);
-			return;
-		}
-		sendGenericOk(response);
-	}
+  private void enable(HttpServletResponse response, String table) throws IOException {
+    try {
+      TableUtil.enableTable(table);
+    } catch (IOException e) {
+      throw new IOException(e);
+    } catch (Exception e) {
+      sendError(response, e);
+      return;
+    }
+    sendGenericOk(response);
+  }
 
-	private void disable(HttpServletResponse response, String table) throws IOException {
-		try {
-			TableUtil.disableTable(table);
-		} catch (IOException e) {
-			throw new IOException(e);
-		} catch (Exception e) {
-			sendError(response, e);
-			return;
-		}
-		sendGenericOk(response);
-	}
+  private void disable(HttpServletResponse response, String table) throws IOException {
+    try {
+      TableUtil.disableTable(table);
+    } catch (IOException e) {
+      throw new IOException(e);
+    } catch (Exception e) {
+      sendError(response, e);
+      return;
+    }
+    sendGenericOk(response);
+  }
 
-	private void delete(HttpServletResponse response, String table, String includeFiles) throws IOException {
-		try {
-			TableUtil.deleteTable(table, Boolean.parseBoolean(includeFiles));
-		} catch (IOException e) {
-			throw new IOException(e);
-		} catch (Exception e) {
-			sendError(response, e);
-			return;
-		}
-		sendGenericOk(response);
-	}
+  private void delete(HttpServletResponse response, String table, String includeFiles) throws IOException {
+    try {
+      TableUtil.deleteTable(table, Boolean.parseBoolean(includeFiles));
+    } catch (IOException e) {
+      throw new IOException(e);
+    } catch (Exception e) {
+      sendError(response, e);
+      return;
+    }
+    sendGenericOk(response);
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/util/Config.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/util/Config.java b/blur-console/src/main/java/org/apache/blur/console/util/Config.java
index d867e54..0566a4c 100644
--- a/blur-console/src/main/java/org/apache/blur/console/util/Config.java
+++ b/blur-console/src/main/java/org/apache/blur/console/util/Config.java
@@ -42,66 +42,66 @@ import org.codehaus.jackson.type.TypeReference;
 
 public class Config {
 
-	private static final File TMPDIR = new File(System.getProperty("blur.tmp.dir", "./target/mini-cluster"));
-	private static final Log log = LogFactory.getLog(Config.class);
+  private static final File TMPDIR = new File(System.getProperty("blur.tmp.dir", "./target/mini-cluster"));
+  private static final Log log = LogFactory.getLog(Config.class);
     private static final int DEFAULT_PORT = 8080;
 
-	private static int port;
-	private static BlurConfiguration blurConfig;
-	private static ZookeeperClusterStatus zk;
-	private static String blurConnection;
-	private static Object cluster;
-	private static Map<String, Map<String, String>> globalUserProperties;
+  private static int port;
+  private static BlurConfiguration blurConfig;
+  private static ZookeeperClusterStatus zk;
+  private static String blurConnection;
+  private static Object cluster;
+  private static Map<String, Map<String, String>> globalUserProperties;
     private static IProvider provider;
 
-	public static int getConsolePort() {
-		return port;
-	}
-	public static BlurConfiguration getBlurConfig() {
-		return blurConfig;
-	}
-
-	public static void setupConfig() throws IOException {
-		if (cluster == null) {
-			blurConfig = new BlurConfiguration();
-		} else {
-			blurConfig = new BlurConfiguration(false);
-
-			String zkConnection = "";
-			try {
-				Method zkMethod = cluster.getClass().getMethod("getZkConnectionString");
-				zkConnection = (String) zkMethod.invoke(cluster);
-			} catch (Exception e) {
-				log.fatal("Unable get zookeeper connection string", e);
-			}
-
-			blurConfig.set("blur.zookeeper.connection", zkConnection);
-		}
-		zk = new ZookeeperClusterStatus(blurConfig.get("blur.zookeeper.connection"), blurConfig);
-		blurConnection = buildConnectionString();
-		port = blurConfig.getInt("blur.console.port", DEFAULT_PORT);
-		parseSecurity();
+  public static int getConsolePort() {
+    return port;
+  }
+  public static BlurConfiguration getBlurConfig() {
+    return blurConfig;
+  }
+
+  public static void setupConfig() throws IOException {
+    if (cluster == null) {
+      blurConfig = new BlurConfiguration();
+    } else {
+      blurConfig = new BlurConfiguration(false);
+
+      String zkConnection = "";
+      try {
+        Method zkMethod = cluster.getClass().getMethod("getZkConnectionString");
+        zkConnection = (String) zkMethod.invoke(cluster);
+      } catch (Exception e) {
+        log.fatal("Unable get zookeeper connection string", e);
+      }
+
+      blurConfig.set("blur.zookeeper.connection", zkConnection);
+    }
+    zk = new ZookeeperClusterStatus(blurConfig.get("blur.zookeeper.connection"), blurConfig);
+    blurConnection = buildConnectionString();
+    port = blurConfig.getInt("blur.console.port", DEFAULT_PORT);
+    parseSecurity();
         setupProvider();
-	}
-
-	private static void parseSecurity() {
-		String securityFile = blurConfig.get("blur.console.security.file");
-
-		if (securityFile != null) {
-			JsonFactory factory = new JsonFactory();
-		    ObjectMapper mapper = new ObjectMapper(factory);
-		    File from = new File(securityFile);
-		    TypeReference<Map<String, Map<String, String>>> typeRef
-		            = new TypeReference<Map<String, Map<String, String>>>() { };
-
-		    try {
-				globalUserProperties = mapper.readValue(from, typeRef);
-			} catch (Exception e) {
-				log.error("Unable to parse security file.  Search may not work right.", e);
-				globalUserProperties = null;
-			}
-		}
-	}
+  }
+
+  private static void parseSecurity() {
+    String securityFile = blurConfig.get("blur.console.security.file");
+
+    if (securityFile != null) {
+      JsonFactory factory = new JsonFactory();
+        ObjectMapper mapper = new ObjectMapper(factory);
+        File from = new File(securityFile);
+        TypeReference<Map<String, Map<String, String>>> typeRef
+                = new TypeReference<Map<String, Map<String, String>>>() { };
+
+        try {
+        globalUserProperties = mapper.readValue(from, typeRef);
+      } catch (Exception e) {
+        log.error("Unable to parse security file.  Search may not work right.", e);
+        globalUserProperties = null;
+      }
+    }
+  }
 
     private static void setupProvider() {
         String providerClassName = blurConfig.get("blur.console.auth.provider", "org.apache.blur.console.providers.AllAllowedProvider");
@@ -119,65 +119,65 @@ public class Config {
         }
     }
 
-	public static String getConnectionString() throws IOException {
-		return blurConnection;
-	}
-
-	public static ZookeeperClusterStatus getZookeeper() {
-		return zk;
-	}
-
-	private static String buildConnectionString() {
-		List<String> allControllers = new ArrayList<String>();
-		allControllers = zk.getControllerServerList();
-		return StringUtils.join(allControllers, ",");
-	}
-
-	public static void shutdownMiniCluster() throws IOException {
-		if (cluster != null) {
-			try {
-				Method method = cluster.getClass().getMethod("shutdownBlurCluster");
-				method.invoke(cluster);
-			} catch (Exception e) {
-				log.fatal("Unable to stop mini cluster through reflection.", e);
-			}
-			File file = new File(TMPDIR, "blur-cluster-test");
-			if (file.exists()) {
-				FileUtils.deleteDirectory(file);
-			}
-		}
-	}
-
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public static void setupMiniCluster() throws IOException {
-	    File testDirectory = new File(TMPDIR, "blur-cluster-test").getAbsoluteFile();
-	    testDirectory.mkdirs();
-
-	    testDirectory.delete();
-	    try {
-	    	Class clusterClass = Class.forName("org.apache.blur.MiniCluster", false, Config.class.getClassLoader());
-
-		    if (clusterClass != null) {
-		    	cluster = clusterClass.newInstance();
-		    	Method startBlurCluster = clusterClass.getDeclaredMethod("startBlurCluster", String.class, int.class, int.class, boolean.class);
-		    	startBlurCluster.invoke(cluster, new File(testDirectory, "cluster").getAbsolutePath(), 2, 3, true);
-		    }
-	    } catch (Exception e) {
-	    	log.fatal("Unable to start in dev mode because MiniCluster isn't in classpath", e);
-	    	cluster = null;
-	    }
-	}
-
-	public static Iface getClient(String username, String securityUser) throws IOException {
-		Iface client = BlurClient.getClient(getConnectionString());
-
-		if (globalUserProperties != null && globalUserProperties.get(securityUser) != null) {
-			UserContext.setUser(new User(username, globalUserProperties.get(securityUser)));
-		}
-
-		return client;
-	}
+  public static String getConnectionString() throws IOException {
+    return blurConnection;
+  }
+
+  public static ZookeeperClusterStatus getZookeeper() {
+    return zk;
+  }
+
+  private static String buildConnectionString() {
+    List<String> allControllers = new ArrayList<String>();
+    allControllers = zk.getControllerServerList();
+    return StringUtils.join(allControllers, ",");
+  }
+
+  public static void shutdownMiniCluster() throws IOException {
+    if (cluster != null) {
+      try {
+        Method method = cluster.getClass().getMethod("shutdownBlurCluster");
+        method.invoke(cluster);
+      } catch (Exception e) {
+        log.fatal("Unable to stop mini cluster through reflection.", e);
+      }
+      File file = new File(TMPDIR, "blur-cluster-test");
+      if (file.exists()) {
+        FileUtils.deleteDirectory(file);
+      }
+    }
+  }
+
+
+  @SuppressWarnings({ "unchecked", "rawtypes" })
+  public static void setupMiniCluster() throws IOException {
+      File testDirectory = new File(TMPDIR, "blur-cluster-test").getAbsoluteFile();
+      testDirectory.mkdirs();
+
+      testDirectory.delete();
+      try {
+        Class clusterClass = Class.forName("org.apache.blur.MiniCluster", false, Config.class.getClassLoader());
+
+        if (clusterClass != null) {
+          cluster = clusterClass.newInstance();
+          Method startBlurCluster = clusterClass.getDeclaredMethod("startBlurCluster", String.class, int.class, int.class, boolean.class);
+          startBlurCluster.invoke(cluster, new File(testDirectory, "cluster").getAbsolutePath(), 2, 3, true);
+        }
+      } catch (Exception e) {
+        log.fatal("Unable to start in dev mode because MiniCluster isn't in classpath", e);
+        cluster = null;
+      }
+  }
+
+  public static Iface getClient(String username, String securityUser) throws IOException {
+    Iface client = BlurClient.getClient(getConnectionString());
+
+    if (globalUserProperties != null && globalUserProperties.get(securityUser) != null) {
+      UserContext.setUser(new User(username, globalUserProperties.get(securityUser)));
+    }
+
+    return client;
+  }
 
     public static boolean isClusterSetup() {
         return cluster != null;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/util/HttpUtil.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/util/HttpUtil.java b/blur-console/src/main/java/org/apache/blur/console/util/HttpUtil.java
index 32690e5..cced9d3 100644
--- a/blur-console/src/main/java/org/apache/blur/console/util/HttpUtil.java
+++ b/blur-console/src/main/java/org/apache/blur/console/util/HttpUtil.java
@@ -24,15 +24,15 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.io.IOUtils;
 
 public class HttpUtil {
-	public static final String JSON = "application/json";
-	public static final String TEXT = "plain/text";
+  public static final String JSON = "application/json";
+  public static final String TEXT = "plain/text";
 
-	public static void sendResponse(HttpServletResponse res, String body, String contentType) throws IOException {
-		res.setContentType(contentType);
-		res.setContentLength(body.getBytes().length);
-		res.setStatus(HttpServletResponse.SC_OK);
-		IOUtils.write(body, res.getOutputStream());
-	}
+  public static void sendResponse(HttpServletResponse res, String body, String contentType) throws IOException {
+    res.setContentType(contentType);
+    res.setContentLength(body.getBytes().length);
+    res.setStatus(HttpServletResponse.SC_OK);
+    IOUtils.write(body, res.getOutputStream());
+  }
 
     public static String getFirstParam(String[] param) {
         if (param == null || param.length == 0) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java b/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java
index 4b59adb..b6d2e07 100644
--- a/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java
+++ b/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java
@@ -37,107 +37,107 @@ import org.apache.commons.collections.CollectionUtils;
 
 public class NodeUtil {
 
-	@SuppressWarnings("unchecked")
-	public static Map<String, Object> getControllerStatus() throws IOException {
-		ZookeeperClusterStatus zk = Config.getZookeeper();
-
-		List<String> allControllers = new ArrayList<String>();
-		List<String> oControllers = new ArrayList<String>();
-		allControllers = zk.getOnlineControllerList();
-		oControllers = zk.getControllerServerList();
-
-		Collection<String> onlineControllers = CollectionUtils.intersection(allControllers, oControllers);
-		Collection<String> offlineControllers = CollectionUtils.subtract(allControllers, oControllers);
-
-		Map<String, Object> data = new HashMap<String, Object>();
-
-		data.put("online", onlineControllers);
-		data.put("offline", offlineControllers);
-
-		return data;
-	}
-
-	public static List<Map<String, Object>> getClusterStatus() throws IOException {
-		ZookeeperClusterStatus zk = Config.getZookeeper();
-
-		List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
-		List<String> clusters = zk.getClusterList(false);
-
-		for (String cluster : clusters) {
-			Map<String, Object> clusterObj = new HashMap<String, Object>();
-			clusterObj.put("name", cluster);
-
-			List<String> offlineShardServers = zk.getOfflineShardServers(false, cluster);
-			List<String> onlineShardServers = zk.getOnlineShardServers(false, cluster);
-
-			clusterObj.put("online", onlineShardServers);
-			clusterObj.put("offline", offlineShardServers);
-
-			data.add(clusterObj);
-		}
-
-		return data;
-	}
-
-	public static Map<String, Object> getZookeeperStatus() throws IOException {
-		String[] connections = Config.getBlurConfig().get("blur.zookeeper.connection").split(",");
-		Set<String> onlineZookeepers = new HashSet<String>();
-		Set<String> offlineZookeepers = new HashSet<String>();
-
-		for (String connection : connections) {
-			Socket socket = null;
-			InputStream response = null;
-			OutputStream question = null;
-			try {
-				URI parsedConnection = new URI("my://" + connection);
-				String host = parsedConnection.getHost();
-				int port = parsedConnection.getPort() >= 0 ? parsedConnection.getPort() : 2181;
-				byte[] reqBytes = new byte[4];
-				ByteBuffer req = ByteBuffer.wrap(reqBytes);
-				req.putInt(ByteBuffer.wrap("ruok".getBytes()).getInt());
-				socket = new Socket();
-				socket.setSoLinger(false, 10);
-				socket.setSoTimeout(20000);
-				parsedConnection.getPort();
-				socket.connect(new InetSocketAddress(host, port));
-
-				response = socket.getInputStream();
-				question = socket.getOutputStream();
-
-				question.write(reqBytes);
-
-				byte[] resBytes = new byte[4];
-
-				response.read(resBytes);
-				String status = new String(resBytes);
-				if (status.equals("imok")) {
-					onlineZookeepers.add(connection);
-				} else {
-					offlineZookeepers.add(connection);
-				}
-				socket.close();
-				response.close();
-				question.close();
-			} catch (Exception e) {
-				offlineZookeepers.add(connection);
-			} finally {
-				if (socket != null) {
-					socket.close();
-				}
-				if (response != null) {
-					response.close();
-				}
-				if (question != null) {
-					question.close();
-				}
-			}
-		}
-
-		Map<String, Object> data = new HashMap<String, Object>();
-
-		data.put("online", onlineZookeepers);
-		data.put("offline", offlineZookeepers);
-
-		return data;
-	}
+  @SuppressWarnings("unchecked")
+  public static Map<String, Object> getControllerStatus() throws IOException {
+    ZookeeperClusterStatus zk = Config.getZookeeper();
+
+    List<String> allControllers = new ArrayList<String>();
+    List<String> oControllers = new ArrayList<String>();
+    allControllers = zk.getOnlineControllerList();
+    oControllers = zk.getControllerServerList();
+
+    Collection<String> onlineControllers = CollectionUtils.intersection(allControllers, oControllers);
+    Collection<String> offlineControllers = CollectionUtils.subtract(allControllers, oControllers);
+
+    Map<String, Object> data = new HashMap<String, Object>();
+
+    data.put("online", onlineControllers);
+    data.put("offline", offlineControllers);
+
+    return data;
+  }
+
+  public static List<Map<String, Object>> getClusterStatus() throws IOException {
+    ZookeeperClusterStatus zk = Config.getZookeeper();
+
+    List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+    List<String> clusters = zk.getClusterList(false);
+
+    for (String cluster : clusters) {
+      Map<String, Object> clusterObj = new HashMap<String, Object>();
+      clusterObj.put("name", cluster);
+
+      List<String> offlineShardServers = zk.getOfflineShardServers(false, cluster);
+      List<String> onlineShardServers = zk.getOnlineShardServers(false, cluster);
+
+      clusterObj.put("online", onlineShardServers);
+      clusterObj.put("offline", offlineShardServers);
+
+      data.add(clusterObj);
+    }
+
+    return data;
+  }
+
+  public static Map<String, Object> getZookeeperStatus() throws IOException {
+    String[] connections = Config.getBlurConfig().get("blur.zookeeper.connection").split(",");
+    Set<String> onlineZookeepers = new HashSet<String>();
+    Set<String> offlineZookeepers = new HashSet<String>();
+
+    for (String connection : connections) {
+      Socket socket = null;
+      InputStream response = null;
+      OutputStream question = null;
+      try {
+        URI parsedConnection = new URI("my://" + connection);
+        String host = parsedConnection.getHost();
+        int port = parsedConnection.getPort() >= 0 ? parsedConnection.getPort() : 2181;
+        byte[] reqBytes = new byte[4];
+        ByteBuffer req = ByteBuffer.wrap(reqBytes);
+        req.putInt(ByteBuffer.wrap("ruok".getBytes()).getInt());
+        socket = new Socket();
+        socket.setSoLinger(false, 10);
+        socket.setSoTimeout(20000);
+        parsedConnection.getPort();
+        socket.connect(new InetSocketAddress(host, port));
+
+        response = socket.getInputStream();
+        question = socket.getOutputStream();
+
+        question.write(reqBytes);
+
+        byte[] resBytes = new byte[4];
+
+        response.read(resBytes);
+        String status = new String(resBytes);
+        if (status.equals("imok")) {
+          onlineZookeepers.add(connection);
+        } else {
+          offlineZookeepers.add(connection);
+        }
+        socket.close();
+        response.close();
+        question.close();
+      } catch (Exception e) {
+        offlineZookeepers.add(connection);
+      } finally {
+        if (socket != null) {
+          socket.close();
+        }
+        if (response != null) {
+          response.close();
+        }
+        if (question != null) {
+          question.close();
+        }
+      }
+    }
+
+    Map<String, Object> data = new HashMap<String, Object>();
+
+    data.put("online", onlineZookeepers);
+    data.put("offline", offlineZookeepers);
+
+    return data;
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/util/QueryUtil.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/util/QueryUtil.java b/blur-console/src/main/java/org/apache/blur/console/util/QueryUtil.java
index 6c6942f..13887fa 100644
--- a/blur-console/src/main/java/org/apache/blur/console/util/QueryUtil.java
+++ b/blur-console/src/main/java/org/apache/blur/console/util/QueryUtil.java
@@ -31,64 +31,64 @@ import org.apache.blur.thrift.generated.Status;
 
 public class QueryUtil {
 
-	public static int getCurrentQueryCount() throws IOException, TException {
-		Iface client = BlurClient.getClient(Config.getConnectionString());
+  public static int getCurrentQueryCount() throws IOException, TException {
+    Iface client = BlurClient.getClient(Config.getConnectionString());
 
-		int count = 0;
-		List<String> tableList = client.tableList();
-		for (String table : tableList) {
-			List<String> queries = client.queryStatusIdList(table);
-			count += queries.size();
-		}
+    int count = 0;
+    List<String> tableList = client.tableList();
+    for (String table : tableList) {
+      List<String> queries = client.queryStatusIdList(table);
+      count += queries.size();
+    }
 
-		return count;
-	}
+    return count;
+  }
 
-	public static Map<String, Object> getQueries() throws TException, IOException {
-		Map<String, Object> queriesInfo = new HashMap<String, Object>();
+  public static Map<String, Object> getQueries() throws TException, IOException {
+    Map<String, Object> queriesInfo = new HashMap<String, Object>();
 
-		int slow = 0;
+    int slow = 0;
 
-		List<Map<String, Object>> queries = new ArrayList<Map<String, Object>>();
+    List<Map<String, Object>> queries = new ArrayList<Map<String, Object>>();
 
-		Iface client = BlurClient.getClient(Config.getConnectionString());
-		List<String> tableList = client.tableList();
+    Iface client = BlurClient.getClient(Config.getConnectionString());
+    List<String> tableList = client.tableList();
 
-		for (String table : tableList) {
-			List<String> queriesForTable = client.queryStatusIdList(table);
-			for (String id : queriesForTable) {
-				BlurQueryStatus status = client.queryStatusById(table, id);
+    for (String table : tableList) {
+      List<String> queriesForTable = client.queryStatusIdList(table);
+      for (String id : queriesForTable) {
+        BlurQueryStatus status = client.queryStatusById(table, id);
 
-				if (Status.FOUND.equals(status.getStatus())) {
-					Map<String, Object> info = new HashMap<String, Object>();
-					info.put("uuid", id);
-					info.put("user", status.getQuery().getUserContext());
-					info.put("query", status.getQuery().getQuery().getQuery());
-					info.put("table", table);
-					info.put("state", status.getState().getValue());
-					info.put("percent", ((double) status.getCompleteShards()) / ((double) status.getTotalShards()) * 100);
+        if (Status.FOUND.equals(status.getStatus())) {
+          Map<String, Object> info = new HashMap<String, Object>();
+          info.put("uuid", id);
+          info.put("user", status.getQuery().getUserContext());
+          info.put("query", status.getQuery().getQuery().getQuery());
+          info.put("table", table);
+          info.put("state", status.getState().getValue());
+          info.put("percent", ((double) status.getCompleteShards()) / ((double) status.getTotalShards()) * 100);
 
 
-					long startTime = status.getQuery().getStartTime();
-					info.put("startTime", startTime);
-					queries.add(info);
+          long startTime = status.getQuery().getStartTime();
+          info.put("startTime", startTime);
+          queries.add(info);
 
-					if (System.currentTimeMillis() - startTime > 60000) {
-						slow++;
-					}
-				}
-			}
-		}
+          if (System.currentTimeMillis() - startTime > 60000) {
+            slow++;
+          }
+        }
+      }
+    }
 
-		queriesInfo.put("slowQueries", slow);
-		queriesInfo.put("queries", queries);
+    queriesInfo.put("slowQueries", slow);
+    queriesInfo.put("queries", queries);
 
-		return queriesInfo;
-	}
+    return queriesInfo;
+  }
 
-	public static void cancelQuery(String table, String uuid) throws IOException, TException {
-		Iface client = BlurClient.getClient(Config.getConnectionString());
+  public static void cancelQuery(String table, String uuid) throws IOException, TException {
+    Iface client = BlurClient.getClient(Config.getConnectionString());
 
-		client.cancelQuery(table, uuid);
-	}
+    client.cancelQuery(table, uuid);
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79786aca/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java b/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java
index 4eccab9..adf02b8 100644
--- a/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java
+++ b/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java
@@ -45,196 +45,196 @@ import org.apache.commons.lang.StringUtils;
  */
 
 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, TException {
-		String table = HttpUtil.getFirstParam(params.get("table"));
-		String query = HttpUtil.getFirstParam(params.get("query"));
-		String rowQuery = HttpUtil.getFirstParam(params.get("rowRecordOption"));
-		String start = HttpUtil.getFirstParam(params.get("start"));
-		String fetch = HttpUtil.getFirstParam(params.get("fetch"));
-		String[] families = params.get("families[]");
-        String securityUser = HttpUtil.getFirstParam(params.get("securityUser"));
-
-		if (query.indexOf("rowid:") >= 0) {
-			return fetchRow(table, query, families, remoteHost, securityUser);
-		}
-
-		if (families == null || families.length == 0) {
-			return fullTextSearch(table, query, remoteHost, securityUser);
-		}
-
-		return searchAndFetch(table, query, rowQuery, start, fetch, families, remoteHost, securityUser);
-	}
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private static Map<String, Object> searchAndFetch(String table, String query, String rowQuery, String start, String fetch, String[] families, String remoteHost, String securityUser) throws IOException, TException {
-		try {
-			Iface client = Config.getClient(remoteHost, securityUser);
-
-			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));
-            blurQuery.setUserContext(remoteHost);
-
-			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, String securityUser) throws IOException, TException {
-		try {
-			Iface client = Config.getClient(remoteHost, securityUser);
-
-			BlurQuery blurQuery = new BlurQuery();
-
-			Query q = new Query(query, true, ScoreType.SUPER, null, null);
-			blurQuery.setQuery(q);
-            blurQuery.setUserContext(remoteHost);
-			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, String securityUser) throws IOException, TException {
-		try {
-			Iface client = Config.getClient(remoteHost, securityUser);
-
-			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;
-	}
+  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, TException {
+    String table = HttpUtil.getFirstParam(params.get("table"));
+    String query = HttpUtil.getFirstParam(params.get("query"));
+    String rowQuery = HttpUtil.getFirstParam(params.get("rowRecordOption"));
+    String start = HttpUtil.getFirstParam(params.get("start"));
+    String fetch = HttpUtil.getFirstParam(params.get("fetch"));
+    String[] families = params.get("families[]");
+    String securityUser = HttpUtil.getFirstParam(params.get("securityUser"));
+
+    if (query.indexOf("rowid:") >= 0) {
+      return fetchRow(table, query, families, remoteHost, securityUser);
+    }
+
+    if (families == null || families.length == 0) {
+      return fullTextSearch(table, query, remoteHost, securityUser);
+    }
+
+    return searchAndFetch(table, query, rowQuery, start, fetch, families, remoteHost, securityUser);
+  }
+
+  @SuppressWarnings({ "unchecked", "rawtypes" })
+  private static Map<String, Object> searchAndFetch(String table, String query, String rowQuery, String start, String fetch, String[] families, String remoteHost, String securityUser) throws IOException, TException {
+    try {
+      Iface client = Config.getClient(remoteHost, securityUser);
+
+      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));
+      blurQuery.setUserContext(remoteHost);
+
+      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, String securityUser) throws IOException, TException {
+    try {
+      Iface client = Config.getClient(remoteHost, securityUser);
+
+      BlurQuery blurQuery = new BlurQuery();
+
+      Query q = new Query(query, true, ScoreType.SUPER, null, null);
+      blurQuery.setQuery(q);
+      blurQuery.setUserContext(remoteHost);
+      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, String securityUser) throws IOException, TException {
+    try {
+      Iface client = Config.getClient(remoteHost, securityUser);
+
+      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;
+  }
 }


Mime
View raw message