From 026fc520bb773c7a5db2809aa410c70a616ec911 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Tue, 30 Dec 2008 02:41:09 +0000 Subject: [PATCH] * Moved all third party license filed into the 'license' directory * Beautified NOTICE.txt --- NOTICE.txt | 43 ++++++++++++++----- .../LICENSE.base64.txt | 0 .../LICENSE.commons-logging.txt | 0 .../LICENSE.jboss-logging.txt | 0 .../LICENSE.jsr166y.txt | 0 .../LICENSE.log4j.txt | 0 .../LICENSE.protobuf.txt | 0 .../LICENSE.slf4j.txt | 0 pom.xml | 8 ++++ src/assembly/default.xml | 1 + 10 files changed, 42 insertions(+), 10 deletions(-) rename LICENSE.base64.txt => license/LICENSE.base64.txt (100%) rename LICENSE.commons-logging.txt => license/LICENSE.commons-logging.txt (100%) rename LICENSE.jboss-logging.txt => license/LICENSE.jboss-logging.txt (100%) rename LICENSE.jsr166y.txt => license/LICENSE.jsr166y.txt (100%) rename LICENSE.log4j.txt => license/LICENSE.log4j.txt (100%) rename LICENSE.protobuf.txt => license/LICENSE.protobuf.txt (100%) rename LICENSE.slf4j.txt => license/LICENSE.slf4j.txt (100%) diff --git a/NOTICE.txt b/NOTICE.txt index 93bd5c48a5..5b7b22320c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -24,42 +24,65 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA -Also, please refer to each LICENSE..txt file for the license -terms of the components that this product depends on. +Also, please refer to each LICENSE..txt file, which is located in +the 'license' directory of the distribution file, for the license terms of the +components that this product depends on. +------------------------------------------------------------------------------- This product contains the extensions to Java Collections Framework which has been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene: - * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/ - * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/ + * LICENSE: + * license/LICENSE.jsr177y.txt (Public Domain) + * HOMEPAGE: + * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/ + * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/ This product contains a modified version of Robert Harder's Public Domain Base64 Encoder and Decoder, which can be obtained at: - * http://iharder.sourceforge.net/current/java/base64/ + * LICENSE: + * license/LICENSE.base64.txt (Public Domain) + * HOMEPAGE: + * http://iharder.sourceforge.net/current/java/base64/ This product optionally depends on 'Protocol Buffers', Google's data interchange format, which can be obtained at: - * http://code.google.com/p/protobuf/ + * LICENSE: + * license/LICENSE.protobuf.txt (New BSD License) + * HOMEPAGE: + * http://code.google.com/p/protobuf/ This product optionally depends on 'SLF4J', a simple logging facade for Java, which can be obtained at: - * http://www.slf4j.org/ + * LICENSE: + * license/LICENSE.slf4j.txt (MIT License) + * HOMEPAGE: + * http://www.slf4j.org/ This product optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: - * http://commons.apache.org/logging/ + * LICENSE: + * license/LICENSE.commons-logging.txt (Apache License 2.0) + * HOMEPAGE: + * http://commons.apache.org/logging/ This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: - * http://logging.apache.org/log4j/ + * LICENSE: + * license/LICENSE.log4j.txt (Apache License 2.0) + * HOMEPAGE: + * http://logging.apache.org/log4j/ This product optionally depends on 'JBoss Logging', a logging framework, which can be obtained at: - * http://anonsvn.jboss.org/repos/common/common-logging-spi/ + * LICENSE: + * license/LICENSE.jboss-logging.txt (GNU LGPL 2.1) + * HOMEPAGE: + * http://anonsvn.jboss.org/repos/common/common-logging-spi/ diff --git a/LICENSE.base64.txt b/license/LICENSE.base64.txt similarity index 100% rename from LICENSE.base64.txt rename to license/LICENSE.base64.txt diff --git a/LICENSE.commons-logging.txt b/license/LICENSE.commons-logging.txt similarity index 100% rename from LICENSE.commons-logging.txt rename to license/LICENSE.commons-logging.txt diff --git a/LICENSE.jboss-logging.txt b/license/LICENSE.jboss-logging.txt similarity index 100% rename from LICENSE.jboss-logging.txt rename to license/LICENSE.jboss-logging.txt diff --git a/LICENSE.jsr166y.txt b/license/LICENSE.jsr166y.txt similarity index 100% rename from LICENSE.jsr166y.txt rename to license/LICENSE.jsr166y.txt diff --git a/LICENSE.log4j.txt b/license/LICENSE.log4j.txt similarity index 100% rename from LICENSE.log4j.txt rename to license/LICENSE.log4j.txt diff --git a/LICENSE.protobuf.txt b/license/LICENSE.protobuf.txt similarity index 100% rename from LICENSE.protobuf.txt rename to license/LICENSE.protobuf.txt diff --git a/LICENSE.slf4j.txt b/license/LICENSE.slf4j.txt similarity index 100% rename from LICENSE.slf4j.txt rename to license/LICENSE.slf4j.txt diff --git a/pom.xml b/pom.xml index a5d82e64ad..0bb7b689e8 100644 --- a/pom.xml +++ b/pom.xml @@ -205,6 +205,10 @@ + + + + @@ -217,6 +221,10 @@ + + + + diff --git a/src/assembly/default.xml b/src/assembly/default.xml index 9ccf42ea0c..0226f5e4de 100644 --- a/src/assembly/default.xml +++ b/src/assembly/default.xml @@ -39,6 +39,7 @@ **/COPYRIGHT* **/*.txt **/*.xml + **/license/** **/src/**