Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/7a2dbd78 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/7a2dbd78 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/7a2dbd78 Branch: refs/heads/master Commit: 7a2dbd7860a1eb3d8e6fc8316f4f0d5dc52088c7 Parents: 8f402ed fccde52 Author: Aaron McCurry <[email protected]> Authored: Wed Nov 5 07:37:28 2014 -0500 Committer: Aaron McCurry <[email protected]> Committed: Wed Nov 5 07:37:28 2014 -0500 ---------------------------------------------------------------------- blur-command/pom.xml | 88 +--------- blur-console/pom.xml | 176 ++----------------- .../org/apache/blur/console/JettyServer.java | 41 +++-- .../org/apache/blur/console/util/NodeUtil.java | 2 +- .../src/main/webapp/js/blurconsole.auth.js | 2 +- .../src/main/webapp/js/blurconsole.data.js | 24 +-- blur-console/src/main/webapp/public/index.html | 2 +- ...rconsole.500ad524370515c9a3aadcdb7e2f6d17.js | 28 --- ...rconsole.598dd9e6ddb733121e7b9b14ad7c4272.js | 28 --- ...rconsole.b9b51b1e86c236d92a1a047613bff595.js | 28 +++ .../src/main/webapp/public/js/blurconsole.js | 6 +- ...sole.js.61a0a795b3b948c93367966422a05415.map | 1 + ...sole.js.6783a7cbcbda8b7b5ff3483c841cd343.map | 1 - .../main/webapp/public/js/blurconsole.js.map | 2 +- blur-core/pom.xml | 37 +--- .../apache/blur/command/BaseCommandManager.java | 20 ++- .../blur/thrift/ThriftBlurControllerServer.java | 4 +- .../blur/thrift/ThriftBlurShardServer.java | 4 +- blur-gui/pom.xml | 73 +------- .../org/apache/blur/gui/HttpJettyServer.java | 11 +- blur-mapred-hadoop2/pom.xml | 24 --- blur-query/pom.xml | 55 ------ blur-shell/pom.xml | 39 ---- blur-store/pom.xml | 32 ---- blur-thrift/pom.xml | 28 --- blur-util/pom.xml | 80 --------- distribution/src/assemble/bin-hadoop1.xml | 53 +++--- distribution/src/assemble/bin-hadoop2.xml | 54 +++--- distribution/src/main/scripts/conf/consoles | 1 + pom.xml | 102 ++++++++++- 30 files changed, 282 insertions(+), 764 deletions(-) ----------------------------------------------------------------------
