Updated Branches: refs/heads/master 7220407bb -> 7b37c061f
Update NOTICE for binary artifact Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/a3a8cc65 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/a3a8cc65 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/a3a8cc65 Branch: refs/heads/master Commit: a3a8cc654416c3b5403409b93c5e330242eeb1d7 Parents: b223f33 Author: williamstw <[email protected]> Authored: Thu Sep 12 21:13:57 2013 -0400 Committer: williamstw <[email protected]> Committed: Thu Sep 12 21:13:57 2013 -0400 ---------------------------------------------------------------------- NOTICE | 124 +++++++++++++++++++ distribution/src/main/resources/NOTICE-bin.txt | 8 ++ .../src/main/resources/license-notes.txt | 18 +-- .../main/resources/notices/generate-notice.sh | 12 ++ 4 files changed, 155 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3a8cc65/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index e9328e4..7f6c96b 100644 --- a/NOTICE +++ b/NOTICE @@ -6,3 +6,127 @@ Foundation (http://www.apache.org/). +================== NOTICE for: concurrentlinkedhashmap-lru-1.3.2.jar +ConcurrentLinkedHashMap +Copyright 2008, Ben Manes +Copyright 2010, Google Inc. + +Some alternate data structures provided by JSR-166e +from http://gee.cs.oswego.edu/dl/concurrency-interest/. +Written by Doug Lea and released as Public Domain. + +================== NOTICE for: jasper-compiler-5.5.12.jar +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + +Java Management Extensions (JMX) support is provided by +the MX4J package, which is open source software. The +original software and related information is available +at http://mx4j.sourceforge.net. + +The Windows Installer is built with the Nullsoft +Scriptable Install Sysem (NSIS), which is +open source software. The original software and +related information is available at +http://nsis.sourceforge.net. + +Java compilation software for JSP pages is provided by Eclipse, +which is open source software. The orginal software and +related infomation is available at +http://www.eclipse.org. + +================== NOTICE for: jasper-runtime-5.5.12.jar +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + +Java Management Extensions (JMX) support is provided by +the MX4J package, which is open source software. The +original software and related information is available +at http://mx4j.sourceforge.net. + +The Windows Installer is built with the Nullsoft +Scriptable Install Sysem (NSIS), which is +open source software. The original software and +related information is available at +http://nsis.sourceforge.net. + +Java compilation software for JSP pages is provided by Eclipse, +which is open source software. The orginal software and +related infomation is available at +http://www.eclipse.org. + +================== NOTICE for: jets3t-0.6.1.jar +========================================================================= +== NOTICE file corresponding to section 4(d) of the Apache License, == +== Version 2.0, in this case for the distribution of jets3t. == +========================================================================= + +This product includes software developed by: + +The Apache Software Foundation (http://www.apache.org/). + +The ExoLab Project (http://www.exolab.org/) + +Sun Microsystems (http://www.sun.com/) + +Codehaus (http://castor.codehaus.org) + +Safehaus (http://jug.safehaus.org/Home) + +Tatu Saloranta (http://wiki.fasterxml.com/TatuSaloranta) +================== NOTICE for: jetty-6.1.26.jar +============================================================== + Jetty Web Container + Copyright 1995-2009 Mort Bay Consulting Pty Ltd +============================================================== + +The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd +unless otherwise noted. It is licensed under the apache 2.0 +license. + +The javax.servlet package used by Jetty is copyright +Sun Microsystems, Inc and Apache Software Foundation. It is +distributed under the Common Development and Distribution License. +You can obtain a copy of the license at +https://glassfish.dev.java.net/public/CDDLv1.0.html. + +The UnixCrypt.java code ~Implements the one way cryptography used by +Unix systems for simple password protection. Copyright 1996 Aki Yoshida, +modified April 2001 by Iris Van den Broeke, Daniel Deville. +Permission to use, copy, modify and distribute UnixCrypt +for non-commercial or commercial purposes and without fee is +granted provided that the copyright notice appears in all copies. + +The default JSP implementation is provided by the Glassfish JSP engine +from project Glassfish http://glassfish.dev.java.net. Copyright 2005 +Sun Microsystems, Inc. and portions Copyright Apache Software Foundation. + +Some portions of the code are Copyright: + 2006 Tim Vernum + 1999 Jason Gilbert. + +The jboss integration module contains some LGPL code. + +The win32 Java Service Wrapper (v3.2.3) is Copyright (c) 1999, 2006 +Tanuki Software, Inc. and 2001 Silver Egg Technology. It is +covered by an open license which is viewable at +http://svn.codehaus.org/jetty/jetty/branches/jetty-6.1/extras/win32service/LICENSE.txt + +================== NOTICE for: metrics-core-2.2.0.jar +Metrics +Copyright 2010-2013 Coda Hale and Yammer, Inc. + +This product includes software developed by Coda Hale and Yammer, Inc. + +This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64, +LongAdder), which was released with the following comments: + + Written by Doug Lea with assistance from members of JCP JSR-166 + Expert Group and released to the public domain, as explained at + http://creativecommons.org/publicdomain/zero/1.0/ +================== NOTICE for: zookeeper-3.4.5.jar +Apache ZooKeeper +Copyright 2009 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3a8cc65/distribution/src/main/resources/NOTICE-bin.txt ---------------------------------------------------------------------- diff --git a/distribution/src/main/resources/NOTICE-bin.txt b/distribution/src/main/resources/NOTICE-bin.txt new file mode 100644 index 0000000..e9328e4 --- /dev/null +++ b/distribution/src/main/resources/NOTICE-bin.txt @@ -0,0 +1,8 @@ +Apache Blur +Copyright 2012-2013 The Apache Software Foundation + +This product includes software developed by The Apache Software +Foundation (http://www.apache.org/). + + + http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3a8cc65/distribution/src/main/resources/license-notes.txt ---------------------------------------------------------------------- diff --git a/distribution/src/main/resources/license-notes.txt b/distribution/src/main/resources/license-notes.txt index 85bf1be..a448433 100644 --- a/distribution/src/main/resources/license-notes.txt +++ b/distribution/src/main/resources/license-notes.txt @@ -1,14 +1,18 @@ -Surely there's a better way, but here's what's done. There's a little text file of the jar -files that shouldn't be included in the binary LICENSE file: /distribution/src/main/resources/license-bin.noinclude - -To see all files that should be accounted for in the license file: From the directory of the exploded binary package: -comm -3 <(find . -name *.jar | sort) <(cat ../../../distribution/src/main/resources/notice-bin.noinclude | sort) +To see if there are files unaccounted for: + +comm -3 <(cat ../../../LICENSE | grep ^./ | sort) <(find . -name *.jar | sort) + +Some helpful commands: + +Find any Apache Licensed jar file listed in our LICENSE that don't include a NOTICE file in the jar itself: +sort <(grep ALv2 LICENSE | awk '{print $1}') <(for f in `find . -name "*.jar"` ;do echo -n $f && printf ' NOTICE? %s\n' `jar -tf $f | grep NOTICE | wc -l` ;done | grep "NOTICE? 0" | awk '{print $1}') | uniq -d -Now, to see if there are files unaccounted for: +Update the binary NOTICE file: +cd ./distribution/src/main/resources/notices +./generate-notice.sh > ../../../../../NOTICE -comm -3 <(cat ../../../LICENSE | grep ^./ | sort) <(comm -3 <(find . -name *.jar | sort) <(cat ../../../distribution/src/main/resources/license-bin.noinclude | sort)) http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3a8cc65/distribution/src/main/resources/notices/generate-notice.sh ---------------------------------------------------------------------- diff --git a/distribution/src/main/resources/notices/generate-notice.sh b/distribution/src/main/resources/notices/generate-notice.sh new file mode 100755 index 0000000..0d9972c --- /dev/null +++ b/distribution/src/main/resources/notices/generate-notice.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +cat ../NOTICE-bin.txt + +for f in `ls *.NOTICE` +do + if [ -s $f ]; then + echo ================== NOTICE for: $f | sed -e 's/\.NOTICE//' + cat $f + echo + fi +done
