Updated Branches: refs/heads/blur-console-v2 aaafe9a57 -> 1676142c1
Added in missing license headers and added in excludes into the pom for external libraries Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/1676142c Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/1676142c Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/1676142c Branch: refs/heads/blur-console-v2 Commit: 1676142c1f2fd494375d586ae3d81280041240f9 Parents: aaafe9a Author: Chris Rohr <[email protected]> Authored: Wed Oct 9 20:16:25 2013 -0400 Committer: Chris Rohr <[email protected]> Committed: Wed Oct 9 20:16:25 2013 -0400 ---------------------------------------------------------------------- .../org/apache/blur/console/JettyServer.java | 17 +++++++++++ .../main/java/org/apache/blur/console/Main.java | 17 +++++++++++ .../blur/console/servlets/DashboardServlet.java | 17 +++++++++++ .../org/apache/blur/console/util/Config.java | 17 +++++++++++ .../apache/blur/console/webapp/css/console.css | 17 +++++++++++ .../org/apache/blur/console/webapp/index.html | 29 ++++++++++++++++--- .../org/apache/blur/console/webapp/js/app.js | 17 +++++++++++ .../apache/blur/console/webapp/js/dashboard.js | 17 +++++++++++ .../webapp/js/ui-bootstrap-tpls-0.6.0.js | 24 ++++++++++++++++ pom.xml | 30 ++++++++++++-------- 10 files changed, 186 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1676142c/contrib/blur-console/src/main/java/org/apache/blur/console/JettyServer.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/java/org/apache/blur/console/JettyServer.java b/contrib/blur-console/src/main/java/org/apache/blur/console/JettyServer.java index e864639..1a103b8 100644 --- a/contrib/blur-console/src/main/java/org/apache/blur/console/JettyServer.java +++ b/contrib/blur-console/src/main/java/org/apache/blur/console/JettyServer.java @@ -1,5 +1,22 @@ package org.apache.blur.console; +/** + * 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.net.URL; import org.apache.blur.console.servlets.DashboardServlet; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1676142c/contrib/blur-console/src/main/java/org/apache/blur/console/Main.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/java/org/apache/blur/console/Main.java b/contrib/blur-console/src/main/java/org/apache/blur/console/Main.java index 192f980..fb61fde 100644 --- a/contrib/blur-console/src/main/java/org/apache/blur/console/Main.java +++ b/contrib/blur-console/src/main/java/org/apache/blur/console/Main.java @@ -1,5 +1,22 @@ package org.apache.blur.console; +/** + * 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 org.apache.blur.console.util.Config; public class Main { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1676142c/contrib/blur-console/src/main/java/org/apache/blur/console/servlets/DashboardServlet.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/java/org/apache/blur/console/servlets/DashboardServlet.java b/contrib/blur-console/src/main/java/org/apache/blur/console/servlets/DashboardServlet.java index 0c18c1a..74dcb6d 100644 --- a/contrib/blur-console/src/main/java/org/apache/blur/console/servlets/DashboardServlet.java +++ b/contrib/blur-console/src/main/java/org/apache/blur/console/servlets/DashboardServlet.java @@ -1,5 +1,22 @@ package org.apache.blur.console.servlets; +/** + * 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.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1676142c/contrib/blur-console/src/main/java/org/apache/blur/console/util/Config.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/java/org/apache/blur/console/util/Config.java b/contrib/blur-console/src/main/java/org/apache/blur/console/util/Config.java index d059eaf..5e55bd4 100644 --- a/contrib/blur-console/src/main/java/org/apache/blur/console/util/Config.java +++ b/contrib/blur-console/src/main/java/org/apache/blur/console/util/Config.java @@ -1,5 +1,22 @@ package org.apache.blur.console.util; +/** + * 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.FileInputStream; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1676142c/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/css/console.css ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/css/console.css b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/css/console.css index 2d835c2..c90a8ac 100644 --- a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/css/console.css +++ b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/css/console.css @@ -1,3 +1,20 @@ +/** + * 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. + */ + body { padding-top: 70px; } .nav, .pagination, .carousel a { cursor: pointer; } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1676142c/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/index.html ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/index.html b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/index.html index 641d300..3ca5cf9 100644 --- a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/index.html +++ b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/index.html @@ -1,4 +1,25 @@ - <head> +<!-- + +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 Console</title> <link rel="stylesheet" type="text/css" href="css/bootstrap.css"> <link rel="stylesheet" type="text/css" href="css/font-awesome.css"> @@ -19,18 +40,18 @@ <div ng-controller="DashboardCtrl"> <div id="slow-query-warnings" class="alert alert-danger hidden">Warning</div> <div class="row"> - <div class="col-md-4"> + <div class="col-md-4 well"> <h4>Controllers</h4> <canvas doughnutchart data="controllerData" width="100" height="100" options="chartOptions"></canvas> </div> - <div class="col-md-4"> + <div class="col-md-4 well"> <h4>Shards</h4> <div ng-repeat="cluster in clusters"> <h5>{{cluster.name}}</h5> <canvas doughnutchart data="cluster.data" width="75" height="75" options="chartOptions"></canvas> </div> </div> - <div class="col-md-4"> + <div class="col-md-4 well"> <h3>Tables</h3> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1676142c/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/app.js ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/app.js b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/app.js index 3cea194..13bf46b 100644 --- a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/app.js +++ b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/app.js @@ -1,3 +1,20 @@ +/** + * 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. + */ + var blurApp = angular.module('blurApp', ['ui.bootstrap']) blurApp.chart = function (type) { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1676142c/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/dashboard.js ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/dashboard.js b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/dashboard.js index 52f8ac7..a46824c 100644 --- a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/dashboard.js +++ b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/dashboard.js @@ -1,3 +1,20 @@ +/** + * 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. + */ + blurApp.controller('DashboardCtrl', function($scope, $http, $timeout) { $scope.chartOptions = { animation: false http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1676142c/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/ui-bootstrap-tpls-0.6.0.js ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/ui-bootstrap-tpls-0.6.0.js b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/ui-bootstrap-tpls-0.6.0.js index ed018f8..0bf130a 100644 --- a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/ui-bootstrap-tpls-0.6.0.js +++ b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/ui-bootstrap-tpls-0.6.0.js @@ -1,3 +1,27 @@ +/** +The MIT License + +Copyright (c) 2012-2013 the AngularUI Team, https://github.com/organizations/angular-ui/teams/291112 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.transition","ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.bindHtml","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.dropdownToggle","ui.bootstrap.modal","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]); angular.module("ui.bootstrap.tpls", ["template/accordion/accordion-group.html","template/accordion/accordion.html","template/alert/alert.html","template/carousel/carousel.html","template/carousel/slide.html","template/datepicker/datepicker.html","template/datepicker/popup.html","template/modal/backdrop.html","template/modal/window.html","template/pagination/pager.html","template/pagination/pagination.html","template/tooltip/tooltip-html-unsafe-popup.html","template/tooltip/tooltip-popup.html","template/popover/popover.html","template/progressbar/bar.html","template/progressbar/progress.html","template/rating/rating.html","template/tabs/tab.html","template/tabs/tabset-titles.html","template/tabs/tabset.html","template/timepicker/timepicker.html","template/typeahead/typeahead-match.html","template/typeahead/typeahead-popup.html"]); angular.module('ui.bootstrap.transition', []) http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1676142c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 05e03b6..1649adb 100644 --- a/pom.xml +++ b/pom.xml @@ -245,24 +245,30 @@ under the License. <!-- These javascript libs are accounted for in the LICENSE-src file in distribution/src/main/resources --> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/d3/**</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/backbone/**</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/flot/**</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/jquery.*.js</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/modernizr.js</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/sorttable.js</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/underscore.js</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/datatables.fnReloadAjax.js</exclude> + <exclude>contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/angular.js</exclude> + <exclude>contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/Chart.js</exclude> + <exclude>contrib/blur-console-old/blur-admin/vendor/assets/javascripts/d3/**</exclude> + <exclude>contrib/blur-console-old/blur-admin/vendor/assets/javascripts/backbone/**</exclude> + <exclude>contrib/blur-console-old/blur-admin/vendor/assets/javascripts/flot/**</exclude> + <exclude>contrib/blur-console-old/blur-admin/vendor/assets/javascripts/jquery.*.js</exclude> + <exclude>contrib/blur-console-old/blur-admin/vendor/assets/javascripts/modernizr.js</exclude> + <exclude>contrib/blur-console-old/blur-admin/vendor/assets/javascripts/sorttable.js</exclude> + <exclude>contrib/blur-console-old/blur-admin/vendor/assets/javascripts/underscore.js</exclude> + <exclude>contrib/blur-console-old/blur-admin/vendor/assets/javascripts/datatables.fnReloadAjax.js</exclude> <!-- These css libs are accounted for in the LICENSE file --> - <exclude>contrib/blur-console/blur-admin/vendor/assets/stylesheets/jquery*.css</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/stylesheets/ui.dynatree.css</exclude> + <exclude>contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/css/font-awesome.css</exclude> + <exclude>contrib/blur-console-old/blur-admin/vendor/assets/stylesheets/jquery*.css</exclude> + <exclude>contrib/blur-console-old/blur-admin/vendor/assets/stylesheets/ui.dynatree.css</exclude> + + <!-- Font files --> + <exclude>contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/font/fontawesome-webfont.svg</exclude> <!-- Ruby gems --> - <exclude>contrib/blur-console/blur-admin/vendor/gems/cancan/**</exclude> + <exclude>contrib/blur-console-old/blur-admin/vendor/gems/cancan/**</exclude> <!-- Generated during the rail build process in the blur-admin project --> - <exclude>contrib/blur-console/blur-admin/Gemfile.lock</exclude> + <exclude>contrib/blur-console-old/blur-admin/Gemfile.lock</exclude> <!-- Contains a list of english words that are used for load testing, adding a header would make the simple parsers more complex -->
