QPID-5048: some minor additions and whitespace fixups to the licence/notice info

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

5 files changed, 35 insertions, 20 deletions

diff --git a/java/amqp-1-0-client-jms/src/main/assembly/NOTICE b/java/amqp-1-0-client-jms/src/main/assembly/NOTICE
index 6befec8df5..3838e94c70 100644
--- a/java/amqp-1-0-client-jms/src/main/assembly/NOTICE
+++ b/java/amqp-1-0-client-jms/src/main/assembly/NOTICE
@@ -1,4 +1,4 @@
-Qpid AMQP 1-0 JMS Client
+Qpid AMQP 1.0 JMS Client
 Copyright 2006-2014 The Apache Software Foundation
 
 This product includes software developed at
diff --git a/java/amqp-1-0-client-websocket/src/main/assembly/NOTICE b/java/amqp-1-0-client-websocket/src/main/assembly/NOTICE
index fae9fb92fe..2aa48e31dd 100644
--- a/java/amqp-1-0-client-websocket/src/main/assembly/NOTICE
+++ b/java/amqp-1-0-client-websocket/src/main/assembly/NOTICE
@@ -45,10 +45,10 @@ Copyright 2003-2010 The Apache Software Foundation
 This product includes software developed by
 The W3C Consortium (http://www.w3.org/).
 
-Copyright © 1994-2002 World Wide Web Consortium, 
-(Massachusetts Institute of Technology, Institut National 
-de Recherche en Informatique et en Automatique, Keio 
-University). All Rights Reserved. 
+Copyright © 1994-2002 World Wide Web Consortium,
+(Massachusetts Institute of Technology, Institut National
+de Recherche en Informatique et en Automatique, Keio
+University). All Rights Reserved.
 http://www.w3.org/Consortium/Legal/
 
-###############################################
\ No newline at end of file
+###############################################
diff --git a/java/amqp-1-0-client-websocket/src/main/assembly/qpid-amqp-1-0-client-websocket-bin.xml b/java/amqp-1-0-client-websocket/src/main/assembly/qpid-amqp-1-0-client-websocket-bin.xml
index be4b92b050..974327f9c7 100644
--- a/java/amqp-1-0-client-websocket/src/main/assembly/qpid-amqp-1-0-client-websocket-bin.xml
+++ b/java/amqp-1-0-client-websocket/src/main/assembly/qpid-amqp-1-0-client-websocket-bin.xml
@@ -1,4 +1,4 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
   <id>bin</id>
diff --git a/java/broker/src/main/assembly/LICENSE b/java/broker/src/main/assembly/LICENSE
index e7a7593b88..7f2955ee35 100644
--- a/java/broker/src/main/assembly/LICENSE
+++ b/java/broker/src/main/assembly/LICENSE
@@ -207,7 +207,7 @@
 # Third Party Dependency Licensing Information:
 ###############################################
 
-This bundles the crypto-js jar which is under the MIT licence
+This bundles the crypto-js jar which is under the MIT licence:
 
 Copyright (c) 2009-2013 Jeff Mott
 
@@ -232,7 +232,8 @@ Copyright (c) 2009-2013 Jeff Mott
 
 ###############################################
 
-This bundles the slf4j-api and slf4j-log4j jars which are under the MIT licence
+This product bundles the slf4j-api and slf4j-log4j jars which are under
+the MIT licence:
 
 Copyright (c) 2004-2013 QOS.ch
  All rights reserved.
@@ -244,10 +245,10 @@ Copyright (c) 2004-2013 QOS.ch
  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
@@ -256,9 +257,9 @@ Copyright (c) 2004-2013 QOS.ch
  OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
- ###############################################
+###############################################
 
-This bundles the dojo zip which is under the "New" BSD licence
+This product bundles the dojo zip which is under the "New" BSD licence:
 
 Dojo is available under *either* the terms of the modified BSD license *or* the
 Academic Free License version 2.1. As a recipient of Dojo, you may choose which
diff --git a/java/broker/src/main/assembly/NOTICE b/java/broker/src/main/assembly/NOTICE
index 92f41ef819..621ec1d766 100644
--- a/java/broker/src/main/assembly/NOTICE
+++ b/java/broker/src/main/assembly/NOTICE
@@ -20,7 +20,7 @@ and are placed here unaltered.
 
 (C) Copyright 1997,2004 International Business Machines Corporation.  All rights reserved.
 
-(C) Copyright IBM Corp. 2003. 
+(C) Copyright IBM Corp. 2003.
 
 ###############################################
 
@@ -57,16 +57,16 @@ granted provided that the copyright notice appears in all copies.
 
 ###############################################
 
-Geronimo Servlet 3.0
+Geronimo Servlet Spec 3.0
 Copyright 2003-2010 The Apache Software Foundation
 
 This product includes software developed by
 The W3C Consortium (http://www.w3.org/).
 
-Copyright © 1994-2002 World Wide Web Consortium, 
-(Massachusetts Institute of Technology, Institut National 
-de Recherche en Informatique et en Automatique, Keio 
-University). All Rights Reserved. 
+Copyright © 1994-2002 World Wide Web Consortium,
+(Massachusetts Institute of Technology, Institut National
+de Recherche en Informatique et en Automatique, Keio
+University). All Rights Reserved.
 http://www.w3.org/Consortium/Legal/
 
 ###############################################
@@ -74,24 +74,38 @@ http://www.w3.org/Consortium/Legal/
 Commons Logging
 Copyright 2001-2007 The Apache Software Foundation
 
+###############################################
+
 Apache Commons Codec
 Copyright 2002-2013 The Apache Software Foundation
 
+###############################################
+
 Apache Commons BeanUtils
 Copyright 2000-2010 The Apache Software Foundation
 
+###############################################
+
 Apache Commons CLI
 Copyright 2001-2009 The Apache Software Foundation
 
+###############################################
+
 Apache Commons Collections
 Copyright 2001-2008 The Apache Software Foundation
 
+###############################################
+
 Apache Commons Configuration
 Copyright 2001-2012 The Apache Software Foundation
 
+###############################################
+
 Apache Commons Digester
 Copyright 2001-2008 The Apache Software Foundation
 
+###############################################
+
 Apache Commons Lang
 Copyright 2001-2011 The Apache Software Foundation
 
@@ -105,4 +119,4 @@ Copyright 2007 The Apache Software Foundation
 Apache ServiceMix
 Copyright 2005-2011 The Apache Software Foundation
 
-###############################################
\ No newline at end of file
+###############################################