incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [10/47] git commit: Merge pull request #207 from gbarton/master
Date Mon, 03 Sep 2012 00:32:19 GMT
Merge pull request #207 from gbarton/master

Blur GUI initial merge BLUR-8

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

Branch: refs/heads/master
Commit: 778823046e2f916768b8f9213cdde9a5ce784358
Parents: 3f29c70 87986f3
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Tue Aug 28 19:42:10 2012 -0700
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue Aug 28 19:42:10 2012 -0700

----------------------------------------------------------------------
 bin/blur-config.sh                                 |    4 +
 src/blur-core/pom.xml                              |    5 +
 .../blur/thrift/ThriftBlurControllerServer.java    |   17 +-
 .../blur/thrift/ThriftBlurShardServer.java         |   61 +-
 .../com/nearinfinity/blur/utils/BlurConstants.java |    3 +
 src/blur-gui/pom.xml                               |  148 +
 .../com/nearinfinity/blur/gui/HttpJettyServer.java |   93 +
 .../java/com/nearinfinity/blur/gui/LogServlet.java |   80 +
 .../com/nearinfinity/blur/gui/MetricsServlet.java  |   36 +
 .../src/main/webapps/controller/WEB-INF/web.xml    |    8 +
 src/blur-gui/src/main/webapps/controller/d3.v2.js  | 9406 +++++++++++++++
 .../src/main/webapps/controller/d3.v2.min.js       |    4 +
 .../src/main/webapps/controller/footer.jsp         |    2 +
 .../src/main/webapps/controller/functions.jsp      |   25 +
 src/blur-gui/src/main/webapps/controller/home.jsp  |  120 +
 .../src/main/webapps/controller/index.html         |   13 +
 .../src/main/webapps/controller/metrics.jsp        |  120 +
 .../src/main/webapps/controller/shardList.jsp      |   60 +
 src/blur-gui/src/main/webapps/controller/style.css |   53 +
 src/blur-gui/src/main/webapps/controller/table.jsp |  153 +
 src/blur-gui/src/main/webapps/controller/test.html |  123 +
 src/blur-testsuite/pom.xml                         |   74 +-
 .../blur/testsuite/CreateInsertQueryRepeating.java |  245 +
 .../blur/testsuite/LoadDataAsyncContinuously.java  |    2 +-
 src/blur-util/pom.xml                              |  101 +-
 .../src/main/resources/blur-default.properties     |    3 +
 src/pom.xml                                        |    1 +
 27 files changed, 10853 insertions(+), 107 deletions(-)
----------------------------------------------------------------------



Mime
View raw message