incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [2/2] git commit: Code reformat to standardize, sorry
Date Wed, 09 Jul 2014 18:58:28 GMT
Code reformat to standardize, sorry


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

Branch: refs/heads/apache-blur-0.2
Commit: a8c4cd0181b96ad6c8bc3f3ea0b4f2cd517a2d35
Parents: dd91c92
Author: Chris Rohr <rohr.chris@gmail.com>
Authored: Wed Jul 9 14:58:19 2014 -0400
Committer: Chris Rohr <rohr.chris@gmail.com>
Committed: Wed Jul 9 14:58:19 2014 -0400

----------------------------------------------------------------------
 blur-console/checkstyle.xml                     | 217 ++++++++++---------
 blur-console/pom.xml                            | 200 ++++++++---------
 blur-console/src/assemble/webapp.xml            |   4 +-
 .../org/apache/blur/console/JettyServer.java    |  40 ++--
 .../main/java/org/apache/blur/console/Main.java |   2 +-
 .../apache/blur/console/model/ResultRow.java    |   3 +
 .../org/apache/blur/console/model/User.java     |  70 +++---
 .../console/providers/AllAllowedProvider.java   |  72 +++---
 .../blur/console/providers/IProvider.java       |  34 +--
 .../blur/console/servlets/AuthServlet.java      | 114 +++++-----
 .../console/servlets/BaseConsoleServlet.java    |  35 ++-
 .../blur/console/servlets/NodesServlet.java     |  14 +-
 .../blur/console/servlets/QueriesServlet.java   |  16 +-
 .../blur/console/servlets/SearchServlet.java    |  14 +-
 .../blur/console/servlets/TablesServlet.java    |  15 +-
 .../org/apache/blur/console/util/Config.java    |  96 ++++----
 .../org/apache/blur/console/util/HttpUtil.java  |  15 +-
 .../org/apache/blur/console/util/NodeUtil.java  |  14 +-
 .../org/apache/blur/console/util/QueryUtil.java |  12 +-
 .../apache/blur/console/util/SearchUtil.java    |  35 +--
 .../org/apache/blur/console/util/TableUtil.java |  12 +-
 blur-console/src/main/resources/log4j.xml       |  20 +-
 blur-console/src/main/webapp/index.html         |  96 ++++----
 blur-console/src/main/webapp/public/index.html  |  96 ++++----
 .../main/webapp/public/views/dashboard.tpl.html |  79 ++++---
 .../main/webapp/public/views/queries.tpl.html   |  26 +--
 .../main/webapp/public/views/search.tpl.html    |  46 ++--
 .../src/main/webapp/views/dashboard.tpl.html    |  79 ++++---
 .../src/main/webapp/views/queries.tpl.html      |  26 +--
 .../src/main/webapp/views/search.tpl.html       |  46 ++--
 .../apache/blur/console/ConsoleTestBase.java    |   6 +-
 .../apache/blur/console/ConsoleTestSuite.java   |  16 +-
 .../org/apache/blur/console/RunMiniCluster.java |   6 +-
 .../apache/blur/console/util/ConfigTest.java    |  16 +-
 .../apache/blur/console/util/NodeUtilTest.java  |  24 +-
 .../apache/blur/console/util/QueryUtilTest.java |  64 +++---
 .../apache/blur/console/util/TableUtilTest.java |  38 ++--
 37 files changed, 857 insertions(+), 861 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/checkstyle.xml
----------------------------------------------------------------------
diff --git a/blur-console/checkstyle.xml b/blur-console/checkstyle.xml
index 4e448ae..378a5de 100644
--- a/blur-console/checkstyle.xml
+++ b/blur-console/checkstyle.xml
@@ -10,126 +10,127 @@
   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">
+    "-//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 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"/>
+
+  <!-- Checks for Size Violations.                    -->
+  <!-- See http://checkstyle.sf.net/config_sizes.html -->
+  <module name="FileLength"/>
+
+  <!-- Checks for whitespace                               -->
+  <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+  <module name="FileTabCharacter"/>
+
+  <!-- Miscellaneous other checks.                   -->
+  <!-- See http://checkstyle.sf.net/config_misc.html -->
+  <module name="RegexpSingleline">
+    <property name="format" value="\s+$"/>
+    <property name="minimum" value="0"/>
+    <property name="maximum" value="0"/>
+    <property name="message" value="Line has trailing spaces."/>
+  </module>
+
+  <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 that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
 
     <!-- Checks for Size Violations.                    -->
     <!-- See http://checkstyle.sf.net/config_sizes.html -->
-    <module name="FileLength"/>
+    <module name="LineLength">
+      <property name="max" value="120"/>
+    </module>
+    <module name="MethodLength"/>
+    <module name="ParameterNumber"/>
+
 
     <!-- Checks for whitespace                               -->
     <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter"/>
+    <module name="EmptyForIteratorPad"/>
+    <module name="GenericWhitespace"/>
+    <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="AvoidInlineConditionals"/>
+    <module name="EmptyStatement"/>
+    <module name="EqualsHashCode"/>
+    <module name="HiddenField">
+      <property name="ignoreSetter" value="true"/>
+      <property name="ignoreConstructorParameter" value="true"/>
+    </module>
+    <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="FinalClass"/>
+    <module name="HideUtilityClassConstructor"/>
+    <module name="InterfaceIsType"/>
+    <module name="VisibilityModifier"/>
+
 
     <!-- Miscellaneous other checks.                   -->
     <!-- See http://checkstyle.sf.net/config_misc.html -->
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has trailing spaces."/>
-    </module>
-
-    <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="LineLength">
-            <property name="max" value="120"/>
-        </module>
-        <module name="MethodLength"/>
-        <module name="ParameterNumber"/>
-
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="GenericWhitespace"/>
-        <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="AvoidInlineConditionals"/>
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <module name="HiddenField">
-            <property name="ignoreSetter" value="true"/>
-            <property name="ignoreConstructorParameter" value="true"/>
-        </module>
-        <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="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier"/>
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
+    <module name="ArrayTypeStyle"/>
+    <module name="TodoComment"/>
+    <module name="UpperEll"/>
 
-    </module>
+  </module>
 
 </module>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/pom.xml
----------------------------------------------------------------------
diff --git a/blur-console/pom.xml b/blur-console/pom.xml
index dce7499..93f5ec0 100644
--- a/blur-console/pom.xml
+++ b/blur-console/pom.xml
@@ -10,7 +10,7 @@
   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>
 
@@ -113,10 +113,10 @@
         <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-jxr-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -136,105 +136,105 @@
           <target>1.6</target>
         </configuration>
       </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.blur.console.Main</mainClass>
-                        </manifest>
-                    </archive>
-                    <descriptors>
-                        <descriptor>src/assemble/webapp.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </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>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.3</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <!--<version>2.6</version>-->
-                <configuration>
-                    <instrumentation>
-                        <excludes>
-                            <exclude>org/apache/blur/console/**/*Test.class</exclude>
-                        </excludes>
-                    </instrumentation>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>org.apache.blur.console.Main</mainClass>
+            </manifest>
+          </archive>
+          <descriptors>
+            <descriptor>src/assemble/webapp.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </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>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.3</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <!--<version>2.6</version>-->
+        <configuration>
+          <instrumentation>
+            <excludes>
+              <exclude>org/apache/blur/console/**/*Test.class</exclude>
+            </excludes>
+          </instrumentation>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
-    <reporting>
-        <plugins>
-            <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-surefire-report-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <configuration>
-                    <formats>
-                        <format>html</format>
-                        <format>xml</format>
-                    </formats>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
+  <reporting>
+    <plugins>
+      <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-surefire-report-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <configuration>
+          <formats>
+            <format>html</format>
+            <format>xml</format>
+          </formats>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
 
-    <profiles>
-        <profile>
-            <id>hadoop1</id>
-            <activation>
-                <property>
-                    <name>hadoop1</name>
-                </property>
-            </activation>
-            <properties>
-                <projectVersion>${project.parent.version}-hadoop1</projectVersion>
-            </properties>
+  <profiles>
+    <profile>
+      <id>hadoop1</id>
+      <activation>
+        <property>
+          <name>hadoop1</name>
+        </property>
+      </activation>
+      <properties>
+        <projectVersion>${project.parent.version}-hadoop1</projectVersion>
+      </properties>
       <dependencies>
         <dependency>
           <groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/assemble/webapp.xml
----------------------------------------------------------------------
diff --git a/blur-console/src/assemble/webapp.xml b/blur-console/src/assemble/webapp.xml
index 2d69a71..5650175 100644
--- a/blur-console/src/assemble/webapp.xml
+++ b/blur-console/src/assemble/webapp.xml
@@ -17,8 +17,8 @@ specific language governing permissions and limitations
 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">
+          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">
   <id>webapp</id>
   <formats>
     <format>jar</format>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 5158e28..b05c3eb 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
@@ -32,11 +32,11 @@ public class JettyServer {
   private Server server;
   private boolean devMode;
 
-    private static final String DEV_WEBAPPDIR = "../classes/";
-    private static final String PROD_WEBAPPDIR = "webapp/";
-    private static final String CONTEXTPATH = "/console";
+  private static final String DEV_WEBAPPDIR = "../classes/";
+  private static final String PROD_WEBAPPDIR = "webapp/";
+  private static final String CONTEXTPATH = "/console";
 
-    private final Log log = LogFactory.getLog(JettyServer.class);
+  private final Log log = LogFactory.getLog(JettyServer.class);
 
   public JettyServer(int port, boolean devMode) {
     this.port = port;
@@ -60,24 +60,24 @@ public class JettyServer {
     server = new Server(port);
 
     // 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));
+    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));
 
-      // 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/*");
+    // 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/*");
 
-      try {
+    try {
       server.start();
     } catch (Exception e) {
       log.error("Error starting Blur Console Jetty Server.  Exiting", e);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 9aabbb5..53ecd4d 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
@@ -32,5 +32,5 @@ public class Main {
     if (devMode) {
       Config.shutdownMiniCluster();
     }
-    }
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 a4dc582..1b5816f 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
@@ -36,12 +36,15 @@ public class ResultRow {
   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/a8c4cd01/blur-console/src/main/java/org/apache/blur/console/model/User.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/model/User.java b/blur-console/src/main/java/org/apache/blur/console/model/User.java
index 2625f7f..5165e62 100644
--- a/blur-console/src/main/java/org/apache/blur/console/model/User.java
+++ b/blur-console/src/main/java/org/apache/blur/console/model/User.java
@@ -20,50 +20,50 @@ package org.apache.blur.console.model;
 import java.util.List;
 
 public class User {
-    protected String authToken;
-    protected String name;
-    protected String email;
-    protected String password;
-    protected List<String> roles;
+  protected String authToken;
+  protected String name;
+  protected String email;
+  protected String password;
+  protected List<String> roles;
 
-    public String getAuthToken() {
-        return authToken;
-    }
+  public String getAuthToken() {
+    return authToken;
+  }
 
-    public void setAuthToken(String authToken) {
-        this.authToken = authToken;
-    }
+  public void setAuthToken(String authToken) {
+    this.authToken = authToken;
+  }
 
-    public String getName() {
-        return name;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public void setName(String name) {
-        this.name = name;
-    }
+  public void setName(String name) {
+    this.name = name;
+  }
 
-    public String getEmail() {
-        return email;
-    }
+  public String getEmail() {
+    return email;
+  }
 
-    public void setEmail(String email) {
-        this.email = email;
-    }
+  public void setEmail(String email) {
+    this.email = email;
+  }
 
-    public String getPassword() {
-        return password;
-    }
+  public String getPassword() {
+    return password;
+  }
 
-    public void setPassword(String password) {
-        this.password = password;
-    }
+  public void setPassword(String password) {
+    this.password = password;
+  }
 
-    public List<String> getRoles() {
-        return roles;
-    }
+  public List<String> getRoles() {
+    return roles;
+  }
 
-    public void setRoles(List<String> roles) {
-        this.roles = roles;
-    }
+  public void setRoles(List<String> roles) {
+    this.roles = roles;
+  }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/main/java/org/apache/blur/console/providers/AllAllowedProvider.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/providers/AllAllowedProvider.java b/blur-console/src/main/java/org/apache/blur/console/providers/AllAllowedProvider.java
index 6086a7e..fced5fe 100644
--- a/blur-console/src/main/java/org/apache/blur/console/providers/AllAllowedProvider.java
+++ b/blur-console/src/main/java/org/apache/blur/console/providers/AllAllowedProvider.java
@@ -22,53 +22,51 @@ import org.apache.blur.console.model.User;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
 
 public class AllAllowedProvider implements IProvider {
 
-    @Override
-    public User login(HttpServletRequest request) {
-        return null;
-    }
+  @Override
+  public User login(HttpServletRequest request) {
+    return null;
+  }
 
-    @Override
-    public User getUser(String token) {
-        return null;
-    }
+  @Override
+  public User getUser(String token) {
+    return null;
+  }
 
-    @Override
-    public User getUser(String token, HttpServletRequest request) {
-        return null;
-    }
+  @Override
+  public User getUser(String token, HttpServletRequest request) {
+    return null;
+  }
 
-    @Override
-    public boolean isValidToken(String token, HttpServletRequest request) {
-        return true;
-    }
+  @Override
+  public boolean isValidToken(String token, HttpServletRequest request) {
+    return true;
+  }
 
-    @Override
-    public boolean userHasRole(User user, String role) {
-        return false;
-    }
+  @Override
+  public boolean userHasRole(User user, String role) {
+    return false;
+  }
 
-    @Override
-    public void setupProvider(BlurConfiguration config) {
+  @Override
+  public void setupProvider(BlurConfiguration config) {
 
-    }
+  }
 
-    @Override
-    public Map<String, Map<String, Object>> getLoginFields() {
-        return null;
-    }
+  @Override
+  public Map<String, Map<String, Object>> getLoginFields() {
+    return null;
+  }
 
-    @Override
-    public boolean isLoginRequired() {
-        return false;
-    }
+  @Override
+  public boolean isLoginRequired() {
+    return false;
+  }
 
-    @Override
-    public boolean isRetryAllowed() {
-        return false;
-    }
+  @Override
+  public boolean isRetryAllowed() {
+    return false;
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/main/java/org/apache/blur/console/providers/IProvider.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/providers/IProvider.java b/blur-console/src/main/java/org/apache/blur/console/providers/IProvider.java
index 9381a00..02e0baa 100644
--- a/blur-console/src/main/java/org/apache/blur/console/providers/IProvider.java
+++ b/blur-console/src/main/java/org/apache/blur/console/providers/IProvider.java
@@ -24,17 +24,25 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 public interface IProvider {
-    public static final String INPUT_FIELD = "input";
-    public static final String PASSWORD_FIELD = "password";
-    public static final String BROWSER_PROVIDED = "browser";
-
-    public User login(HttpServletRequest request);
-    public User getUser(String token);
-    public User getUser(String token, HttpServletRequest request);
-    public boolean isValidToken(String token, HttpServletRequest request);
-    public boolean userHasRole(User user, String role);
-    public void setupProvider(BlurConfiguration config);
-    public Map<String, Map<String, Object>> getLoginFields();
-    public boolean isLoginRequired();
-    public boolean isRetryAllowed();
+  public static final String INPUT_FIELD = "input";
+  public static final String PASSWORD_FIELD = "password";
+  public static final String BROWSER_PROVIDED = "browser";
+
+  public User login(HttpServletRequest request);
+
+  public User getUser(String token);
+
+  public User getUser(String token, HttpServletRequest request);
+
+  public boolean isValidToken(String token, HttpServletRequest request);
+
+  public boolean userHasRole(User user, String role);
+
+  public void setupProvider(BlurConfiguration config);
+
+  public Map<String, Map<String, Object>> getLoginFields();
+
+  public boolean isLoginRequired();
+
+  public boolean isRetryAllowed();
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/main/java/org/apache/blur/console/servlets/AuthServlet.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/servlets/AuthServlet.java b/blur-console/src/main/java/org/apache/blur/console/servlets/AuthServlet.java
index 1fad690..078f27a 100644
--- a/blur-console/src/main/java/org/apache/blur/console/servlets/AuthServlet.java
+++ b/blur-console/src/main/java/org/apache/blur/console/servlets/AuthServlet.java
@@ -32,73 +32,73 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class AuthServlet extends BaseConsoleServlet {
-    private static final String LOGIN_STATUS_FIELD = "loggedIn";
-    private static final String LOGIN_FIELDS_FIELD = "requiredFields";
-    private static final String LOGIN_RETRY_ALLOWED = "retryAllowed";
-    private static final String AUTH_TOKEN = "authToken";
-
-    @Override
-    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        String path = req.getPathInfo();
-
-        if (path == null) {
-            checkCurrentAuth(req, resp);
-        } else {
-            sendNotFound(resp, req.getRequestURI());
-        }
+  private static final String LOGIN_STATUS_FIELD = "loggedIn";
+  private static final String LOGIN_FIELDS_FIELD = "requiredFields";
+  private static final String LOGIN_RETRY_ALLOWED = "retryAllowed";
+  private static final String AUTH_TOKEN = "authToken";
+
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+    String path = req.getPathInfo();
+
+    if (path == null) {
+      checkCurrentAuth(req, resp);
+    } else {
+      sendNotFound(resp, req.getRequestURI());
     }
+  }
 
-    @Override
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        String path = req.getPathInfo();
+  @Override
+  protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+    String path = req.getPathInfo();
 
-        if ("login".equalsIgnoreCase(path)) {
-            loginUser(req, resp);
-        } else {
-            sendNotFound(resp, req.getRequestURI());
-        }
+    if ("login".equalsIgnoreCase(path)) {
+      loginUser(req, resp);
+    } else {
+      sendNotFound(resp, req.getRequestURI());
     }
-
-    private void checkCurrentAuth(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        IProvider provider = Config.getProvider();
-        Map<String, Object> responseData = new HashMap<String, Object>();
-
-        if (provider.isLoginRequired()) {
-            String authToken = HttpUtil.getFirstParam((String[])request.getParameterMap().get(AUTH_TOKEN));
-
-            if (StringUtils.isNotBlank(authToken) && provider.getUser(authToken, request) != null) {
-                responseData.put(LOGIN_STATUS_FIELD, true);
-            } else {
-                responseData.put(LOGIN_STATUS_FIELD, false);
-                responseData.put(LOGIN_FIELDS_FIELD, provider.getLoginFields());
-            }
-        } else {
-            responseData.put(LOGIN_STATUS_FIELD, true);
-        }
-
-        HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(responseData), HttpUtil.JSON);
+  }
+
+  private void checkCurrentAuth(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    IProvider provider = Config.getProvider();
+    Map<String, Object> responseData = new HashMap<String, Object>();
+
+    if (provider.isLoginRequired()) {
+      String authToken = HttpUtil.getFirstParam((String[]) request.getParameterMap().get(AUTH_TOKEN));
+
+      if (StringUtils.isNotBlank(authToken) && provider.getUser(authToken, request) != null) {
+        responseData.put(LOGIN_STATUS_FIELD, true);
+      } else {
+        responseData.put(LOGIN_STATUS_FIELD, false);
+        responseData.put(LOGIN_FIELDS_FIELD, provider.getLoginFields());
+      }
+    } else {
+      responseData.put(LOGIN_STATUS_FIELD, true);
     }
 
-    private void loginUser(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        Map<String, Object> data = new HashMap<String, Object>();
+    HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(responseData), HttpUtil.JSON);
+  }
 
-        IProvider provider = Config.getProvider();
+  private void loginUser(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    Map<String, Object> data = new HashMap<String, Object>();
 
-        User user = provider.login(request);
+    IProvider provider = Config.getProvider();
 
-        if (user == null) {
-            data.put(LOGIN_STATUS_FIELD, false);
+    User user = provider.login(request);
 
-            boolean retry = provider.isRetryAllowed();
-            data.put(LOGIN_RETRY_ALLOWED, retry);
-            if (retry) {
-                data.put(LOGIN_FIELDS_FIELD, provider.getLoginFields());
-            }
-        } else {
-            data.put(AUTH_TOKEN, user.getAuthToken());
-            data.put("roles", user.getRoles());
-        }
+    if (user == null) {
+      data.put(LOGIN_STATUS_FIELD, false);
 
-        HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(data), HttpUtil.JSON);
+      boolean retry = provider.isRetryAllowed();
+      data.put(LOGIN_RETRY_ALLOWED, retry);
+      if (retry) {
+        data.put(LOGIN_FIELDS_FIELD, provider.getLoginFields());
+      }
+    } else {
+      data.put(AUTH_TOKEN, user.getAuthToken());
+      data.put("roles", user.getRoles());
     }
+
+    HttpUtil.sendResponse(response, new ObjectMapper().writeValueAsString(data), HttpUtil.JSON);
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 c9683d5..dbda765 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
@@ -17,19 +17,18 @@ package org.apache.blur.console.servlets;
  * limitations under the License.
  */
 
-import java.io.IOException;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 public abstract class BaseConsoleServlet extends HttpServlet {
   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";
+  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);
@@ -40,23 +39,23 @@ public abstract class BaseConsoleServlet extends HttpServlet {
     IOUtils.write(body, response.getOutputStream());
   }
 
-    protected void sendUnauthorized(HttpServletResponse response) throws IOException {
-        response.setContentType("application/json");
-        response.setContentLength(UNAUTHORIZED.getBytes().length);
-        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-        IOUtils.write(UNAUTHORIZED, response.getOutputStream());
-    }
+  protected void sendUnauthorized(HttpServletResponse response) throws IOException {
+    response.setContentType("application/json");
+    response.setContentLength(UNAUTHORIZED.getBytes().length);
+    response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+    IOUtils.write(UNAUTHORIZED, response.getOutputStream());
+  }
 
   protected void sendGenericOk(HttpServletResponse response) throws IOException {
-        String responseBody = "success";
+    String responseBody = "success";
     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);
-        IOUtils.write("URL [" + path + "] doesn't exist", response.getOutputStream());
-    }
+  protected void sendNotFound(HttpServletResponse response, String path) throws IOException {
+    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+    IOUtils.write("URL [" + path + "] doesn't exist", response.getOutputStream());
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 6cb22ae..1941ffd 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
@@ -17,18 +17,16 @@ package org.apache.blur.console.servlets;
  * limitations under the License.
  */
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.blur.console.util.HttpUtil;
+import org.apache.blur.console.util.NodeUtil;
+import org.codehaus.jackson.map.ObjectMapper;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.blur.console.util.HttpUtil;
-import org.apache.blur.console.util.NodeUtil;
-import org.apache.commons.io.IOUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 public class NodesServlet extends BaseConsoleServlet {
   private static final long serialVersionUID = 6522056391102413432L;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 dadd970..bc0c896 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
@@ -17,21 +17,19 @@ package org.apache.blur.console.servlets;
  * limitations under the License.
  */
 
+import org.apache.blur.console.util.HttpUtil;
+import org.apache.blur.console.util.QueryUtil;
+import org.codehaus.jackson.map.ObjectMapper;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.blur.console.util.HttpUtil;
-import org.apache.blur.console.util.QueryUtil;
-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");

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 5452353..866ac9a 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
@@ -17,18 +17,16 @@ package org.apache.blur.console.servlets;
  * limitations under the License.
  */
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.blur.console.util.HttpUtil;
+import org.apache.blur.console.util.SearchUtil;
+import org.codehaus.jackson.map.ObjectMapper;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.blur.console.util.HttpUtil;
-import org.apache.blur.console.util.SearchUtil;
-import org.apache.commons.io.IOUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 
 public class SearchServlet extends BaseConsoleServlet {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 79aa90e..2f211d8 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
@@ -17,6 +17,13 @@ package org.apache.blur.console.servlets;
  * limitations under the License.
  */
 
+import org.apache.blur.console.util.HttpUtil;
+import org.apache.blur.console.util.TableUtil;
+import org.codehaus.jackson.map.ObjectMapper;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,14 +32,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.blur.console.util.HttpUtil;
-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");

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 0566a4c..3afe048 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
@@ -17,13 +17,6 @@ package org.apache.blur.console.util;
  * limitations under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.blur.BlurConfiguration;
 import org.apache.blur.console.providers.AllAllowedProvider;
 import org.apache.blur.console.providers.IProvider;
@@ -40,11 +33,18 @@ import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
 
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 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 int DEFAULT_PORT = 8080;
+  private static final int DEFAULT_PORT = 8080;
 
   private static int port;
   private static BlurConfiguration blurConfig;
@@ -52,11 +52,12 @@ public class Config {
   private static String blurConnection;
   private static Object cluster;
   private static Map<String, Map<String, String>> globalUserProperties;
-    private static IProvider provider;
+  private static IProvider provider;
 
   public static int getConsolePort() {
     return port;
   }
+
   public static BlurConfiguration getBlurConfig() {
     return blurConfig;
   }
@@ -81,7 +82,7 @@ public class Config {
     blurConnection = buildConnectionString();
     port = blurConfig.getInt("blur.console.port", DEFAULT_PORT);
     parseSecurity();
-        setupProvider();
+    setupProvider();
   }
 
   private static void parseSecurity() {
@@ -89,12 +90,13 @@ public class Config {
 
     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>>>() { };
+      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 {
+      try {
         globalUserProperties = mapper.readValue(from, typeRef);
       } catch (Exception e) {
         log.error("Unable to parse security file.  Search may not work right.", e);
@@ -103,21 +105,21 @@ public class Config {
     }
   }
 
-    private static void setupProvider() {
-        String providerClassName = blurConfig.get("blur.console.auth.provider", "org.apache.blur.console.providers.AllAllowedProvider");
+  private static void setupProvider() {
+    String providerClassName = blurConfig.get("blur.console.auth.provider", "org.apache.blur.console.providers.AllAllowedProvider");
 
-        try {
-            Class providerClass = Class.forName(providerClassName, false, Config.class.getClassLoader());
+    try {
+      Class providerClass = Class.forName(providerClassName, false, Config.class.getClassLoader());
 
-            if (providerClass != null) {
-                provider = (IProvider) providerClass.newInstance();
-                provider.setupProvider(blurConfig);
-            }
-        } catch (Exception e) {
-            log.fatal("Unable to setup provider [" + providerClassName + "]. Reverting to default.");
-            provider = new AllAllowedProvider();
-        }
+      if (providerClass != null) {
+        provider = (IProvider) providerClass.newInstance();
+        provider.setupProvider(blurConfig);
+      }
+    } catch (Exception e) {
+      log.fatal("Unable to setup provider [" + providerClassName + "]. Reverting to default.");
+      provider = new AllAllowedProvider();
     }
+  }
 
   public static String getConnectionString() throws IOException {
     return blurConnection;
@@ -149,24 +151,24 @@ public class Config {
   }
 
 
-  @SuppressWarnings({ "unchecked", "rawtypes" })
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public static void setupMiniCluster() throws IOException {
-      File testDirectory = new File(TMPDIR, "blur-cluster-test").getAbsoluteFile();
-      testDirectory.mkdirs();
+    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());
+    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;
+      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 {
@@ -179,11 +181,11 @@ public class Config {
     return client;
   }
 
-    public static boolean isClusterSetup() {
-        return cluster != null;
-    }
+  public static boolean isClusterSetup() {
+    return cluster != null;
+  }
 
-    public static IProvider getProvider() {
-        return provider;
-    }
+  public static IProvider getProvider() {
+    return provider;
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 cced9d3..a86856e 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
@@ -17,11 +17,10 @@
 
 package org.apache.blur.console.util;
 
-import java.io.IOException;
+import org.apache.commons.io.IOUtils;
 
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.io.IOUtils;
+import java.io.IOException;
 
 public class HttpUtil {
   public static final String JSON = "application/json";
@@ -34,10 +33,10 @@ public class HttpUtil {
     IOUtils.write(body, res.getOutputStream());
   }
 
-    public static String getFirstParam(String[] param) {
-        if (param == null || param.length == 0) {
-            return "";
-        }
-        return param[0];
+  public static String getFirstParam(String[] param) {
+    if (param == null || param.length == 0) {
+      return "";
     }
+    return param[0];
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 b6d2e07..2ee9cfa 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
@@ -17,6 +17,9 @@
 
 package org.apache.blur.console.util;
 
+import org.apache.blur.manager.clusterstatus.ZookeeperClusterStatus;
+import org.apache.commons.collections.CollectionUtils;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -24,16 +27,7 @@ import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.URI;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.blur.manager.clusterstatus.ZookeeperClusterStatus;
-import org.apache.commons.collections.CollectionUtils;
+import java.util.*;
 
 public class NodeUtil {
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 13887fa..363e07e 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
@@ -17,18 +17,18 @@
 
 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 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.BlurQueryStatus;
 import org.apache.blur.thrift.generated.Status;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class QueryUtil {
 
   public static int getCurrentQueryCount() throws IOException, TException {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/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 adf02b8..dcbed7e 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
@@ -1,32 +1,15 @@
 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.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.thrift.generated.*;
 import org.apache.blur.user.UserContext;
 import org.apache.commons.lang.StringUtils;
 
+import java.io.IOException;
+import java.util.*;
+
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -34,9 +17,9 @@ import org.apache.commons.lang.StringUtils;
  * 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
- *
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -72,7 +55,7 @@ public class SearchUtil {
     return searchAndFetch(table, query, rowQuery, start, fetch, families, remoteHost, securityUser);
   }
 
-  @SuppressWarnings({ "unchecked", "rawtypes" })
+  @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);
@@ -159,7 +142,7 @@ public class SearchUtil {
     }
   }
 
-  @SuppressWarnings({ "unchecked", "rawtypes" })
+  @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);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java b/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
index 8146407..1e754bb 100644
--- a/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
+++ b/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
@@ -17,13 +17,6 @@
 
 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;
@@ -32,6 +25,9 @@ import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.blur.thrift.generated.TableStats;
 
+import java.io.IOException;
+import java.util.*;
+
 public class TableUtil {
 
   @SuppressWarnings("rawtypes")
@@ -109,11 +105,13 @@ public class TableUtil {
 
     client.disableTable(table);
   }
+
   public static void enableTable(String table) throws TException, IOException {
     Iface client = BlurClient.getClient(Config.getConnectionString());
 
     client.enableTable(table);
   }
+
   public static void deleteTable(String table, boolean includeFiles) throws TException, IOException {
     Iface client = BlurClient.getClient(Config.getConnectionString());
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/main/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/blur-console/src/main/resources/log4j.xml b/blur-console/src/main/resources/log4j.xml
index 87d29b0..8c988a7 100644
--- a/blur-console/src/main/resources/log4j.xml
+++ b/blur-console/src/main/resources/log4j.xml
@@ -20,16 +20,16 @@ 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> 
+  <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>
+    <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/a8c4cd01/blur-console/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/blur-console/src/main/webapp/index.html b/blur-console/src/main/webapp/index.html
index f38c923..c405256 100644
--- a/blur-console/src/main/webapp/index.html
+++ b/blur-console/src/main/webapp/index.html
@@ -19,49 +19,57 @@ 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">
+<!--[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>
+
+
+
+    </script>
+  </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/main/webapp/public/index.html
----------------------------------------------------------------------
diff --git a/blur-console/src/main/webapp/public/index.html b/blur-console/src/main/webapp/public/index.html
index d2e9d83..62c93ef 100644
--- a/blur-console/src/main/webapp/public/index.html
+++ b/blur-console/src/main/webapp/public/index.html
@@ -19,49 +19,57 @@ 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.999552265d9d28485193f204f1f343fa.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.168edfdcdf6a34e319b24b4b5e8fde60.js"></script>
-        <script type="text/javascript">
+<!--[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.999552265d9d28485193f204f1f343fa.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.168edfdcdf6a34e319b24b4b5e8fde60.js"></script>
+    <script type="text/javascript">
             $(function () { blurconsole.initModule( $('#blurconsole') ); });
-        </script>
-    </body>
+
+
+
+    </script>
+  </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/main/webapp/public/views/dashboard.tpl.html
----------------------------------------------------------------------
diff --git a/blur-console/src/main/webapp/public/views/dashboard.tpl.html b/blur-console/src/main/webapp/public/views/dashboard.tpl.html
index 1f6fad7..fa08468 100644
--- a/blur-console/src/main/webapp/public/views/dashboard.tpl.html
+++ b/blur-console/src/main/webapp/public/views/dashboard.tpl.html
@@ -19,43 +19,50 @@ under the License.
  -->
 
 <div id="slow-query-warnings" class="alert alert-danger" style="display:none;">
-	<strong>Heads Up!</strong>
-	Queries have been running for longer than a minute.
+  <strong>Heads Up!</strong>
+  Queries have been running for longer than a minute.
 </div>
 
 <div class="row-fluid">
-	<div class="col-sm-8">
-		<div class="row">
-			<div class="col-sm-6 text-center swapper-parent">
-					<h4>Zookeepers <small><i class="glyphicon glyphicon-retweet swapper-trigger" title="Swap Chart/Info"></i></small></h4>
-					<div id="zookeeperNodes" class="simple-chart swapper-chart"><img src="img/ajax-loader.gif"></div>
-					<div id="zookeeperInfo" class="swapper-info hidden"></div>
-			</div>
-			<div class="col-sm-6 text-center swapper-parent">
-				<h4>Controllers <small><i class="glyphicon glyphicon-retweet swapper-trigger" title="Swap Chart/Info"></i></small></h4>
-				<div id="controllerNodes" class="simple-chart swapper-chart"><img src="img/ajax-loader.gif"></div>
-				<div id="controllerInfo" class="swapper-info hidden"></div>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-sm-12 text-center">
-				<h4>Query Load</h4>
-				<div id="queryLoad" class="wide-chart"><img src="img/ajax-loader.gif"></div>
-			</div>
-		</div>
-	</div>
-	<div class="col-sm-4">
-		<div class="row">
-			<div class="col-sm-12 text-center">
-				<h4>Shards</h4>
-				<div id="shardNodes"><img src="img/ajax-loader.gif"></div>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-sm-12 text-center">
-				<h4>Tables</h4>
-				<div id="tableCounts" class="simple-chart"><img src="img/ajax-loader.gif"></div>
-			</div>
-		</div>
-	</div>
+  <div class="col-sm-8">
+    <div class="row">
+      <div class="col-sm-6 text-center swapper-parent">
+        <h4>Zookeepers
+          <small><i class="glyphicon glyphicon-retweet swapper-trigger" title="Swap Chart/Info"></i></small>
+        </h4>
+        <div id="zookeeperNodes" class="simple-chart swapper-chart"><img src="img/ajax-loader.gif"></div>
+        <div id="zookeeperInfo" class="swapper-info hidden"></div>
+      </div>
+      <div class="col-sm-6 text-center swapper-parent">
+        <h4>Controllers
+          <small><i class="glyphicon glyphicon-retweet swapper-trigger" title="Swap Chart/Info"></i></small>
+        </h4>
+        <div id="controllerNodes" class="simple-chart swapper-chart"><img src="img/ajax-loader.gif"></div>
+        <div id="controllerInfo" class="swapper-info hidden"></div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-12 text-center">
+        <h4>Query Load</h4>
+
+        <div id="queryLoad" class="wide-chart"><img src="img/ajax-loader.gif"></div>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-4">
+    <div class="row">
+      <div class="col-sm-12 text-center">
+        <h4>Shards</h4>
+
+        <div id="shardNodes"><img src="img/ajax-loader.gif"></div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-12 text-center">
+        <h4>Tables</h4>
+
+        <div id="tableCounts" class="simple-chart"><img src="img/ajax-loader.gif"></div>
+      </div>
+    </div>
+  </div>
 </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/main/webapp/public/views/queries.tpl.html
----------------------------------------------------------------------
diff --git a/blur-console/src/main/webapp/public/views/queries.tpl.html b/blur-console/src/main/webapp/public/views/queries.tpl.html
index 88a9644..240d2d6 100644
--- a/blur-console/src/main/webapp/public/views/queries.tpl.html
+++ b/blur-console/src/main/webapp/public/views/queries.tpl.html
@@ -18,23 +18,23 @@ specific language governing permissions and limitations
 under the License.
  -->
 <div class="row-fluid">
-	<div id="tableHolder" class="col-sm-4">
+  <div id="tableHolder" class="col-sm-4">
 
-	</div>
-	<div class="col-sm-8">
-		<div class="row">
-			<div id="filterOptions" class="col-sm-12">
-				<div class="input-group col-sm-4 pull-right">
-					<input class="form-control filterText" placeholder="Filter" type="text">
+  </div>
+  <div class="col-sm-8">
+    <div class="row">
+      <div id="filterOptions" class="col-sm-12">
+        <div class="input-group col-sm-4 pull-right">
+          <input class="form-control filterText" placeholder="Filter" type="text">
 					<span class="input-group-btn">
 						<button class="btn btn-default filterTrigger" type="button">Go!</button>
 					</span>
-				</div>
-			</div>
-			<div id="queryHolder" class="col-sm-12">
+        </div>
+      </div>
+      <div id="queryHolder" class="col-sm-12">
 
-			</div>
-		</div>
+      </div>
+    </div>
 
-	</div>
+  </div>
 </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/main/webapp/public/views/search.tpl.html
----------------------------------------------------------------------
diff --git a/blur-console/src/main/webapp/public/views/search.tpl.html b/blur-console/src/main/webapp/public/views/search.tpl.html
index 82495cc..7eadbbc 100644
--- a/blur-console/src/main/webapp/public/views/search.tpl.html
+++ b/blur-console/src/main/webapp/public/views/search.tpl.html
@@ -20,31 +20,33 @@ under the License.
 
 <div id="tableGoneWarning" class="alert alert-warning" style="display:none"><strong>Heads Up!</strong> The table that is currently being used for search is no longer enabled!</div>
 <div class="well">
-	<div class="container-fluid">
-		<div class="row">
-			<div class="col-xs-6">
-				<div class="input-group">
-					<input type="text" class="form-control" placeholder="Query" id="queryField">
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-xs-6">
+        <div class="input-group">
+          <input type="text" class="form-control" placeholder="Query" id="queryField">
 					<span class="input-group-btn">
 	        			<button class="btn btn-default" type="button" id="searchTrigger">Go!</button>
 	      			</span>
-				</div>
-			</div>
-			<div class="col-xs-2">
-				<select class="form-control" id="tableChooser">
-					<option value="" id="statusOption">Loading Tables....</option>
-				</select>
-			</div>
-			<button class="btn btn-default" type="button" id="searchOptionsTrigger">
-				<i class="glyphicon glyphicon-cog"></i>
-			</button>
-			<span id="searchOptionsDisplay"></span>
-		</div>
-		<div id="resultInfo" class="row">
-			<div id="resultCount" class="col-xs-2"></div>
-			<div class="col-xs-2"><button type="button" id="facetTrigger" class="btn btn-default btn-xs" style="display:none">Run Facets</button></div>
-		</div>
-	</div>
+        </div>
+      </div>
+      <div class="col-xs-2">
+        <select class="form-control" id="tableChooser">
+          <option value="" id="statusOption">Loading Tables....</option>
+        </select>
+      </div>
+      <button class="btn btn-default" type="button" id="searchOptionsTrigger">
+        <i class="glyphicon glyphicon-cog"></i>
+      </button>
+      <span id="searchOptionsDisplay"></span>
+    </div>
+    <div id="resultInfo" class="row">
+      <div id="resultCount" class="col-xs-2"></div>
+      <div class="col-xs-2">
+        <button type="button" id="facetTrigger" class="btn btn-default btn-xs" style="display:none">Run Facets</button>
+      </div>
+    </div>
+  </div>
 </div>
 <div id="results">
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/main/webapp/views/dashboard.tpl.html
----------------------------------------------------------------------
diff --git a/blur-console/src/main/webapp/views/dashboard.tpl.html b/blur-console/src/main/webapp/views/dashboard.tpl.html
index 1f6fad7..fa08468 100644
--- a/blur-console/src/main/webapp/views/dashboard.tpl.html
+++ b/blur-console/src/main/webapp/views/dashboard.tpl.html
@@ -19,43 +19,50 @@ under the License.
  -->
 
 <div id="slow-query-warnings" class="alert alert-danger" style="display:none;">
-	<strong>Heads Up!</strong>
-	Queries have been running for longer than a minute.
+  <strong>Heads Up!</strong>
+  Queries have been running for longer than a minute.
 </div>
 
 <div class="row-fluid">
-	<div class="col-sm-8">
-		<div class="row">
-			<div class="col-sm-6 text-center swapper-parent">
-					<h4>Zookeepers <small><i class="glyphicon glyphicon-retweet swapper-trigger" title="Swap Chart/Info"></i></small></h4>
-					<div id="zookeeperNodes" class="simple-chart swapper-chart"><img src="img/ajax-loader.gif"></div>
-					<div id="zookeeperInfo" class="swapper-info hidden"></div>
-			</div>
-			<div class="col-sm-6 text-center swapper-parent">
-				<h4>Controllers <small><i class="glyphicon glyphicon-retweet swapper-trigger" title="Swap Chart/Info"></i></small></h4>
-				<div id="controllerNodes" class="simple-chart swapper-chart"><img src="img/ajax-loader.gif"></div>
-				<div id="controllerInfo" class="swapper-info hidden"></div>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-sm-12 text-center">
-				<h4>Query Load</h4>
-				<div id="queryLoad" class="wide-chart"><img src="img/ajax-loader.gif"></div>
-			</div>
-		</div>
-	</div>
-	<div class="col-sm-4">
-		<div class="row">
-			<div class="col-sm-12 text-center">
-				<h4>Shards</h4>
-				<div id="shardNodes"><img src="img/ajax-loader.gif"></div>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-sm-12 text-center">
-				<h4>Tables</h4>
-				<div id="tableCounts" class="simple-chart"><img src="img/ajax-loader.gif"></div>
-			</div>
-		</div>
-	</div>
+  <div class="col-sm-8">
+    <div class="row">
+      <div class="col-sm-6 text-center swapper-parent">
+        <h4>Zookeepers
+          <small><i class="glyphicon glyphicon-retweet swapper-trigger" title="Swap Chart/Info"></i></small>
+        </h4>
+        <div id="zookeeperNodes" class="simple-chart swapper-chart"><img src="img/ajax-loader.gif"></div>
+        <div id="zookeeperInfo" class="swapper-info hidden"></div>
+      </div>
+      <div class="col-sm-6 text-center swapper-parent">
+        <h4>Controllers
+          <small><i class="glyphicon glyphicon-retweet swapper-trigger" title="Swap Chart/Info"></i></small>
+        </h4>
+        <div id="controllerNodes" class="simple-chart swapper-chart"><img src="img/ajax-loader.gif"></div>
+        <div id="controllerInfo" class="swapper-info hidden"></div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-12 text-center">
+        <h4>Query Load</h4>
+
+        <div id="queryLoad" class="wide-chart"><img src="img/ajax-loader.gif"></div>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-4">
+    <div class="row">
+      <div class="col-sm-12 text-center">
+        <h4>Shards</h4>
+
+        <div id="shardNodes"><img src="img/ajax-loader.gif"></div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-12 text-center">
+        <h4>Tables</h4>
+
+        <div id="tableCounts" class="simple-chart"><img src="img/ajax-loader.gif"></div>
+      </div>
+    </div>
+  </div>
 </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a8c4cd01/blur-console/src/main/webapp/views/queries.tpl.html
----------------------------------------------------------------------
diff --git a/blur-console/src/main/webapp/views/queries.tpl.html b/blur-console/src/main/webapp/views/queries.tpl.html
index 88a9644..240d2d6 100644
--- a/blur-console/src/main/webapp/views/queries.tpl.html
+++ b/blur-console/src/main/webapp/views/queries.tpl.html
@@ -18,23 +18,23 @@ specific language governing permissions and limitations
 under the License.
  -->
 <div class="row-fluid">
-	<div id="tableHolder" class="col-sm-4">
+  <div id="tableHolder" class="col-sm-4">
 
-	</div>
-	<div class="col-sm-8">
-		<div class="row">
-			<div id="filterOptions" class="col-sm-12">
-				<div class="input-group col-sm-4 pull-right">
-					<input class="form-control filterText" placeholder="Filter" type="text">
+  </div>
+  <div class="col-sm-8">
+    <div class="row">
+      <div id="filterOptions" class="col-sm-12">
+        <div class="input-group col-sm-4 pull-right">
+          <input class="form-control filterText" placeholder="Filter" type="text">
 					<span class="input-group-btn">
 						<button class="btn btn-default filterTrigger" type="button">Go!</button>
 					</span>
-				</div>
-			</div>
-			<div id="queryHolder" class="col-sm-12">
+        </div>
+      </div>
+      <div id="queryHolder" class="col-sm-12">
 
-			</div>
-		</div>
+      </div>
+    </div>
 
-	</div>
+  </div>
 </div>
\ No newline at end of file


Mime
View raw message