Update LICENSE and NOTICE files based on our current java usage

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@690272 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 67 insertions, 78 deletions

diff --git a/qpid/java/resources/LICENSE b/qpid/java/resources/LICENSE
index 9a960492c5..18db52101c 100644
--- a/qpid/java/resources/LICENSE
+++ b/qpid/java/resources/LICENSE
@@ -1,3 +1,6 @@
+=========================================================================
+==  Apache License                                                     ==
+=========================================================================
 
                                  Apache License
                            Version 2.0, January 2004
@@ -203,7 +206,7 @@
 
 
 =========================================================================
-==  SL4Fj License                                                      ==
+==  SL4Fj (MIT) License                                                ==
 =========================================================================
 
 SLF4J License
@@ -339,7 +342,7 @@ All trademarks and registered trademarks mentioned herein are the property of th
 
 
 =========================================================================
-==  AMQP License                                                        ==
+==  AMQP License                                                       ==
 =========================================================================
 Copyright Notice
     ================
@@ -458,3 +461,37 @@ Copyright Notice
     http://www.redhat.com/solutions/specifications/amqp/
     http://www.twiststandards.org/tiki-index.php?page=AMQ
     http://www.imatix.com/amqp
+
+
+=========================================================================
+==  Java CC (BSD) License                                              ==
+=========================================================================
+Copyright (c) 2006, Sun Microsystems, Inc.
+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 Sun Microsystems, Inc. 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 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.
+
+
+
diff --git a/qpid/java/resources/NOTICE b/qpid/java/resources/NOTICE
index 79768ab677..a93f0d1c3c 100644
--- a/qpid/java/resources/NOTICE
+++ b/qpid/java/resources/NOTICE
@@ -1,7 +1,8 @@
 // ------------------------------------------------------------------
 // NOTICE file corresponding to the section 4d of The Apache License,
-// Version 2.0, in this case for Qpid Common Utilities
+// Version 2.0, in this case for Qpid Java
 // ------------------------------------------------------------------
+// Maintain in Jar file system sort order.
 
 Apache Qpid
 Copyright 2006-2008 Apache Software Foundation
@@ -10,99 +11,58 @@ This product includes software developed at
 Apache Software Foundation (http://www.apache.org/)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 
-This product includes/uses software, Unnamed - relaxngDatatype:relaxngDatatype:jar:20020414 (http://sourceforge.net/projects/relaxng)
-License: BSD License (http://www.opensource.org/licenses/bsd-license.php)
-
-This product includes/uses software, Apache MINA Core API (http://directory.apache.org/projects/mina/)
-License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
-
-This product includes/uses software, Unnamed - isorelax:isorelax:jar:20020414
-License: MIT license (http://www.opensource.org/licenses/mit-license.html)
-
-This product includes/uses software, SLF4J API Module (http://www.slf4j.org),
-developed by QOS.ch  (http://www.qos.ch)
-License: MIT License (http://www.slf4j.org/license.html)
-
-This product includes/uses software, Commons Collections - commons-collections:commons-collections:jar:3.1,
-developed by Apache Software Foundation  (http://www.apache.org)
-License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
+This product includes/uses software, Backport of JSR 166 (http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/),
+developed by Dawid Kurzyniec (http://www.mathcs.emory.edu/~dawidk/)
+License: Public Domain  (http://creativecommons.org/licenses/publicdomain)
 
-This product includes/uses software, Commons Digester - commons-digester:commons-digester:jar:1.6
-developed by Apache Software Foundation  (http://www.apache.org)
-License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
+This product includes/uses software, ICU4J - ICU4J 3.4.4
+developed by the ICU Project (http://icu-project.org/)
+License: http://source.icu-project.org/repos/icu/icu/trunk/license.html
 
 This product includes/uses software, Commons CLI - commons-cli:commons-cli:jar:1.0
 Ideveloped by Apache Software Foundation  (http://www.apache.org)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 
-This product includes/uses software, Unnamed - msv:msv:jar:20020414
-developed by (https://msv.dev.java.net/)
-License: 
-
-This product includes/uses software, Codec (http://jakarta.apache.org/commons/codec/),
+This product includes/uses software, Commons Codec commons-collections:commons-codec:jar:1.3, (http://jakarta.apache.org/commons/codec/),
 developed by The Apache Software Foundation  (http://jakarta.apache.org)
 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
 
-This product includes/uses software, Commons Logging - commons-logging:commons-logging:jar:1.0
+This product includes/uses software, Commons Collections - commons-collections:commons-collections:jar:3.1,
 developed by Apache Software Foundation  (http://www.apache.org)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 
-This product includes/uses software, Backport of JSR 166 (http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/),
-developed by Dawid Kurzyniec (http://www.mathcs.emory.edu/~dawidk/)
-License: Public Domain  (http://creativecommons.org/licenses/publicdomain)
+This product includes/uses software, Commons Configuration commons-collections:commons-configuration:jar:1.2, (http://jakarta.apache.org/commons/),
+developed by The Apache Software Foundation  (http://jakarta.apache.org)
+License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 
 This product includes/uses software, Commons Lang - commons-lang:commons-lang:jar:2.1
 developed by Apache Software Foundation  (http://www.apache.org)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 
-This product includes/uses software, Apache MINA SSL Filter (http://directory.apache.org/subprojects/mina/mina-filter-ssl)
+This product includes/uses software, Commons Logging - commons-logging:commons-logging:jar:1.0.4
 developed by Apache Software Foundation  (http://www.apache.org)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 
-This product includes/uses software, Unnamed - xerces:xercesImpl:jar:2.2.1
-developed by The Apache Software Foundation  (http://jakarta.apache.org)
-License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
-
-This product includes/uses software,  - javax.servlet:servlet-api:jar:2.3
-
-This product includes/uses software, Xalan - xalan:xalan:jar:2.7.0
+This product includes/uses software, Geronimo JMS
 developed by Apache Software Foundation  (http://www.apache.org)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 
-This product includes/uses software, Commons Configuration (http://jakarta.apache.org/commons/),
-developed by The Apache Software Foundation  (http://jakarta.apache.org)
-License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
+This product includes/uses software, Javacc - javacc.jar
+License: BSD License (https://javacc.dev.java.net/)
 
-This product includes/uses software, Apache MINA Java5 Extensions (http://directory.apache.org/subprojects/mina/mina-java5)
+This product includes/uses software, JUnit Toolkit (http://sourceforge.net/projects/junit-toolkit/)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 
-This product includes/uses software, Jaxen - jaxen:jaxen:jar:1.0-FCS
-License: Apache License (http://jaxen.org/faq.html)
-
-This product includes/uses software, BeanUtils (http://jakarta.apache.org/commons/beanutils/)
-developed by The Apache Software Foundation  (http://jakarta.apache.org)
+This product includes/uses software, Apache Log4j (http://logging.apache.org/log4j/1.2)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 
-This product includes/uses software, XML Commons External Components XML APIs (http://xml.apache.org/commons/#external),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Commons Beanutils Core - commons-beanutils:commons-beanutils-core:jar:1.7.0
-developed by The Apache Software Foundation  (http://jakarta.apache.org)
+This product includes/uses software, Apache MINA Core API (http://directory.apache.org/projects/mina/)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 
-This product includes/uses software, Commons Logging API - commons-logging:commons-logging-api:jar:1.0.4
-developed by The Apache Software Foundation  (http://jakarta.apache.org)
+This product includes/uses software, Apache MINA SSL Filter (http://directory.apache.org/subprojects/mina/mina-filter-ssl)
+developed by Apache Software Foundation  (http://www.apache.org)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 
-This product includes/uses software, Dom4j - dom4j:dom4j:jar:1.4
-developed by MetaStuff, Ltd. (http://www.dom4j.org/)
-License: BSD License (http://www.dom4j.org/license.html)
-
-This product includes/uses software, Saxon - saxpath:saxpath:jar:1.0-FCS
-developed by Michael Kay (http://saxon.sourceforge.net/)
-License: Mozilla Public License v1.0, (http://www.opensource.org/licenses/mozilla1.0.php)
-
 This product includes/uses software, Felix (http://felix.apache.org)
 developed by Apache Software Foundation  (http://www.apache.org)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
@@ -110,33 +70,25 @@ License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
 This product uses/references the following software from Eclipse.
 License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html)
 (Note: the versions are ommited and only the name is specified.)
-org.eclipse.jface
 org.eclipse.core.*
 org.eclipse.equinox.* 
+org.eclipse.help
+org.eclipse.jface
 org.eclipse.osgi
 org.eclipse.swt
+org.eclipse.ui.*
 Source available from : http://archive.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/index.php
 
-This product includes/uses software, ICU4J - ICU4J 3.4.4
-developed by the ICU Project (http://icu-project.org/)
-License: http://source.icu-project.org/repos/icu/icu/trunk/license.html
-
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
+This product includes software developed at The OSGi Alliance (http://www.osgi.org/).
 Copyright 2006 The OSGi Alliance.
 Licensed under the Apache License 2.0.
 
-This product includes/uses software, Javacc - javacc.jar
-License: BSD License (https://javacc.dev.java.net/)
-
 This product includes/uses software, SLF4J API Module (http://www.slf4j.org),
 developed by QOS.ch  (http://www.qos.ch)
 Source included with binary builds at : http://slf4j.org/dist
 License: MIT License (http://www.slf4j.org/license.html)
 
-This product includes/uses software, JUnit Toolkit (http://sourceforge.net/projects/junit-toolkit/)
-License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
-
-This product includes/uses software, Apache Log4j (http://logging.apache.org/log4j/1.2)
+This product includes/uses software, Xalan - xalan:xalan:jar:2.7.0
+developed by Apache Software Foundation  (http://www.apache.org)
 License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)