final rework of repo/source bundle licensing

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

Branch: refs/heads/release1.0.0
Commit: 93d77ae02b4c77f7cc0f4d7a2eea27ca322bc2ed
Parents: ed45611
Author: Dale LaBossiere <dlab...@us.ibm.com>
Authored: Thu Nov 10 09:15:29 2016 -0500
Committer: Dale LaBossiere <dlab...@us.ibm.com>
Committed: Thu Nov 10 09:15:29 2016 -0500

----------------------------------------------------------------------
 LICENSE                | 137 ++++++--------------------------------------
 licenses/d3-legend.MIT |  23 ++++++++
 licenses/d3-sankey.BSD |  30 ++++++++++
 licenses/d3.BSD        |  30 ++++++++++
 licenses/jquery-ui.MIT |  27 +++++++++
 licenses/jquery.MIT    |  27 +++++++++
 6 files changed, 154 insertions(+), 120 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/93d77ae0/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 56211db..7c57633 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,129 +201,26 @@
    limitations under the License.
 
 ======================================
-This product contains content covered by other licenses as follows
-      
-======================================
-console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom
-License type: MIT
-
-  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
-  
-  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
-
-  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.
-
-======================================
-console/servlets/webapp_content/js/ext/d3.legend.js
-License type: MIT
-
-  Copyright (c) 2012 ziggy.jonsson....@gmail.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.
-
-======================================
-console/servlets/webapp_content/js/ext/d3.min.js
-License type: BSD 3-Clause license
-
-  Copyright 2010-2016 Mike Bostock
-  All rights reserved.
+APACHE EDGENT SUBCOMPONENTS:
 
-  Redistribution and use in source and binary forms, with or without 
modification,
-  are permitted provided that the following conditions are met:
+Apache Edgent source includes a number of subcomponents with
+separate copyright notices and license terms.  Your use of the
+source code for these components is subject to the terms and
+conditions of the following licenses.
 
-  * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
+This product bundles d3-legend which is available under a MIT license.
+For details, see licenses/d3-legend.MIT
 
-  * 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.
+This product bundles portions of d3 which is available under a BSD license.
+For details, see licenses/d3.BSD
 
-  * Neither the name of the author nor the names of contributors may be used to
-    endorse or promote products derived from this software without specific 
prior
-    written permission.
+This product bundles portions of d3-sankey which is available under a BSD 
license.
+For details, see licenses/d3-sankey.BSD
+ 
+This product bundles portions of jquery-ui which is available under a MIT 
license.
+For details, see licenses/jquery-ui.MIT
+ 
+This product bundles portions of jquery which is available under a MIT license.
+For details, see licenses/jquery.MIT
 
-  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 OWNER 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.
-
-======================================
-console/servlets/webapp_content/js/ext/sankey_edgent.js
-License type: BSD 3-Clause license
-
-  Copyright 2015, Mike Bostock
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without 
modification,
-  are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-
-  * 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.
-
-  * Neither the name of the author nor the names of 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 OWNER 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/93d77ae0/licenses/d3-legend.MIT
----------------------------------------------------------------------
diff --git a/licenses/d3-legend.MIT b/licenses/d3-legend.MIT
new file mode 100644
index 0000000..0cde879
--- /dev/null
+++ b/licenses/d3-legend.MIT
@@ -0,0 +1,23 @@
+console/servlets/webapp_content/js/ext/d3.legend.js
+License type: MIT
+
+  Copyright (c) 2012 ziggy.jonsson....@gmail.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.

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/93d77ae0/licenses/d3-sankey.BSD
----------------------------------------------------------------------
diff --git a/licenses/d3-sankey.BSD b/licenses/d3-sankey.BSD
new file mode 100644
index 0000000..fd82aa0
--- /dev/null
+++ b/licenses/d3-sankey.BSD
@@ -0,0 +1,30 @@
+console/servlets/webapp_content/js/ext/sankey_edgent.js
+License type: BSD 3-Clause license
+
+  Copyright 2015, Mike Bostock
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
modification,
+  are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+
+  * 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.
+
+  * Neither the name of the author nor the names of 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 OWNER 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.

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/93d77ae0/licenses/d3.BSD
----------------------------------------------------------------------
diff --git a/licenses/d3.BSD b/licenses/d3.BSD
new file mode 100644
index 0000000..73508ef
--- /dev/null
+++ b/licenses/d3.BSD
@@ -0,0 +1,30 @@
+console/servlets/webapp_content/js/ext/d3.min.js
+License type: BSD 3-Clause license
+
+  Copyright 2010-2016 Mike Bostock
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
modification,
+  are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+
+  * 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.
+
+  * Neither the name of the author nor the names of 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 OWNER 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.

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/93d77ae0/licenses/jquery-ui.MIT
----------------------------------------------------------------------
diff --git a/licenses/jquery-ui.MIT b/licenses/jquery-ui.MIT
new file mode 100644
index 0000000..bb8f130
--- /dev/null
+++ b/licenses/jquery-ui.MIT
@@ -0,0 +1,27 @@
+console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom
+License type: MIT
+
+  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
+
+  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.

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/93d77ae0/licenses/jquery.MIT
----------------------------------------------------------------------
diff --git a/licenses/jquery.MIT b/licenses/jquery.MIT
new file mode 100644
index 0000000..1837c84
--- /dev/null
+++ b/licenses/jquery.MIT
@@ -0,0 +1,27 @@
+servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/external/jquery/jquery.js:
+License type: MIT
+
+  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
+
+  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.

Reply via email to