Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7BEA8200C0F for ; Thu, 2 Feb 2017 17:53:28 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7A209160B57; Thu, 2 Feb 2017 16:53:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A8321160B44 for ; Thu, 2 Feb 2017 17:53:25 +0100 (CET) Received: (qmail 8972 invoked by uid 500); 2 Feb 2017 16:53:24 -0000 Mailing-List: contact notifications-help@asterixdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.apache.org Delivered-To: mailing list notifications@asterixdb.apache.org Received: (qmail 8963 invoked by uid 99); 2 Feb 2017 16:53:24 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2017 16:53:24 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 4870FC0258 for ; Thu, 2 Feb 2017 16:53:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 3.126 X-Spam-Level: *** X-Spam-Status: No, score=3.126 tagged_above=-999 required=6.31 tests=[HTML_OFF_PAGE=1, MISSING_HEADERS=1.207, SPF_FAIL=0.919] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id y9yZvYzotek3 for ; Thu, 2 Feb 2017 16:53:03 +0000 (UTC) Received: from unhygienix.ics.uci.edu (unhygienix.ics.uci.edu [128.195.14.130]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 22C965FBBB for ; Thu, 2 Feb 2017 16:53:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by unhygienix.ics.uci.edu (Postfix) with ESMTP id C19EF241DE4; Thu, 2 Feb 2017 08:53:02 -0800 (PST) Date: Thu, 2 Feb 2017 08:53:02 -0800 From: "Michael Blow (Code Review)" CC: Jenkins , Till Westmann , Ian Maxon Reply-To: mblow@apache.org X-Gerrit-MessageType: merged Subject: Change in asterixdb[master]: RAT Cleanup, Resulting LICENSE fixes X-Gerrit-Change-Id: I029dee65ac6b1d7ab7bddba66257a4857f682caa X-Gerrit-ChangeURL: X-Gerrit-Commit: 5e17af20185fc5c138be5b6dea8a48d36c9ebd81 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/2.12.7 Message-Id: <20170202165302.C19EF241DE4@unhygienix.ics.uci.edu> archived-at: Thu, 02 Feb 2017 16:53:28 -0000 Michael Blow has submitted this change and it was merged. Change subject: RAT Cleanup, Resulting LICENSE fixes ...................................................................... RAT Cleanup, Resulting LICENSE fixes Also: - removed unused minimal javascript - relocated storage test datagen package to hyracks-test-support - eliminated MiniDFSCluster writes outside of target - clean up .gitignore - add line comments to PigletParser (taken from SQLPP.jj grammar) Change-Id: I029dee65ac6b1d7ab7bddba66257a4857f682caa Reviewed-on: https://asterix-gerrit.ics.uci.edu/1468 Tested-by: Jenkins BAD: Jenkins Reviewed-by: Till Westmann --- M .gitignore M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java M hyracks-fullstack/LICENSE M hyracks-fullstack/algebricks/algebricks-examples/piglet-example/src/main/javacc/PigletParser.jj M hyracks-fullstack/algebricks/algebricks-examples/piglet-example/testcases/q1.piglet M hyracks-fullstack/algebricks/algebricks-examples/piglet-example/testcases/q2.piglet M hyracks-fullstack/algebricks/algebricks-tests/pom.xml M hyracks-fullstack/algebricks/pom.xml M hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/source_licenses.ftl M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/AbstractPage.html D hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/excanvas.min.js D hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.colorhelpers.min.js D hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.crosshair.min.js D hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.fillbetween.min.js D hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.image.min.js D hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.navigate.min.js D hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.pie.min.js D hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.selection.min.js D hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.stack.min.js D hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.symbol.min.js D hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.threshold.min.js M hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml M hyracks-fullstack/hyracks/hyracks-dist/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/dataflow/DataflowTest.java M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/utils/TestUtils.java M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/dataflow/DataflowTest.java M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/hadoop/conf/core-site.xml M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/hadoop/conf/hdfs-site.xml M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/hadoop/conf/mapred-site.xml M hyracks-fullstack/hyracks/hyracks-test-support/pom.xml R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/DataGenThread.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/DataGenUtils.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/DocumentStringFieldValueGenerator.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/DoubleFieldValueGenerator.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/FloatFieldValueGenerator.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/IFieldValueGenerator.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/IntegerFieldValueGenerator.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/PersonNameFieldValueGenerator.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/ProbabilityHelper.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/SortedDoubleFieldValueGenerator.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/SortedFloatFieldValueGenerator.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/SortedIntegerFieldValueGenerator.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/StringFieldValueGenerator.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleBatch.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleGenerator.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestUtils.java R hyracks-fullstack/hyracks/hyracks-test-support/src/main/resources/dist.all.first.cleaned R hyracks-fullstack/hyracks/hyracks-test-support/src/main/resources/dist.all.last.cleaned M hyracks-fullstack/hyracks/pom.xml M hyracks-fullstack/pom.xml 55 files changed, 486 insertions(+), 386 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified; No violations found Objections: Jenkins: Violations found diff --git a/.gitignore b/.gitignore index b51e271..4eb379b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,14 +5,11 @@ .settings .project ClusterControllerService -asterix_logs -build asterixdb/asterix-opt asterixdb/asterix-app/src/test/resources/externallib asterixdb/asterix-app/library asterixdb/asterix-app/data/csv/beer.csv asterixdb/asterix-installer/src/test/resources/clusterts/asterix-installer-*-SNAPSHOT-binary-assembly -asterixdb/asterix-installer/ittest/ *-coredump *.pyc *.iml @@ -20,11 +17,7 @@ *.ipr *.iws git.properties -actual exception -expected -teststore1 -teststore2 dev1 dev2 dev3 @@ -32,7 +25,6 @@ derby.log hadoop-conf-tmp metastore_db -teststore output tmp dist diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java index 74c7091..9d35d89 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java @@ -40,6 +40,7 @@ public class HDFSCluster { private static final String PATH_TO_HADOOP_CONF = "src/test/resources/hadoop/conf"; + private static final String MINIDFS_BASEDIR = "target" + File.separatorChar + "hdfs"; private static final int nameNodePort = 31888; private static final String DATA_PATH = "data/hdfs"; private static final String HDFS_PATH = "/asterix"; @@ -73,6 +74,7 @@ conf.addResource(new Path(basePath + PATH_TO_HADOOP_CONF + "/hdfs-site.xml")); cleanupLocal(); setLoggingLevel(Level.WARN); + conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, MINIDFS_BASEDIR); MiniDFSCluster.Builder build = new MiniDFSCluster.Builder(conf); build.nameNodePort(nameNodePort); build.numDataNodes(numDataNodes); diff --git a/hyracks-fullstack/LICENSE b/hyracks-fullstack/LICENSE index fa9d611..e317ed0 100644 --- a/hyracks-fullstack/LICENSE +++ b/hyracks-fullstack/LICENSE @@ -206,11 +206,49 @@ === Portions of the Hyracks admin console located at: - hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/ + hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.resize.min.js are available under The MIT License: --- - Copyright (c) 2007-2014 IOLA and Ole Laursen + Copyright (c) 2007-2009 IOLA and Ole Laursen + + 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. + + /* Inline dependency: + * jQuery resize event - v1.1 - 3/14/2010 + * http://benalman.com/projects/jquery-resize-plugin/ + * + * Copyright (c) 2010 "Cowboy" Ben Alman + * Dual licensed under the MIT and GPL licenses. + * http://benalman.com/about/license/ + */ +--- + Portions of the Hyracks admin console + located at: + hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.min.js + + are available under The MIT License: +--- + Copyright (c) 2007-2009 IOLA and Ole Laursen Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -235,30 +273,28 @@ --- Portions of the Hyracks admin console located at: - hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/jsplumb/ + hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/jsplumb/jquery.jsPlumb-1.3.5-all-min.js are available under The MIT License: --- - Copyright (c) 2010 - 2014 jsPlumb, http://jsplumbtoolkit.com/ - - 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. + /* + * jsPlumb + * + * Title:jsPlumb 1.3.5 + * + * Provides a way to visually connect elements on an HTML page, using either SVG, Canvas + * elements, or VML. + * + * This file contains the jsPlumb core code. + * + * Copyright (c) 2010 - 2012 Simon Porritt (simon.porritt@gmail.com) + * + * http://jsplumb.org + * http://github.com/sporritt/jsplumb + * http://code.google.com/p/jsplumb + * + * Dual licensed under the MIT and GPL2 licenses. + */ --- Portions of the Hyracks admin console located at: diff --git a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/src/main/javacc/PigletParser.jj b/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/src/main/javacc/PigletParser.jj index bb8db50..103003c 100644 --- a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/src/main/javacc/PigletParser.jj +++ b/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/src/main/javacc/PigletParser.jj @@ -388,3 +388,8 @@ { < #Extender : ["\u00b7", "\u02d0", "\u02d1", "\u0387", "\u0640", "\u0e46", "\u0ec6", "\u3005", "\u3031" - "\u3035", "\u309d" - "\u309e", "\u30fc" - "\u30fe"] > } + +SKIP: +{ + <"--" (~["\n","\r"])* ("\n"|"\r"|"\r\n")?> +} diff --git a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/testcases/q1.piglet b/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/testcases/q1.piglet index 88111ff..ff1806e 100644 --- a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/testcases/q1.piglet +++ b/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/testcases/q1.piglet @@ -1,2 +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. + R = load "nc1:data/file1.txt,nc2:data/file2.txt" as (id : int, name : chararray); dump R into "nc1:output"; diff --git a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/testcases/q2.piglet b/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/testcases/q2.piglet index 5c45ac1..0335b7d 100644 --- a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/testcases/q2.piglet +++ b/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/testcases/q2.piglet @@ -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. + R = load "nc1:data/file1.txt,nc2:data/file2.txt" as (id : int, name : chararray); S = filter R by id == 5; dump S into "nc1:output"; diff --git a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml index 345c0fe..1d509cf 100644 --- a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml @@ -67,6 +67,16 @@ + + org.apache.rat + apache-rat-plugin + + + data/** + src/test/resources/results/scanMicroSortWrite.out + + + diff --git a/hyracks-fullstack/algebricks/pom.xml b/hyracks-fullstack/algebricks/pom.xml index 535f533..c8591e7 100644 --- a/hyracks-fullstack/algebricks/pom.xml +++ b/hyracks-fullstack/algebricks/pom.xml @@ -38,19 +38,6 @@ - - - - org.apache.rat - apache-rat-plugin - 0.11 - - true - - - - - ${basedir}/.. diff --git a/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/source_licenses.ftl b/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/source_licenses.ftl index d142630..677e85e 100644 --- a/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/source_licenses.ftl +++ b/hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/source_licenses.ftl @@ -48,51 +48,85 @@ --- -<@license files="static/javascript/flot/" licenseName="The MIT License"> - Copyright (c) 2007-2014 IOLA and Ole Laursen +<@license files="static/javascript/flot/jquery.flot.resize.min.js" licenseName="The MIT License"> +<#-- https://github.com/flot/flot/blob/v0.7/jquery.flot.resize.js --> + Copyright (c) 2007-2009 IOLA and Ole Laursen - 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: + 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 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. + 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. + +/* Inline dependency: + * jQuery resize event - v1.1 - 3/14/2010 + * http://benalman.com/projects/jquery-resize-plugin/ + * + * Copyright (c) 2010 "Cowboy" Ben Alman + * Dual licensed under the MIT and GPL licenses. + * http://benalman.com/about/license/ + */ -<@license files="static/javascript/jsplumb/" licenseName="The MIT License"> - Copyright (c) 2010 - 2014 jsPlumb, http://jsplumbtoolkit.com/ +<@license files="static/javascript/flot/jquery.flot.min.js" licenseName="The MIT License"> +<#-- https://github.com/flot/flot/blob/v0.7/jquery.flot.js --> + Copyright (c) 2007-2009 IOLA and Ole Laursen - 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: + 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 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. + 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. + +<@license files="static/javascript/jsplumb/jquery.jsPlumb-1.3.5-all-min.js" licenseName="The MIT License"> +<#-- https://github.com/jsplumb/jsPlumb/blob/1.3.5/js/1.3.5/jquery.jsPlumb-1.3.5-all.js --> +/* + * jsPlumb + * + * Title:jsPlumb 1.3.5 + * + * Provides a way to visually connect elements on an HTML page, using either SVG, Canvas + * elements, or VML. + * + * This file contains the jsPlumb core code. + * + * Copyright (c) 2010 - 2012 Simon Porritt (simon.porritt@gmail.com) + * + * http://jsplumb.org + * http://github.com/sporritt/jsplumb + * http://code.google.com/p/jsplumb + * + * Dual licensed under the MIT and GPL2 licenses. + */ <@license files=["static/javascript/jquery", "static/javascript/jquery-ui"] licenseName="The MIT License"> Copyright jQuery Foundation and other contributors, https://jquery.org/ diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml index 105d47f..0b8d6fe 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@ -31,6 +31,47 @@ ${basedir}/../../.. pom.xml,src/main/java,src/main/resources + + + + org.apache.rat + apache-rat-plugin + + + validate + + check + + + + + + + + MIT + The MIT License + For JQuery MIT/GPL2 Dual License + + jQuery UI 1.8.17 + jQuery v1.6.4 + Released under the MIT license by IOLA, December 2007. + licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) + jQuery UI CSS Framework 1.8.17 + + + + + + + + + src/main/resources/static/javascript/flot/jquery.flot.resize.min.js + src/main/resources/static/javascript/jsplumb/jquery.jsPlumb-1.3.5-all-min.js + + + + + org.apache.hyracks diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE index 15cf255..b145f06 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE @@ -1,11 +1,48 @@ Portions of the Hyracks admin console - in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly located at: - static/javascript/flot/ + static/javascript/flot/jquery.flot.resize.min.js are available under The MIT License: --- - Copyright (c) 2007-2014 IOLA and Ole Laursen + Copyright (c) 2007-2009 IOLA and Ole Laursen + + 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. + + /* Inline dependency: + * jQuery resize event - v1.1 - 3/14/2010 + * http://benalman.com/projects/jquery-resize-plugin/ + * + * Copyright (c) 2010 "Cowboy" Ben Alman + * Dual licensed under the MIT and GPL licenses. + * http://benalman.com/about/license/ + */ +--- + Portions of the Hyracks admin console + located at: + static/javascript/flot/jquery.flot.min.js + + are available under The MIT License: +--- + Copyright (c) 2007-2009 IOLA and Ole Laursen Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -29,35 +66,31 @@ OTHER DEALINGS IN THE SOFTWARE. --- Portions of the Hyracks admin console - in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly located at: - static/javascript/jsplumb/ + static/javascript/jsplumb/jquery.jsPlumb-1.3.5-all-min.js are available under The MIT License: --- - Copyright (c) 2010 - 2014 jsPlumb, http://jsplumbtoolkit.com/ - - 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. + /* + * jsPlumb + * + * Title:jsPlumb 1.3.5 + * + * Provides a way to visually connect elements on an HTML page, using either SVG, Canvas + * elements, or VML. + * + * This file contains the jsPlumb core code. + * + * Copyright (c) 2010 - 2012 Simon Porritt (simon.porritt@gmail.com) + * + * http://jsplumb.org + * http://github.com/sporritt/jsplumb + * http://code.google.com/p/jsplumb + * + * Dual licensed under the MIT and GPL2 licenses. + */ --- Portions of the Hyracks admin console - in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly located at: static/javascript/jquery, and @@ -103,7 +136,6 @@ the terms above. --- Portions of the Hyracks admin console - in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly located at: static/javascript/jquery/plugins/jquery.getParams.js @@ -116,7 +148,6 @@ Thanks to Hinnerk Ruemenapf - http://hinnerk.ruemenapf.de/ for bug reporting and fixing. --- Portions of the Hyracks admin console - in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly located at: static/javascript/jquery/plugins/jquery.timer.js @@ -149,7 +180,6 @@ SOFTWARE. --- Portions of the Hyracks admin console - in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly located at: static/stylesheet/json.human.css, and diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/AbstractPage.html b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/AbstractPage.html index ecd0edf..e0f60b2 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/AbstractPage.html +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/AbstractPage.html @@ -28,7 +28,7 @@ - +