incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [6/6] git commit: Merge branch 'apache-blur-0.2' of https://git-wip-us.apache.org/repos/asf/incubator-blur into apache-blur-0.2
Date Thu, 10 Jul 2014 00:56:22 GMT
Merge branch 'apache-blur-0.2' of https://git-wip-us.apache.org/repos/asf/incubator-blur into
apache-blur-0.2


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

Branch: refs/heads/apache-blur-0.2
Commit: 721db2a5366add9780cceb90f6310c440f2ecf61
Parents: 92f14c8 0327a7f
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Wed Jul 9 20:54:54 2014 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed Jul 9 20:54:54 2014 -0400

----------------------------------------------------------------------
 blur-console/.gitignore                         |     4 -
 blur-console/README.md                          |    14 +-
 blur-console/checkstyle.xml                     |   235 +-
 blur-console/pom.xml                            |   628 +-
 blur-console/src/assemble/webapp.xml            |     4 +-
 .../org/apache/blur/console/JettyServer.java    |    97 +-
 .../main/java/org/apache/blur/console/Main.java |    22 +-
 .../apache/blur/console/model/ResultRow.java    |    49 +-
 .../org/apache/blur/console/model/User.java     |    70 +-
 .../console/providers/AllAllowedProvider.java   |    72 +-
 .../blur/console/providers/IProvider.java       |    34 +-
 .../blur/console/servlets/AuthServlet.java      |   124 +-
 .../console/servlets/BaseConsoleServlet.java    |    73 +-
 .../blur/console/servlets/NodesServlet.java     |    70 +-
 .../blur/console/servlets/QueriesServlet.java   |   118 +-
 .../blur/console/servlets/SearchServlet.java    |    66 +-
 .../blur/console/servlets/TablesServlet.java    |   207 +-
 .../org/apache/blur/console/util/Config.java    |   301 +-
 .../org/apache/blur/console/util/HttpUtil.java  |    31 +-
 .../org/apache/blur/console/util/NodeUtil.java  |   220 +-
 .../org/apache/blur/console/util/QueryUtil.java |   102 +-
 .../apache/blur/console/util/SearchUtil.java    |   415 +-
 .../org/apache/blur/console/util/TableUtil.java |   182 +-
 blur-console/src/main/resources/log4j.xml       |    20 +-
 blur-console/src/main/scripts/grunt.sh          |    20 +-
 blur-console/src/main/webapp/.bowerrc           |     3 -
 blur-console/src/main/webapp/.editorconfig      |     2 +-
 blur-console/src/main/webapp/.gitignore         |     4 +-
 blur-console/src/main/webapp/.jshintrc          |     2 +-
 blur-console/src/main/webapp/Gruntfile.js       |    27 +-
 blur-console/src/main/webapp/bower.json         |    16 -
 blur-console/src/main/webapp/index.html         |    95 +-
 .../src/main/webapp/js/blurconsole.b_utils.js   |   198 +-
 .../src/main/webapp/js/blurconsole.dashboard.js |   434 +-
 .../src/main/webapp/js/blurconsole.data.js      |   227 +-
 .../src/main/webapp/js/blurconsole.fake.js      |   524 +-
 blur-console/src/main/webapp/js/blurconsole.js  |    14 +-
 .../src/main/webapp/js/blurconsole.logging.js   |   114 +-
 .../src/main/webapp/js/blurconsole.model.js     |  1121 +-
 .../src/main/webapp/js/blurconsole.queries.js   |   364 +-
 .../src/main/webapp/js/blurconsole.schema.js    |   324 +-
 .../src/main/webapp/js/blurconsole.search.js    |   931 +-
 .../src/main/webapp/js/blurconsole.shell.js     |   304 +-
 .../src/main/webapp/js/blurconsole.tables.js    |   386 +-
 .../src/main/webapp/js/blurconsole.utils.js     |   144 +-
 blur-console/src/main/webapp/karma.conf.js      |    16 +-
 .../main/webapp/less/blurconsole.dashboard.less |    40 +-
 .../main/webapp/less/blurconsole.queries.less   |     2 +-
 .../main/webapp/less/blurconsole.schema.less    |    50 +-
 .../main/webapp/less/blurconsole.search.less    |    50 +-
 .../fonts/glyphicons-halflings-regular.eot      |   Bin 0 -> 20335 bytes
 .../fonts/glyphicons-halflings-regular.svg      |   229 +
 .../fonts/glyphicons-halflings-regular.ttf      |   Bin 0 -> 41280 bytes
 .../fonts/glyphicons-halflings-regular.woff     |   Bin 0 -> 23320 bytes
 .../src/main/webapp/libs/bootstrap/js/affix.js  |   142 +
 .../src/main/webapp/libs/bootstrap/js/alert.js  |    92 +
 .../src/main/webapp/libs/bootstrap/js/button.js |   110 +
 .../main/webapp/libs/bootstrap/js/carousel.js   |   223 +
 .../main/webapp/libs/bootstrap/js/collapse.js   |   170 +
 .../main/webapp/libs/bootstrap/js/dropdown.js   |   151 +
 .../src/main/webapp/libs/bootstrap/js/modal.js  |   280 +
 .../main/webapp/libs/bootstrap/js/popover.js    |   113 +
 .../main/webapp/libs/bootstrap/js/scrollspy.js  |   170 +
 .../src/main/webapp/libs/bootstrap/js/tab.js    |   128 +
 .../main/webapp/libs/bootstrap/js/tooltip.js    |   457 +
 .../main/webapp/libs/bootstrap/js/transition.js |    59 +
 .../main/webapp/libs/bootstrap/less/alerts.less |    68 +
 .../main/webapp/libs/bootstrap/less/badges.less |    55 +
 .../webapp/libs/bootstrap/less/bootstrap.less   |    50 +
 .../webapp/libs/bootstrap/less/breadcrumbs.less |    26 +
 .../libs/bootstrap/less/button-groups.less      |   240 +
 .../webapp/libs/bootstrap/less/buttons.less     |   157 +
 .../webapp/libs/bootstrap/less/carousel.less    |   243 +
 .../main/webapp/libs/bootstrap/less/close.less  |    33 +
 .../main/webapp/libs/bootstrap/less/code.less   |    68 +
 .../bootstrap/less/component-animations.less    |    31 +
 .../webapp/libs/bootstrap/less/dropdowns.less   |   215 +
 .../main/webapp/libs/bootstrap/less/forms.less  |   540 +
 .../webapp/libs/bootstrap/less/glyphicons.less  |   233 +
 .../main/webapp/libs/bootstrap/less/grid.less   |    84 +
 .../libs/bootstrap/less/input-groups.less       |   166 +
 .../webapp/libs/bootstrap/less/jumbotron.less   |    48 +
 .../main/webapp/libs/bootstrap/less/labels.less |    64 +
 .../webapp/libs/bootstrap/less/list-group.less  |   131 +
 .../main/webapp/libs/bootstrap/less/media.less  |    56 +
 .../main/webapp/libs/bootstrap/less/mixins.less |    39 +
 .../libs/bootstrap/less/mixins/alerts.less      |    14 +
 .../less/mixins/background-variant.less         |     8 +
 .../bootstrap/less/mixins/border-radius.less    |    18 +
 .../libs/bootstrap/less/mixins/buttons.less     |    50 +
 .../bootstrap/less/mixins/center-block.less     |     7 +
 .../libs/bootstrap/less/mixins/clearfix.less    |    22 +
 .../libs/bootstrap/less/mixins/forms.less       |    81 +
 .../libs/bootstrap/less/mixins/gradients.less   |    59 +
 .../bootstrap/less/mixins/grid-framework.less   |    91 +
 .../webapp/libs/bootstrap/less/mixins/grid.less |   122 +
 .../libs/bootstrap/less/mixins/hide-text.less   |    21 +
 .../libs/bootstrap/less/mixins/image.less       |    34 +
 .../libs/bootstrap/less/mixins/labels.less      |    12 +
 .../libs/bootstrap/less/mixins/list-group.less  |    29 +
 .../libs/bootstrap/less/mixins/nav-divider.less |    10 +
 .../less/mixins/nav-vertical-align.less         |     9 +
 .../libs/bootstrap/less/mixins/opacity.less     |     8 +
 .../libs/bootstrap/less/mixins/pagination.less  |    23 +
 .../libs/bootstrap/less/mixins/panels.less      |    24 +
 .../bootstrap/less/mixins/progress-bar.less     |    10 +
 .../bootstrap/less/mixins/reset-filter.less     |     8 +
 .../libs/bootstrap/less/mixins/resize.less      |     6 +
 .../less/mixins/responsive-visibility.less      |    15 +
 .../webapp/libs/bootstrap/less/mixins/size.less |    10 +
 .../libs/bootstrap/less/mixins/tab-focus.less   |     9 +
 .../libs/bootstrap/less/mixins/table-row.less   |    28 +
 .../bootstrap/less/mixins/text-emphasis.less    |     8 +
 .../bootstrap/less/mixins/text-overflow.less    |     8 +
 .../bootstrap/less/mixins/vendor-prefixes.less  |   224 +
 .../main/webapp/libs/bootstrap/less/modals.less |   150 +
 .../main/webapp/libs/bootstrap/less/navbar.less |   655 ++
 .../main/webapp/libs/bootstrap/less/navs.less   |   242 +
 .../webapp/libs/bootstrap/less/normalize.less   |   425 +
 .../main/webapp/libs/bootstrap/less/pager.less  |    55 +
 .../webapp/libs/bootstrap/less/pagination.less  |    88 +
 .../main/webapp/libs/bootstrap/less/panels.less |   243 +
 .../webapp/libs/bootstrap/less/popovers.less    |   133 +
 .../main/webapp/libs/bootstrap/less/print.less  |   101 +
 .../libs/bootstrap/less/progress-bars.less      |   105 +
 .../libs/bootstrap/less/responsive-embed.less   |    34 +
 .../bootstrap/less/responsive-utilities.less    |   194 +
 .../webapp/libs/bootstrap/less/scaffolding.less |   150 +
 .../main/webapp/libs/bootstrap/less/tables.less |   233 +
 .../main/webapp/libs/bootstrap/less/theme.less  |   258 +
 .../webapp/libs/bootstrap/less/thumbnails.less  |    36 +
 .../webapp/libs/bootstrap/less/tooltip.less     |    95 +
 .../main/webapp/libs/bootstrap/less/type.less   |   313 +
 .../webapp/libs/bootstrap/less/utilities.less   |    57 +
 .../webapp/libs/bootstrap/less/variables.less   |   846 ++
 .../main/webapp/libs/bootstrap/less/wells.less  |    29 +
 .../src/main/webapp/libs/flot/excanvas.js       |  1428 +++
 .../webapp/libs/flot/jquery.colorhelpers.js     |   180 +
 .../main/webapp/libs/flot/jquery.flot.canvas.js |   345 +
 .../webapp/libs/flot/jquery.flot.categories.js  |   190 +
 .../webapp/libs/flot/jquery.flot.crosshair.js   |   176 +
 .../webapp/libs/flot/jquery.flot.errorbars.js   |   353 +
 .../webapp/libs/flot/jquery.flot.fillbetween.js |   226 +
 .../main/webapp/libs/flot/jquery.flot.image.js  |   241 +
 .../src/main/webapp/libs/flot/jquery.flot.js    |  3137 +++++
 .../webapp/libs/flot/jquery.flot.navigate.js    |   346 +
 .../main/webapp/libs/flot/jquery.flot.pie.js    |   817 ++
 .../main/webapp/libs/flot/jquery.flot.resize.js |    60 +
 .../webapp/libs/flot/jquery.flot.selection.js   |   360 +
 .../main/webapp/libs/flot/jquery.flot.stack.js  |   188 +
 .../main/webapp/libs/flot/jquery.flot.symbol.js |    71 +
 .../webapp/libs/flot/jquery.flot.threshold.js   |   142 +
 .../main/webapp/libs/flot/jquery.flot.time.js   |   431 +
 .../src/main/webapp/libs/jquery/jquery.js       | 10337 +++++++++++++++++
 .../src/main/webapp/libs/modernizr/modernizr.js |  1406 +++
 .../webapp/libs/typeahead/typeahead.jquery.js   |  1155 ++
 blur-console/src/main/webapp/package.json       |     1 -
 ...console.8c2cfd026556540d0e30e0da8b9ffc56.css |     1 -
 ...console.bfe9062c877a3904cde5eaa94c865433.css |  6476 +++++++++++
 .../src/main/webapp/public/css/blurconsole.css  |  6477 ++++++++++-
 ...ole.css.68c2c19adf96ebf38039bd94cd1b6ef3.map |     1 -
 ...ole.css.85b4970e6cc85ff19b38ea3992343cc9.map |     1 +
 .../main/webapp/public/css/blurconsole.css.map  |     2 +-
 blur-console/src/main/webapp/public/index.html  |    95 +-
 ...rconsole.2386c8f423ff1369e4d7b407401ca2b4.js |    27 +
 ...rconsole.643484dbadaf82dccfd37db3fe370208.js |    27 -
 .../src/main/webapp/public/js/blurconsole.js    |     6 +-
 ...sole.js.61680973ed09804cc51c7fee1133d126.map |     1 -
 ...sole.js.d5898caf0c8a8e22f30591d3c774457f.map |     1 +
 .../main/webapp/public/js/blurconsole.js.map    |     2 +-
 .../main/webapp/public/views/dashboard.tpl.html |    79 +-
 .../main/webapp/public/views/queries.tpl.html   |    26 +-
 .../main/webapp/public/views/search.tpl.html    |    46 +-
 blur-console/src/main/webapp/test/.bowerrc      |     3 -
 blur-console/src/main/webapp/test/bower.json    |    10 -
 blur-console/src/main/webapp/test/index.html    |    60 -
 .../src/main/webapp/test/unit/utilsTest.js      |     4 +-
 .../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    |    64 +-
 .../apache/blur/console/util/NodeUtilTest.java  |    74 +-
 .../apache/blur/console/util/QueryUtilTest.java |   130 +-
 .../apache/blur/console/util/TableUtilTest.java |   102 +-
 pom.xml                                         |     3 +-
 188 files changed, 49542 insertions(+), 4796 deletions(-)
----------------------------------------------------------------------



Mime
View raw message