Rat updates and cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/293bcb34 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/293bcb34 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/293bcb34 Branch: refs/heads/console-v2 Commit: 293bcb34a824efea14fa0f74a5671be40b3b241f Parents: acfc5a4 Author: Chris Rohr <[email protected]> Authored: Mon Feb 17 11:04:55 2014 -0500 Committer: Chris Rohr <[email protected]> Committed: Mon Feb 17 11:04:55 2014 -0500 ---------------------------------------------------------------------- .../org/apache/blur/console/model/Column.java | 17 ++ .../org/apache/blur/console/model/Family.java | 17 ++ contrib/blur-console/ui/Gruntfile.js | 15 ++ contrib/blur-console/ui/app/404.html | 157 ------------------- contrib/blur-console/ui/app/robots.txt | 3 - contrib/blur-console/ui/bower.json | 16 ++ contrib/blur-console/ui/test/bower.json | 16 ++ contrib/blur-console/ui/test/index.html | 14 ++ contrib/blur-console/ui/test/spec/test.js | 14 ++ pom.xml | 37 +++-- 10 files changed, 127 insertions(+), 179 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/293bcb34/contrib/blur-console/src/main/java/org/apache/blur/console/model/Column.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/java/org/apache/blur/console/model/Column.java b/contrib/blur-console/src/main/java/org/apache/blur/console/model/Column.java index 30297d3..3c61ad7 100644 --- a/contrib/blur-console/src/main/java/org/apache/blur/console/model/Column.java +++ b/contrib/blur-console/src/main/java/org/apache/blur/console/model/Column.java @@ -1,5 +1,22 @@ package org.apache.blur.console.model; +/** + * 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.util.Map; public class Column { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/293bcb34/contrib/blur-console/src/main/java/org/apache/blur/console/model/Family.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/java/org/apache/blur/console/model/Family.java b/contrib/blur-console/src/main/java/org/apache/blur/console/model/Family.java index 39affb6..4f4015b 100644 --- a/contrib/blur-console/src/main/java/org/apache/blur/console/model/Family.java +++ b/contrib/blur-console/src/main/java/org/apache/blur/console/model/Family.java @@ -1,5 +1,22 @@ package org.apache.blur.console.model; +/** + * 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.util.List; public class Family { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/293bcb34/contrib/blur-console/ui/Gruntfile.js ---------------------------------------------------------------------- diff --git a/contrib/blur-console/ui/Gruntfile.js b/contrib/blur-console/ui/Gruntfile.js index bb0ec79..cb002a8 100644 --- a/contrib/blur-console/ui/Gruntfile.js +++ b/contrib/blur-console/ui/Gruntfile.js @@ -1,3 +1,18 @@ +/* + +Licensed 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. +*/ + // Generated on 2014-01-21 using generator-webapp 0.4.7 'use strict'; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/293bcb34/contrib/blur-console/ui/app/404.html ---------------------------------------------------------------------- diff --git a/contrib/blur-console/ui/app/404.html b/contrib/blur-console/ui/app/404.html deleted file mode 100644 index fdace4a..0000000 --- a/contrib/blur-console/ui/app/404.html +++ /dev/null @@ -1,157 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <title>Page Not Found :(</title> - <style> - ::-moz-selection { - background: #b3d4fc; - text-shadow: none; - } - - ::selection { - background: #b3d4fc; - text-shadow: none; - } - - html { - padding: 30px 10px; - font-size: 20px; - line-height: 1.4; - color: #737373; - background: #f0f0f0; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; - } - - html, - input { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - } - - body { - max-width: 500px; - _width: 500px; - padding: 30px 20px 50px; - border: 1px solid #b3b3b3; - border-radius: 4px; - margin: 0 auto; - box-shadow: 0 1px 10px #a7a7a7, inset 0 1px 0 #fff; - background: #fcfcfc; - } - - h1 { - margin: 0 10px; - font-size: 50px; - text-align: center; - } - - h1 span { - color: #bbb; - } - - h3 { - margin: 1.5em 0 0.5em; - } - - p { - margin: 1em 0; - } - - ul { - padding: 0 0 0 40px; - margin: 1em 0; - } - - .container { - max-width: 380px; - _width: 380px; - margin: 0 auto; - } - - /* google search */ - - #goog-fixurl ul { - list-style: none; - padding: 0; - margin: 0; - } - - #goog-fixurl form { - margin: 0; - } - - #goog-wm-qt, - #goog-wm-sb { - border: 1px solid #bbb; - font-size: 16px; - line-height: normal; - vertical-align: top; - color: #444; - border-radius: 2px; - } - - #goog-wm-qt { - width: 220px; - height: 20px; - padding: 5px; - margin: 5px 10px 0 0; - box-shadow: inset 0 1px 1px #ccc; - } - - #goog-wm-sb { - display: inline-block; - height: 32px; - padding: 0 10px; - margin: 5px 0 0; - white-space: nowrap; - cursor: pointer; - background-color: #f5f5f5; - background-image: -webkit-linear-gradient(rgba(255,255,255,0), #f1f1f1); - background-image: -moz-linear-gradient(rgba(255,255,255,0), #f1f1f1); - background-image: -ms-linear-gradient(rgba(255,255,255,0), #f1f1f1); - background-image: -o-linear-gradient(rgba(255,255,255,0), #f1f1f1); - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - *overflow: visible; - *display: inline; - *zoom: 1; - } - - #goog-wm-sb:hover, - #goog-wm-sb:focus { - border-color: #aaa; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); - background-color: #f8f8f8; - } - - #goog-wm-qt:hover, - #goog-wm-qt:focus { - border-color: #105cb6; - outline: 0; - color: #222; - } - - input::-moz-focus-inner { - padding: 0; - border: 0; - } - </style> - </head> - <body> - <div class="container"> - <h1>Not found <span>:(</span></h1> - <p>Sorry, but the page you were trying to view does not exist.</p> - <p>It looks like this was the result of either:</p> - <ul> - <li>a mistyped address</li> - <li>an out-of-date link</li> - </ul> - <script> - var GOOG_FIXURL_LANG = (navigator.language || '').slice(0,2),GOOG_FIXURL_SITE = location.host; - </script> - <script src="//linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script> - </div> - </body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/293bcb34/contrib/blur-console/ui/app/robots.txt ---------------------------------------------------------------------- diff --git a/contrib/blur-console/ui/app/robots.txt b/contrib/blur-console/ui/app/robots.txt deleted file mode 100644 index ee2cc21..0000000 --- a/contrib/blur-console/ui/app/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# robotstxt.org/ - -User-agent: * http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/293bcb34/contrib/blur-console/ui/bower.json ---------------------------------------------------------------------- diff --git a/contrib/blur-console/ui/bower.json b/contrib/blur-console/ui/bower.json index 4c0ae05..55426a2 100644 --- a/contrib/blur-console/ui/bower.json +++ b/contrib/blur-console/ui/bower.json @@ -1,3 +1,19 @@ +/** + * 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. + */ { "name": "ui", "private": true, http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/293bcb34/contrib/blur-console/ui/test/bower.json ---------------------------------------------------------------------- diff --git a/contrib/blur-console/ui/test/bower.json b/contrib/blur-console/ui/test/bower.json index 5453ee2..d1059a4 100644 --- a/contrib/blur-console/ui/test/bower.json +++ b/contrib/blur-console/ui/test/bower.json @@ -1,3 +1,19 @@ +/** + * 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. + */ { "name": "ui", "private": true, http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/293bcb34/contrib/blur-console/ui/test/index.html ---------------------------------------------------------------------- diff --git a/contrib/blur-console/ui/test/index.html b/contrib/blur-console/ui/test/index.html index d18b7d3..8d1385e 100644 --- a/contrib/blur-console/ui/test/index.html +++ b/contrib/blur-console/ui/test/index.html @@ -1,3 +1,17 @@ +<!-- + +Licensed 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. + --> <!doctype html> <html> <head> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/293bcb34/contrib/blur-console/ui/test/spec/test.js ---------------------------------------------------------------------- diff --git a/contrib/blur-console/ui/test/spec/test.js b/contrib/blur-console/ui/test/spec/test.js index adfd614..6a8dcd9 100644 --- a/contrib/blur-console/ui/test/spec/test.js +++ b/contrib/blur-console/ui/test/spec/test.js @@ -1,3 +1,17 @@ +/* + +Licensed 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. +*/ /* global describe, it */ (function () { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/293bcb34/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index afc6673..0f14b3c 100644 --- a/pom.xml +++ b/pom.xml @@ -244,26 +244,25 @@ under the License. <exclude>**/.settings/**</exclude> <exclude>**/target/**</exclude> - <!-- 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> - - <!-- 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> - - <!-- Ruby gems --> - <exclude>contrib/blur-console/blur-admin/vendor/gems/cancan/**</exclude> + <!-- These javascript libs are added at build time but are not included in the src --> + <exclude>contrib/blur-console/ui/app/bower_components/**</exclude> - <!-- Generated during the rail build process in the blur-admin project --> - <exclude>contrib/blur-console/blur-admin/Gemfile.lock</exclude> + <!-- These files are used for UI testing and are added at development but not included in the src --> + <exclude>contrib/blur-console/ui/test/bower_components/**</exclude> + + <!-- JS Libraries that could not be included through bower --> + <exclude>contrib/blur-console/ui/app/lib/**</exclude> + + <!-- Files used for building the UI --> + <exclude>contrib/blur-console/ui/node_modules/**</exclude> + <exclude>contrib/blur-console/ui/.sass-cache/**</exclude> + <exclude>contrib/blur-console/**/.bowerrc</exclude> + <exclude>contrib/blur-console/ui/.editorconfig</exclude> + <exclude>contrib/blur-console/ui/.jshintrc</exclude> + <exclude>contrib/blur-console/ui/package.json</exclude> + + <!-- Legacy blur console --> + <exclude>contrib/blur-console-v1/**</exclude> <!-- Contains a list of english words that are used for load testing, adding a header would make the simple parsers more complex -->
