incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [17/17] git commit: Renaming blur-gui to blur-status.
Date Fri, 02 Jan 2015 18:51:32 GMT
Renaming blur-gui to blur-status.


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

Branch: refs/heads/master
Commit: 72799d83979ba8a00c06f13e752f62e3345fcda5
Parents: fbc70b8
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Fri Jan 2 13:50:58 2015 -0500
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Fri Jan 2 13:50:58 2015 -0500

----------------------------------------------------------------------
 blur-core/pom.xml                               |    8 +-
 blur-gui/pom.xml                                |  137 -
 .../org/apache/blur/gui/HttpJettyServer.java    |  149 -
 .../apache/blur/gui/JSONReporterServlet.java    |   40 -
 .../org/apache/blur/gui/LiveMetricsServlet.java |   60 -
 .../java/org/apache/blur/gui/LogServlet.java    |   95 -
 blur-gui/src/main/webapp/WEB-INF/web.xml        |   25 -
 blur-gui/src/main/webapp/config.html            |   81 -
 blur-gui/src/main/webapp/css/bootstrap.min.css  |    9 -
 blur-gui/src/main/webapp/css/bs-docs.css        |  951 ---
 blur-gui/src/main/webapp/index.html             |  124 -
 blur-gui/src/main/webapp/js/Blur.js             | 6664 -----------------
 blur-gui/src/main/webapp/js/Blur_types.js       | 3258 --------
 blur-gui/src/main/webapp/js/d3.v2.js            | 7061 ------------------
 blur-gui/src/main/webapp/js/d3.v2.min.js        |   32 -
 blur-gui/src/main/webapp/js/jquery-1.9.1.min.js |   27 -
 blur-gui/src/main/webapp/js/thrift.js           |  775 --
 blur-gui/src/main/webapp/metrics.html           |  110 -
 blur-gui/src/main/webapp/traces.html            |  302 -
 blur-status/pom.xml                             |  112 +
 .../org/apache/blur/gui/HttpJettyServer.java    |  149 +
 .../apache/blur/gui/JSONReporterServlet.java    |   40 +
 .../org/apache/blur/gui/LiveMetricsServlet.java |   60 +
 .../java/org/apache/blur/gui/LogServlet.java    |   95 +
 blur-status/src/main/webapp/WEB-INF/web.xml     |   25 +
 blur-status/src/main/webapp/config.html         |   81 +
 .../src/main/webapp/css/bootstrap.min.css       |    9 +
 blur-status/src/main/webapp/css/bs-docs.css     |  951 +++
 blur-status/src/main/webapp/index.html          |  124 +
 blur-status/src/main/webapp/js/Blur.js          | 6664 +++++++++++++++++
 blur-status/src/main/webapp/js/Blur_types.js    | 3258 ++++++++
 blur-status/src/main/webapp/js/d3.v2.js         | 7061 ++++++++++++++++++
 blur-status/src/main/webapp/js/d3.v2.min.js     |   32 +
 .../src/main/webapp/js/jquery-1.9.1.min.js      |   27 +
 blur-status/src/main/webapp/js/thrift.js        |  775 ++
 blur-status/src/main/webapp/metrics.html        |  110 +
 blur-status/src/main/webapp/traces.html         |  302 +
 pom.xml                                         |    6 +-
 38 files changed, 19879 insertions(+), 19910 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72799d83/blur-core/pom.xml
----------------------------------------------------------------------
diff --git a/blur-core/pom.xml b/blur-core/pom.xml
index 42e79bb..7080907 100644
--- a/blur-core/pom.xml
+++ b/blur-core/pom.xml
@@ -74,17 +74,11 @@ under the License.
 		</dependency>
 		<dependency>
 			<groupId>org.apache.blur</groupId>
-			<artifactId>blur-gui</artifactId>
+			<artifactId>blur-status</artifactId>
 			<version>${project.version}</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.blur</groupId>
-			<artifactId>blur-gui</artifactId>
-			<version>${project.version}</version>
-			<type>war</type>
-		</dependency>
-		<dependency>
 			<groupId>org.apache.zookeeper</groupId>
 			<artifactId>zookeeper</artifactId>
 			<scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72799d83/blur-gui/pom.xml
----------------------------------------------------------------------
diff --git a/blur-gui/pom.xml b/blur-gui/pom.xml
deleted file mode 100644
index 2b2b535..0000000
--- a/blur-gui/pom.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.blur</groupId>
-		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<groupId>org.apache.blur</groupId>
-	<artifactId>blur-gui</artifactId>
-	<version>${projectVersion}</version>
-	<packaging>war</packaging>
-	<name>Blur GUI</name>
-	<description>The Blur gui module contains the html status pages for each process.</description>
-
-	<properties>
-		<enableAssertions>false</enableAssertions>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.blur</groupId>
-			<artifactId>blur-thrift</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.blur</groupId>
-			<artifactId>blur-store</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.blur</groupId>
-			<artifactId>blur-util</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.yammer.metrics</groupId>
-			<artifactId>metrics-servlet</artifactId>
-			<version>${metrics.version}</version>
-		</dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
-        </dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-jsp</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-	<repositories>
-		<repository>
-			<id>libdir</id>
-			<url>file://${basedir}/../lib</url>
-		</repository>
-	</repositories>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<configuration>
-						<argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine>
-						<forkCount>2</forkCount>
-						<forkMode>always</forkMode>
-						<reuseForks>false</reuseForks>
-						<systemPropertyVariables>
-							<blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir>
-						</systemPropertyVariables>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-war-plugin</artifactId>
-					<configuration>
-						<archiveClasses>true</archiveClasses>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-install-plugin</artifactId>
-					<executions>
-						<execution>
-							<phase>install</phase>
-							<goals>
-								<goal>install-file</goal>
-							</goals>
-							<configuration>
-								<packaging>jar</packaging>
-								<artifactId>${project.artifactId}</artifactId>
-								<groupId>${project.groupId}</groupId>
-								<version>${project.version}</version>
-								<file>
-									${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib/${project.artifactId}-${project.version}.jar
-								</file>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72799d83/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java
----------------------------------------------------------------------
diff --git a/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java b/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java
deleted file mode 100644
index 30b690a..0000000
--- a/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.apache.blur.gui;
-
-/**
- * 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.
- */
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-
-import org.apache.blur.log.Log;
-import org.apache.blur.log.LogFactory;
-
-import com.yammer.metrics.reporting.MetricsServlet;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-/**
- * Starts up a Jetty server to run the utility gui.
- */
-public class HttpJettyServer {
-
-  private static final Log LOG = LogFactory.getLog(HttpJettyServer.class);
-
-  private Server server = null;
-
-  private WebAppContext context;
-
-  private int _localPort;
-
-  /**
-   * @param port
-   *          port to run gui on
-   * @throws IOException
-   */
-  public HttpJettyServer(Class<?> c, int port) throws IOException {
-    server = new Server(port);
-    String logDir = System.getProperty("blur.logs.dir");
-    String logFile = System.getProperty("blur.log.file");
-    String blurLogFile = logDir + "/" + logFile;
-    LOG.info("System props:" + System.getProperties().toString());
-
-    context = new WebAppContext();
-    String warPath = getWarFolder(c);
-    context.setWar(warPath);
-    context.setContextPath("/");
-    context.setParentLoaderPriority(true);
-    context.addServlet(new ServletHolder(new MetricsServlet()), "/metrics");
-    context.addServlet(new ServletHolder(new LogServlet(blurLogFile)), "/logs");
-
-    LOG.info("Http server thinks its at: " + warPath);
-    LOG.info("Http server log file being exposed: " + logDir == null ? "STDOUT" : blurLogFile);
-
-    server.setHandler(context);
-
-    try {
-      server.start();
-    } catch (Exception e) {
-      try {
-        server.stop();
-      } catch (Exception ex) {
-        LOG.error("Unknown error while trying to stop server during error on startup.", ex);
-      }
-      throw new IOException("Cannot start Http server.", e);
-    }
-    for (int i = 0; i < 100; i++) {
-      if (server.isRunning()) {
-        break;
-      }
-      try {
-        Thread.sleep(1000);
-      } catch (InterruptedException e) {
-        return;
-      }
-    }
-    Connector[] connectors = server.getConnectors();
-    for (Connector connector : connectors) {
-      _localPort = connector.getLocalPort();
-    }
-    LOG.info("Http server up on port: " + _localPort);
-  }
-
-  public WebAppContext getContext() {
-    return context;
-  }
-
-  private static String findBlurGuiInClassPath() {
-    Properties properties = System.getProperties();
-    String cp = (String) properties.get("java.class.path");
-    String[] split = cp.split(":");
-    for (String s : split) {
-      if (s.endsWith(".war")) {
-        return s;
-      }
-    }
-    return null;
-  }
-
-  private String getWarFolder(Class<?> c) {
-    String findBlurGuiInClassPath = findBlurGuiInClassPath();
-    if (findBlurGuiInClassPath != null) {
-      return findBlurGuiInClassPath;
-    }
-    String name = c.getName().replace('.', '/');
-    String classResource = "/" + name + ".class";
-    String pathToClassResource = c.getResource(classResource).toString();
-    pathToClassResource = pathToClassResource.replace('/', File.separatorChar);
-    int indexOfJar = pathToClassResource.indexOf(".jar");
-    if (indexOfJar < 0) {
-      int index = pathToClassResource.indexOf(name);
-      String pathToClasses = pathToClassResource.substring(0, index);
-      int indexOfProjectName = pathToClasses.indexOf("/target/");
-      String str = pathToClasses.substring(0, indexOfProjectName) + "/src/main/webapp";
-      return str;
-    }
-    return null;
-  }
-
-  public void close() {
-    if (server != null) {
-      try {
-        LOG.info("stopping web server");
-        server.stop();
-        LOG.info("stopped web server");
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  public int getLocalPort() {
-    return _localPort;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72799d83/blur-gui/src/main/java/org/apache/blur/gui/JSONReporterServlet.java
----------------------------------------------------------------------
diff --git a/blur-gui/src/main/java/org/apache/blur/gui/JSONReporterServlet.java b/blur-gui/src/main/java/org/apache/blur/gui/JSONReporterServlet.java
deleted file mode 100644
index 60b8e9b..0000000
--- a/blur-gui/src/main/java/org/apache/blur/gui/JSONReporterServlet.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.blur.gui;
-
-/**
- * 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.
- */
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.blur.metrics.JSONReporter;
-
-public class JSONReporterServlet extends HttpServlet {
-  private static final long serialVersionUID = -3086441832701983642L;
-
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse response) throws ServletException,
IOException {
-    response.setContentType("application/json");
-    PrintWriter writer = response.getWriter();
-    JSONReporter.writeJSONData(writer);
-    writer.flush();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72799d83/blur-gui/src/main/java/org/apache/blur/gui/LiveMetricsServlet.java
----------------------------------------------------------------------
diff --git a/blur-gui/src/main/java/org/apache/blur/gui/LiveMetricsServlet.java b/blur-gui/src/main/java/org/apache/blur/gui/LiveMetricsServlet.java
deleted file mode 100644
index c91fbad..0000000
--- a/blur-gui/src/main/java/org/apache/blur/gui/LiveMetricsServlet.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.apache.blur.gui;
-
-/**
- * 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.
- */
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-
-public class LiveMetricsServlet extends HttpServlet {
-
-  private static final long serialVersionUID = 1L;
-
-  
-  public LiveMetricsServlet() {}
-
-  protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException,
IOException {
-    /*
-     * The live metrics page is currently not being used
-     */
-     
-	/* 
-	response.setContentType("application/json");
-    PrintWriter out = response.getWriter();
-    out.write("{");
-    out.write("\"jvm\":{\"xLabel\":\"Time\",\"yLabel\":\"Heap (GB)\",\"lines\":");
-    heapMetrics.writeJson(out);
-    out.write("}");
-    out.write(",\"blur_calls\":{\"xLabel\":\"Time\",\"yLabel\":\"Rates\",\"lines\":");
-    queryMetrics.writeGraph1Json(out);
-    out.write("}");
-    out.write(",\"blur_recordRates\":{\"xLabel\":\"Time\",\"yLabel\":\"Rates\",\"lines\":");
-    queryMetrics.writeGraph2Json(out);
-    out.write("}");
-    out.write(",\"system\":{\"xLabel\":\"Time\",\"yLabel\":\"Load\",\"lines\":");
-    systemLoadMetrics.writeJson(out);
-    out.write("}");
-    out.write("}");
-    */
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72799d83/blur-gui/src/main/java/org/apache/blur/gui/LogServlet.java
----------------------------------------------------------------------
diff --git a/blur-gui/src/main/java/org/apache/blur/gui/LogServlet.java b/blur-gui/src/main/java/org/apache/blur/gui/LogServlet.java
deleted file mode 100644
index 47681ae..0000000
--- a/blur-gui/src/main/java/org/apache/blur/gui/LogServlet.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.apache.blur.gui;
-
-/**
- * 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.
- */
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.RandomAccessFile;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class LogServlet extends HttpServlet {
-
-  private static final long serialVersionUID = 1L;
-  private String filePath = null;
-  private int buffLen = 8192;
-
-  public LogServlet(String filePath) {
-    this.filePath = filePath;
-  }
-
-  protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException,
IOException {
-
-    response.setContentType("text/html");
-    PrintWriter out = response.getWriter();
-
-    File f = new File(filePath);
-    RandomAccessFile ram = new RandomAccessFile(f, "r");
-
-    String offsetStr = request.getParameter("offset");
-    long offset = -1;
-    if (offsetStr != null)
-      offset = Long.parseLong(offsetStr);
-
-    long start = 0;
-    long length = ram.length();
-    // figure out buffer
-    if (length < buffLen)
-      buffLen = new Long(length).intValue();
-
-    // use offset if passed in
-    if (offset >= 0)
-      start = offset;
-    else
-      start = length - buffLen;
-
-    // calc new offset
-    offset = start - buffLen;
-    if (offset < 0)
-      offset = 0;
-
-    // buffer
-    byte[] buff = new byte[buffLen];
-
-    ram.seek(start);
-    ram.read(buff);
-
-    String returnStr = new String(buff, "UTF-8").replaceAll("\n", "\n<br>");
-
-    out.write("<html><link href='style.css' rel='stylesheet' type='text/css' /><body>");
-    out.write("<a href='index.html'>home</a><br/>");
-    out.write("<p>File:<b> " + f.toString() + "</b> (" + start + "/" +
length + ")</p>");
-    if (start != 0) {
-      out.write("<a href='logs?offset=" + 0 + "'>start</a>");
-      out.write(" <a href='logs?offset=" + offset + "'>prev</a>");
-    }
-    if (start + buffLen < length) {
-      out.write(" <a href='logs?offset=" + (start + buffLen) + "'>next</a>");
-      out.write(" <a href='logs?offset=" + ((length - buffLen > 0) ? (length - buffLen)
: 0) + "'>end</a>");
-    }
-    out.write("<br/>");
-    out.write(returnStr);
-    out.write("</body></html>");
-
-    ram.close();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72799d83/blur-gui/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/blur-gui/src/main/webapp/WEB-INF/web.xml b/blur-gui/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 0740e28..0000000
--- a/blur-gui/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
-
-	<display-name>Blur YARN</display-name>
-</web-app>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72799d83/blur-gui/src/main/webapp/config.html
----------------------------------------------------------------------
diff --git a/blur-gui/src/main/webapp/config.html b/blur-gui/src/main/webapp/config.html
deleted file mode 100644
index 5e20675..0000000
--- a/blur-gui/src/main/webapp/config.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html>
-<head>
-<title>Blur - Config</title>
-<meta charset="utf-8">
-<link href="css/bootstrap.min.css" rel="stylesheet">
-<link href="css/bs-docs.css" rel="stylesheet" media="screen">
-</head>
-
-<script src="js/jquery-1.9.1.min.js"></script>
-<script src="js/thrift.js"></script>
-<script src="js/Blur.js"></script>
-<script src="js/Blur_types.js"></script>
-<script>
-function displayPage() {
-    var transport = new Thrift.Transport("/blur");
-    var protocol  = new Thrift.Protocol(transport);
-    var client    = new BlurClient(protocol);
-        
-    try {
-	  var config = client.configuration();
-	  var body = $("#page_body");
-	  var keys = Object.keys(config).sort();
-      body.append("<h2>Configuration</h2>");
-      var s = "<table border=1 class=\"table-bordered table-striped table-condensed\"><tr><th>Name</th><th>Value</th></tr>";
-	  for (var i = 0; i < keys.length; i++) {
-        var key = keys[i];
-        s += "<tr><td>"+key+"</td><td>"+config[key]+"</td></tr>";
-      }
-      body.append(s + "</table>");
-    } catch(ouch){
-alert (ouch);
-    }
-}
-$(window).bind("load", displayPage);
-</script>
-<body>
-  <div class="navbar navbar-inverse navbar-fixed-top">
-    <div class="container">
-      <div class="navbar-header">
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="http://incubator.apache.org/blur">Apache Blur
(Incubator)</a>
-      </div>
-      <div class="collapse navbar-collapse">
-        <ul class="nav navbar-nav">
-          <li><a href="index.html">Home</a></li>
-          <li class="active"><a href="config.html">Configuration</a></li>
-          <li><a href="metrics.html">Metrics</a></li>
-          <li><a href="traces.html">Traces</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-	<table class="table-bordered table-condensed">
-		<tr><td id="page_body"></td></tr>
-	</table>
-
-
-</body>
-</html>


Mime
View raw message