You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@chukwa.apache.org by ey...@apache.org on 2015/09/15 05:16:12 UTC
[1/2] chukwa git commit: CHUKWA-781. Redirect to login screen for
invalid session. (Eric Yang)
Repository: chukwa
Updated Branches:
refs/heads/master 6e9e7899d -> d3fba3fac
CHUKWA-781. Redirect to login screen for invalid session. (Eric Yang)
Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo
Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/978656ad
Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/978656ad
Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/978656ad
Branch: refs/heads/master
Commit: 978656ad9429803e34e175191e050f5d6dc6ef1f
Parents: 6e9e789
Author: Eric Yang <ey...@apache.org>
Authored: Mon Sep 14 20:03:51 2015 -0700
Committer: Eric Yang <ey...@apache.org>
Committed: Mon Sep 14 20:03:51 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/main/web/hicc/home/index.html | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/chukwa/blob/978656ad/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ca6b303..cd5b75d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -60,6 +60,8 @@ Trunk (unreleased changes)
BUGS
+ CHUKWA-781. Redirect to login screen for invalid session. (Eric Yang)
+
CHUKWA-779. Remove support for JSP pages. (Eric Yang)
CHUKWA-775. Updated Jersey version. (Eric Yang)
http://git-wip-us.apache.org/repos/asf/chukwa/blob/978656ad/src/main/web/hicc/home/index.html
----------------------------------------------------------------------
diff --git a/src/main/web/hicc/home/index.html b/src/main/web/hicc/home/index.html
index 112c2a1..b7ed0a1 100755
--- a/src/main/web/hicc/home/index.html
+++ b/src/main/web/hicc/home/index.html
@@ -270,7 +270,7 @@ $(function(){ //DOM Ready
}).done(function( html ) {
$('#username').append(html);
}).fail(function() {
- window.location = "/hicc/";
+ window.location = "/hicc/v1/login/check";
});
$.getJSON('/hicc/v1/session/key/dashboard',
[2/2] chukwa git commit: CHUKWA-780 Chukwa master branch failing with
RAT unapproved licsenses
Posted by ey...@apache.org.
CHUKWA-780 Chukwa master branch failing with RAT unapproved licsenses
Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo
Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/d3fba3fa
Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/d3fba3fa
Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/d3fba3fa
Branch: refs/heads/master
Commit: d3fba3fac8c17b1b2a5a835d74fbf57ac073fde6
Parents: 978656a
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Mon Sep 14 12:13:40 2015 -0700
Committer: Eric Yang <ey...@apache.org>
Committed: Mon Sep 14 20:16:04 2015 -0700
----------------------------------------------------------------------
pom.xml | 224 +++++++++++++++--------------
src/main/web/hicc/apps/pie.js | 18 ++-
src/main/web/hicc/timeline/js/main.js | 17 +++
3 files changed, 150 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/chukwa/blob/d3fba3fa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3dc2728..79c6c39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -753,121 +753,129 @@
</execution>
</executions>
<configuration>
- <numUnapprovedLicenses>0</numUnapprovedLicenses>
- <excludes>
- <!-- notice files -->
- <exclude>CHANGES.txt</exclude>
- <exclude>README.md</exclude>
+ <numUnapprovedLicenses>0</numUnapprovedLicenses>
+ <excludes>
+ <!-- notice files -->
+ <exclude>CHANGES.txt</exclude>
+ <exclude>README.md</exclude>
- <!-- generated files -->
- <exclude>bin/VERSION</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
+ <!-- generated files -->
+ <exclude>bin/VERSION</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
- <!-- Data files -->
- <exclude>conf/agents</exclude>
- <exclude>conf/alert</exclude>
- <exclude>conf/auth.conf</exclude>
- <exclude>conf/collectors</exclude>
- <exclude>conf/hbase.schema</exclude>
- <exclude>conf/initial_adaptors</exclude>
- <exclude>conf/jmxremote.access</exclude>
- <exclude>conf/jmxremote.password</exclude>
- <exclude>contrib/solr/logs/conf/_schema_analysis_stopwords_english.json</exclude>
- <exclude>contrib/solr/logs/conf/_schema_analysis_synonyms_english.json</exclude>
- <exclude>src/main/web/hicc/descriptors/**</exclude>
- <exclude>src/main/web/hicc/views/**</exclude>
+ <!-- Data files -->
+ <exclude>conf/agents</exclude>
+ <exclude>conf/alert</exclude>
+ <exclude>conf/auth.conf</exclude>
+ <exclude>conf/collectors</exclude>
+ <exclude>conf/hbase.schema</exclude>
+ <exclude>conf/initial_adaptors</exclude>
+ <exclude>conf/jmxremote.access</exclude>
+ <exclude>conf/jmxremote.password</exclude>
+ <exclude>contrib/solr/logs/conf/_schema_analysis_stopwords_english.json</exclude>
+ <exclude>contrib/solr/logs/conf/_schema_analysis_synonyms_english.json</exclude>
+ <exclude>src/main/web/hicc/descriptors/**</exclude>
+ <exclude>src/main/web/hicc/views/**</exclude>
- <!-- Test samples -->
- <exclude>src/test/resources/Hadoop18JobHistoryLog.txt</exclude>
- <exclude>src/test/resources/TestJobLog.txt</exclude>
- <exclude>test/samples/ClientTrace.log</exclude>
- <exclude>test/samples/Iostat.log</exclude>
- <exclude>test/samples/JobHistory.log</exclude>
+ <!-- Test samples -->
+ <exclude>src/test/resources/Hadoop18JobHistoryLog.txt</exclude>
+ <exclude>src/test/resources/TestJobLog.txt</exclude>
+ <exclude>test/samples/ClientTrace.log</exclude>
+ <exclude>test/samples/Iostat.log</exclude>
+ <exclude>test/samples/JobHistory.log</exclude>
- <!-- bsd licensed files -->
- <exclude>contrib/solr/logs/conf/lang/stopwords_da.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_de.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_es.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_fa.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_fi.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_fr.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_hi.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_hu.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_it.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_nl.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_no.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_pt.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_ru.txt</exclude>
- <exclude>contrib/solr/logs/conf/lang/stopwords_sv.txt</exclude>
- <exclude>src/main/web/hicc/js/jquery*</exclude>
- <exclude>src/main/web/hicc/home/js/jquery.js</exclude>
- <exclude>src/main/web/hicc/css/iui.css</exclude>
- <exclude>src/main/web/hicc/js/behaviour.js</exclude>
- <exclude>src/main/web/hicc/js/heatmap.js</exclude>
- <exclude>src/main/web/hicc/js/iui.js</exclude>
- <exclude>src/main/web/hicc/js/yahoo-dom-event.js</exclude>
- <exclude>src/main/web/hicc/js/treeview-min.js</exclude>
- <exclude>src/main/resources/ESAPI.properties</exclude>
+ <!-- bsd licensed files -->
+ <exclude>contrib/solr/logs/conf/lang/stopwords_da.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_de.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_es.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_fa.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_fi.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_fr.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_hi.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_hu.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_it.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_nl.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_no.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_pt.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_ru.txt</exclude>
+ <exclude>contrib/solr/logs/conf/lang/stopwords_sv.txt</exclude>
+ <exclude>src/main/web/hicc/js/jquery*</exclude>
+ <exclude>src/main/web/hicc/home/js/jquery.js</exclude>
+ <exclude>src/main/web/hicc/css/jquery.circliful.css</exclude>
+ <exclude>src/main/web/hicc/css/iui.css</exclude>
+ <exclude>src/main/web/hicc/js/behaviour.js</exclude>
+ <exclude>src/main/web/hicc/js/heatmap.js</exclude>
+ <exclude>src/main/web/hicc/js/iui.js</exclude>
+ <exclude>src/main/web/hicc/js/yahoo-dom-event.js</exclude>
+ <exclude>src/main/web/hicc/js/treeview-min.js</exclude>
+ <exclude>src/main/resources/ESAPI.properties</exclude>
- <!-- MIT licensed files -->
- <exclude>contrib/solr/logs/conf/velocity/jquery.autocomplete.js</exclude>
- <exclude>src/main/web/hicc/css/flexigrid/flexigrid.css</exclude>
- <exclude>src/main/web/hicc/css/timeline.css</exclude>
- <exclude>src/main/web/hicc/lib/timeline/**</exclude>
- <exclude>lib/agent.dict</exclude>
- <exclude>lib/collector.dict</exclude>
- <exclude>lib/confspellcheck-README</exclude>
- <exclude>lib/json-README.txt</exclude>
- <exclude>src/main/web/hicc/js/ajaxtree.js</exclude>
- <exclude>src/main/web/hicc/js/flexigrid.js</exclude>
- <exclude>src/main/web/hicc/js/flexigrid.pack.js</exclude>
- <exclude>src/main/web/hicc/js/workspace/builder.js</exclude>
- <exclude>src/main/web/hicc/js/workspace/controls.js</exclude>
- <exclude>src/main/web/hicc/js/workspace/dragdrop.js</exclude>
- <exclude>src/main/web/hicc/js/workspace/effects.js</exclude>
- <exclude>src/main/web/hicc/js/workspace/scriptaculous.js</exclude>
- <exclude>src/main/web/hicc/js/workspace/slider.js</exclude>
- <exclude>src/main/web/hicc/js/workspace/sound.js</exclude>
- <exclude>src/main/web/hicc/js/org/tool-man/*</exclude>
- <exclude>src/main/web/hicc/js/timeframe.js</exclude>
- <exclude>src/main/web/hicc/js/workspace/prototype.js</exclude>
- <exclude>src/main/web/hicc/js/jquery.flot.pack.js</exclude>
- <exclude>src/main/web/hicc/js/gsv.js</exclude>
- <exclude>src/main/web/hicc/js/bootstrap.min.js</exclude>
- <exclude>src/main/web/hicc/js/js-cookie.js</exclude>
- <exclude>src/main/web/hicc/css/bootstrap-theme.css.map</exclude>
- <exclude>src/main/web/hicc/css/bootstrap-theme.min.css</exclude>
- <exclude>src/main/web/hicc/css/bootstrap.min.css</exclude>
- <exclude>src/main/web/hicc/fonts/glyphicons-halflings-regular.svg</exclude>
- <exclude>src/main/web/hicc/home/js/jquery.gridster.min.js</exclude>
- <exclude>src/main/web/hicc/home/js/jquery.gridster.with-extras.min.js</exclude>
- <exclude>src/main/web/hicc/home/css/jquery.gridster.css</exclude>
- <exclude>src/main/web/hicc/home/css/jquery.gridster.min.css</exclude>
- <exclude>src/main/web/hicc/home/js/typeahead.bundle.js</exclude>
- <exclude>src/main/web/hicc/home/js/classie.js</exclude>
- <exclude>src/main/web/hicc/home/js/gnmenu.js</exclude>
- <exclude>src/main/web/hicc/home/js/modernizr.custom.js</exclude>
- <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.min.css</exclude>
- <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.structure.min.css</exclude>
- <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.theme.min.css</exclude>
- <exclude>src/main/web/hicc/ajax-solr/chukwa/js/jquery-ui.min.js</exclude>
- <exclude>src/main/web/hicc/ajax-solr/chukwa/js/require.min.js</exclude>
- <exclude>src/main/web/hicc/home/css/select2.min.css</exclude>
- <exclude>src/main/web/hicc/home/js/select2.min.js</exclude>
+ <!-- MIT licensed files -->
+ <exclude>contrib/solr/logs/conf/velocity/jquery.autocomplete.js</exclude>
+ <exclude>src/main/web/hicc/css/flexigrid/flexigrid.css</exclude>
+ <exclude>src/main/web/hicc/css/timeline.css</exclude>
+ <exclude>src/main/web/hicc/lib/timeline/**</exclude>
+ <exclude>lib/agent.dict</exclude>
+ <exclude>lib/collector.dict</exclude>
+ <exclude>lib/confspellcheck-README</exclude>
+ <exclude>lib/json-README.txt</exclude>
+ <exclude>src/main/web/hicc/js/ajaxtree.js</exclude>
+ <exclude>src/main/web/hicc/js/flexigrid.js</exclude>
+ <exclude>src/main/web/hicc/js/flexigrid.pack.js</exclude>
+ <exclude>src/main/web/hicc/js/workspace/builder.js</exclude>
+ <exclude>src/main/web/hicc/js/workspace/controls.js</exclude>
+ <exclude>src/main/web/hicc/js/workspace/dragdrop.js</exclude>
+ <exclude>src/main/web/hicc/js/workspace/effects.js</exclude>
+ <exclude>src/main/web/hicc/js/workspace/scriptaculous.js</exclude>
+ <exclude>src/main/web/hicc/js/workspace/slider.js</exclude>
+ <exclude>src/main/web/hicc/js/workspace/sound.js</exclude>
+ <exclude>src/main/web/hicc/js/org/tool-man/*</exclude>
+ <exclude>src/main/web/hicc/js/timeframe.js</exclude>
+ <exclude>src/main/web/hicc/js/workspace/prototype.js</exclude>
+ <exclude>src/main/web/hicc/js/jquery.flot.pack.js</exclude>
+ <exclude>src/main/web/hicc/js/gsv.js</exclude>
+ <exclude>src/main/web/hicc/js/bootstrap.min.js</exclude>
+ <exclude>src/main/web/hicc/js/js-cookie.js</exclude>
+ <exclude>src/main/web/hicc/css/bootstrap-theme.css.map</exclude>
+ <exclude>src/main/web/hicc/css/bootstrap-theme.min.css</exclude>
+ <exclude>src/main/web/hicc/css/bootstrap.min.css</exclude>
+ <exclude>src/main/web/hicc/fonts/glyphicons-halflings-regular.svg</exclude>
+ <exclude>src/main/web/hicc/home/js/jquery.gridster.min.js</exclude>
+ <exclude>src/main/web/hicc/home/js/jquery.gridster.with-extras.min.js</exclude>
+ <exclude>src/main/web/hicc/home/css/jquery.gridster.css</exclude>
+ <exclude>src/main/web/hicc/home/css/jquery.gridster.min.css</exclude>
+ <exclude>src/main/web/hicc/home/js/typeahead.bundle.js</exclude>
+ <exclude>src/main/web/hicc/home/js/classie.js</exclude>
+ <exclude>src/main/web/hicc/home/js/gnmenu.js</exclude>
+ <exclude>src/main/web/hicc/home/js/modernizr.custom.js</exclude>
+ <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.min.css</exclude>
+ <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.structure.min.css</exclude>
+ <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.theme.min.css</exclude>
+ <exclude>src/main/web/hicc/ajax-solr/chukwa/js/jquery-ui.min.js</exclude>
+ <exclude>src/main/web/hicc/ajax-solr/chukwa/js/require.min.js</exclude>
+ <exclude>src/main/web/hicc/home/css/select2.min.css</exclude>
+ <exclude>src/main/web/hicc/home/js/select2.min.js</exclude>
+ <exclude>src/main/web/hicc/css/font-awesome.min.css</exclude>
- <!-- Creative Commons licensed files -->
- <exclude>src/main/web/hicc/js/autoHeight.js</exclude>
+ <!-- Creative Commons licensed files -->
+ <exclude>src/main/web/hicc/js/autoHeight.js</exclude>
- <!-- Public Domain -->
- <exclude>src/main/web/hicc/js/base64.js</exclude>
- <exclude>src/main/web/hicc/js/canvas2image.js</exclude>
- <exclude>src/main/web/hicc/js/json.js</exclude>
- <exclude>src/main/web/hicc/home/fonts/codropsicons/*</exclude>
- <exclude>src/main/web/hicc/home/fonts/ecoicons/*</exclude>
- </excludes>
+ <!-- Public Domain -->
+ <exclude>src/main/web/hicc/js/base64.js</exclude>
+ <exclude>src/main/web/hicc/js/canvas2image.js</exclude>
+ <exclude>src/main/web/hicc/js/json.js</exclude>
+ <exclude>src/main/web/hicc/home/fonts/codropsicons/*</exclude>
+ <exclude>src/main/web/hicc/home/fonts/ecoicons/*</exclude>
+
+ <!-- DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE Version 2, December 2004 -->
+ <exclude>src/main/web/hicc/css/chartist.css</exclude>
+ <exclude>src/main/web/hicc/css/chartist.css.map</exclude>
+ <exclude>src/main/web/hicc/js/chartist.min.js</exclude>
+ <exclude>src/main/web/hicc/js/chartist.min.js.map</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/chukwa/blob/d3fba3fa/src/main/web/hicc/apps/pie.js
----------------------------------------------------------------------
diff --git a/src/main/web/hicc/apps/pie.js b/src/main/web/hicc/apps/pie.js
index dc575f6..f4eb7b6 100644
--- a/src/main/web/hicc/apps/pie.js
+++ b/src/main/web/hicc/apps/pie.js
@@ -1,8 +1,24 @@
+/*
+ * 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 data = {
labels: ['Mapreduce', 'HBase', 'Hive', 'Spark', 'BigSQL', 'R'],
series: [25, 19, 21,13, 12, 11]
};
-
var options = {
labelInterpolationFnc: function(value) {
return value[0]
http://git-wip-us.apache.org/repos/asf/chukwa/blob/d3fba3fa/src/main/web/hicc/timeline/js/main.js
----------------------------------------------------------------------
diff --git a/src/main/web/hicc/timeline/js/main.js b/src/main/web/hicc/timeline/js/main.js
index 2210b4b..7edf28e 100644
--- a/src/main/web/hicc/timeline/js/main.js
+++ b/src/main/web/hicc/timeline/js/main.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.
+ */
(function() {
$(document).ready(function() {
var timelineAnimate;