Repository: incubator-edgent
Updated Branches:
  refs/heads/master 03bc77cb0 -> 16ce45df0


EDGENT-262 remove console licenses


Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/16ce45df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/16ce45df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/16ce45df

Branch: refs/heads/master
Commit: 16ce45df00296b886c8cb5582e265d5a5b0344a8
Parents: 03bc77c
Author: Susan L. Cline <[email protected]>
Authored: Fri Oct 7 16:39:46 2016 -0700
Committer: Susan L. Cline <[email protected]>
Committed: Fri Oct 7 16:39:46 2016 -0700

----------------------------------------------------------------------
 console/servlets/LICENSE                        |  2 +-
 .../servlets/webapp_content/js/ext/MIT.LICENSE  | 20 ---------
 .../webapp_content/js/ext/d3.BSD.LICENSE        | 28 -------------
 .../jquery-ui-1.11.4.custom/jquery-ui.LICENSE   | 43 --------------------
 .../ext/jquery-ui-1.11.4.custom/jquery.LICENSE  | 36 ----------------
 .../webapp_content/js/ext/sankey.d3.BSD.LICENSE | 28 -------------
 6 files changed, 1 insertion(+), 156 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/16ce45df/console/servlets/LICENSE
----------------------------------------------------------------------
diff --git a/console/servlets/LICENSE b/console/servlets/LICENSE
index 2786e64..44687a9 100644
--- a/console/servlets/LICENSE
+++ b/console/servlets/LICENSE
@@ -4,7 +4,7 @@ The files under servlets/webapp_content/ext are:
 d3.legend.js: 
 Obtained from: https://github.com/jieter/d3-legend/blob/master/d3.legend.js
 License type: MIT license
-License: console/servlets/webapp_content/exit/MIT.LICENSE
+License: https://opensource.org/licenses/MIT
 
 
 d3.min.js: 

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/16ce45df/console/servlets/webapp_content/js/ext/MIT.LICENSE
----------------------------------------------------------------------
diff --git a/console/servlets/webapp_content/js/ext/MIT.LICENSE 
b/console/servlets/webapp_content/js/ext/MIT.LICENSE
deleted file mode 100644
index 7782fcf..0000000
--- a/console/servlets/webapp_content/js/ext/MIT.LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-MIT License
-Copyright (c) 2012 [email protected]
-
-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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/16ce45df/console/servlets/webapp_content/js/ext/d3.BSD.LICENSE
----------------------------------------------------------------------
diff --git a/console/servlets/webapp_content/js/ext/d3.BSD.LICENSE 
b/console/servlets/webapp_content/js/ext/d3.BSD.LICENSE
deleted file mode 100644
index 95e1c42..0000000
--- a/console/servlets/webapp_content/js/ext/d3.BSD.LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-The BSD 3-Clause License
-The following is a BSD 3-Clause ("BSD New" or "BSD Simplified") license 
template. To generate your own license, change the values of OWNER, 
ORGANIZATION and YEAR from their original values as given here, and substitute 
your own.
-
-Note: You may omit clause 3 and still be OSD-conformant. Despite its 
colloquial name "BSD New", this is not the newest version of the BSD license; 
it was followed by the even newer BSD-2-Clause version, sometimes known as the 
"Simplified BSD License". On January 9th, 2008 the OSI Board approved 
BSD-2-Clause, which is used by FreeBSD and others. It omits the final 
"no-endorsement" clause and is thus roughly equivalent to the MIT License.
-
-Historical Background: The original license used on BSD Unix had four clauses. 
The advertising clause (the third of four clauses) required you to acknowledge 
use of U.C. Berkeley code in your advertising of any product using that code. 
It was officially rescinded by the Director of the Office of Technology 
Licensing of the University of California on July 22nd, 1999. He states that 
clause 3 is "hereby deleted in its entirety." The four clause license has not 
been approved by OSI. The license below does not contain the advertising clause.
-
-This prelude is not part of the license.
-<OWNER> = Regents of the University of California
-<ORGANIZATION> = University of California, Berkeley
-<YEAR> = 1998
-
-In the original BSD license, the occurrence of "copyright holder" in the 3rd 
clause read "ORGANIZATION", placeholder for "University of California". In the 
original BSD license, both occurrences of the phrase "COPYRIGHT HOLDERS AND 
CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS".
-
-Here is the license template:
-
-Copyright (c) <YEAR>, <OWNER>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this 
list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, 
this list of conditions and the following disclaimer in the documentation 
and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors 
may be used to endorse or promote products derived from this software without 
specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/16ce45df/console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/jquery-ui.LICENSE
----------------------------------------------------------------------
diff --git 
a/console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/jquery-ui.LICENSE
 
b/console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/jquery-ui.LICENSE
deleted file mode 100644
index a685832..0000000
--- 
a/console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/jquery-ui.LICENSE
+++ /dev/null
@@ -1,43 +0,0 @@
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery-ui
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-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.
-
-====
-
-Copyright and related rights for sample code are waived via CC0. Sample
-code is defined as all source code contained within the demos directory.
-
-CC0: http://creativecommons.org/publicdomain/zero/1.0/
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/16ce45df/console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/jquery.LICENSE
----------------------------------------------------------------------
diff --git 
a/console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/jquery.LICENSE 
b/console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/jquery.LICENSE
deleted file mode 100644
index 67ea1d6..0000000
--- 
a/console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/jquery.LICENSE
+++ /dev/null
@@ -1,36 +0,0 @@
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-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.
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/16ce45df/console/servlets/webapp_content/js/ext/sankey.d3.BSD.LICENSE
----------------------------------------------------------------------
diff --git a/console/servlets/webapp_content/js/ext/sankey.d3.BSD.LICENSE 
b/console/servlets/webapp_content/js/ext/sankey.d3.BSD.LICENSE
deleted file mode 100644
index 95e1c42..0000000
--- a/console/servlets/webapp_content/js/ext/sankey.d3.BSD.LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-The BSD 3-Clause License
-The following is a BSD 3-Clause ("BSD New" or "BSD Simplified") license 
template. To generate your own license, change the values of OWNER, 
ORGANIZATION and YEAR from their original values as given here, and substitute 
your own.
-
-Note: You may omit clause 3 and still be OSD-conformant. Despite its 
colloquial name "BSD New", this is not the newest version of the BSD license; 
it was followed by the even newer BSD-2-Clause version, sometimes known as the 
"Simplified BSD License". On January 9th, 2008 the OSI Board approved 
BSD-2-Clause, which is used by FreeBSD and others. It omits the final 
"no-endorsement" clause and is thus roughly equivalent to the MIT License.
-
-Historical Background: The original license used on BSD Unix had four clauses. 
The advertising clause (the third of four clauses) required you to acknowledge 
use of U.C. Berkeley code in your advertising of any product using that code. 
It was officially rescinded by the Director of the Office of Technology 
Licensing of the University of California on July 22nd, 1999. He states that 
clause 3 is "hereby deleted in its entirety." The four clause license has not 
been approved by OSI. The license below does not contain the advertising clause.
-
-This prelude is not part of the license.
-<OWNER> = Regents of the University of California
-<ORGANIZATION> = University of California, Berkeley
-<YEAR> = 1998
-
-In the original BSD license, the occurrence of "copyright holder" in the 3rd 
clause read "ORGANIZATION", placeholder for "University of California". In the 
original BSD license, both occurrences of the phrase "COPYRIGHT HOLDERS AND 
CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS".
-
-Here is the license template:
-
-Copyright (c) <YEAR>, <OWNER>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this 
list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, 
this list of conditions and the following disclaimer in the documentation 
and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors 
may be used to endorse or promote products derived from this software without 
specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

Reply via email to