QPID-5813: fix up LICENSE + NOTICE etc files

merge from trunk r1620850


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

11 files changed, 27 insertions, 162 deletions

diff --git a/qpid/cpp/LICENSE b/qpid/cpp/LICENSE
index cff2a5e25d..6b0b1270ff 100644
--- a/qpid/cpp/LICENSE
+++ b/qpid/cpp/LICENSE
@@ -1,6 +1,3 @@
-=========================================================================
-==  Apache License                                                     ==
-=========================================================================
 
                                  Apache License
                            Version 2.0, January 2004
@@ -204,31 +201,3 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-=========================================================================
-==  Boost License                                                      ==
-=========================================================================
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
diff --git a/qpid/cpp/NOTICE b/qpid/cpp/NOTICE
index 5de355a56c..306b5f0801 100644
--- a/qpid/cpp/NOTICE
+++ b/qpid/cpp/NOTICE
@@ -1,21 +1,5 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Qpid distribution.                     ==
-=========================================================================
-
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
-
-Please read the LICENSE file present in the root directory of this
-distribution.
-
-Aside from contributions to the Apache Qpid project, this software also 
-includes (binary only):
-	- None at this time
-	
-Project requires, not packaged: 	
- * boost version 1.33.1 or later under the Boost Software License, and 
- 	can be downloaded from http://www.boost.org
-	- Included in most OS platforms by default.
+Apache Qpid CPP
+Copyright 2006-2014 The Apache Software Foundation
 
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/qpid/extras/qmf/NOTICE.txt b/qpid/extras/qmf/NOTICE.txt
index 32ccdb70c4..f4795d5ced 100644
--- a/qpid/extras/qmf/NOTICE.txt
+++ b/qpid/extras/qmf/NOTICE.txt
@@ -1,20 +1,5 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Qpid distribution.                     ==
-=========================================================================
-
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
-
-Please read the LICENSE.txt file present in the root directory of this
-distribution.
-
-
-Aside from contributions to the Apache Qpid project, this software also 
-includes (binary only):
-
-	- None at this time
-
-             
+Apache Qpid QMF
+Copyright 2008-2014 The Apache Software Foundation
 
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/qpid/java/LICENSE b/qpid/java/LICENSE
index 251cf46c23..75d12f0421 100644
--- a/qpid/java/LICENSE
+++ b/qpid/java/LICENSE
@@ -208,7 +208,7 @@
 
 broker-plugins/management-http/src/main/java/resources/js/crypto-js/
 
-This bundles portions of crypto-js jar which is under the MIT licence:
+This bundles portions of crypto-js which is under the MIT licence:
 
 
 Copyright (c) 2009-2013 Jeff Mott
diff --git a/qpid/java/NOTICE b/qpid/java/NOTICE
index 589b78325f..cc2a3c3497 100644
--- a/qpid/java/NOTICE
+++ b/qpid/java/NOTICE
@@ -1,4 +1,4 @@
-Apache Qpid
+Apache Qpid Java
 Copyright 2006-2014 The Apache Software Foundation
 
 This product includes software developed at
diff --git a/qpid/java/broker/src/main/assembly/LICENSE b/qpid/java/broker/src/main/assembly/LICENSE
index 587680c5e0..bb9e55be67 100644
--- a/qpid/java/broker/src/main/assembly/LICENSE
+++ b/qpid/java/broker/src/main/assembly/LICENSE
@@ -207,7 +207,7 @@
 # Third Party Dependency Licensing Information:
 ###############################################
 
-This bundles portions of crypto-js jar which is under the MIT licence:
+This bundles portions of crypto-js which is under the MIT licence:
 
 Copyright (c) 2009-2013 Jeff Mott
 
diff --git a/qpid/python/NOTICE.txt b/qpid/python/NOTICE.txt
index 32ccdb70c4..4175a06c99 100644
--- a/qpid/python/NOTICE.txt
+++ b/qpid/python/NOTICE.txt
@@ -1,20 +1,5 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Qpid distribution.                     ==
-=========================================================================
-
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
-
-Please read the LICENSE.txt file present in the root directory of this
-distribution.
-
-
-Aside from contributions to the Apache Qpid project, this software also 
-includes (binary only):
-
-	- None at this time
-
-             
+Apache Qpid Python Client
+Copyright 2006-2014 The Apache Software Foundation
 
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/qpid/python/RELEASE_NOTES b/qpid/python/RELEASE_NOTES
deleted file mode 100644
index 59c93ac3c6..0000000000
--- a/qpid/python/RELEASE_NOTES
+++ /dev/null
@@ -1,12 +0,0 @@
-Apache Qpid Python 0.8 Release Notes
-------------------------------
-
-The Qpid 0.8 release of the python client contains support the for both
- 0-8 and 0-10 of the AMQP specification as well as support for the
-non-WIP portion of the 0-9 specification.  You can access these
-specifications from:
-
-http://www.amqp.org/confluence/display/AMQP/AMQP+Specification
-
-The README file provided contains some details on installing and using
-the python client that is included with this distribution.
diff --git a/qpid/tests/NOTICE.txt b/qpid/tests/NOTICE.txt
index 32ccdb70c4..695f589ffe 100644
--- a/qpid/tests/NOTICE.txt
+++ b/qpid/tests/NOTICE.txt
@@ -1,20 +1,5 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Qpid distribution.                     ==
-=========================================================================
-
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
-
-Please read the LICENSE.txt file present in the root directory of this
-distribution.
-
-
-Aside from contributions to the Apache Qpid project, this software also 
-includes (binary only):
-
-	- None at this time
-
-             
+Apache Qpid Python Tests
+Copyright 2006-2014 The Apache Software Foundation
 
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/qpid/tools/NOTICE.txt b/qpid/tools/NOTICE.txt
index 32ccdb70c4..a3fa8a06bf 100644
--- a/qpid/tools/NOTICE.txt
+++ b/qpid/tools/NOTICE.txt
@@ -1,20 +1,5 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Qpid distribution.                     ==
-=========================================================================
-
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
-
-Please read the LICENSE.txt file present in the root directory of this
-distribution.
-
-
-Aside from contributions to the Apache Qpid project, this software also 
-includes (binary only):
-
-	- None at this time
-
-             
+Apache Qpid Python Tools
+Copyright 2006-2014 The Apache Software Foundation
 
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/qpid/wcf/NOTICE.txt b/qpid/wcf/NOTICE.txt
index 5de355a56c..41117b0fa0 100644
--- a/qpid/wcf/NOTICE.txt
+++ b/qpid/wcf/NOTICE.txt
@@ -1,21 +1,5 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Qpid distribution.                     ==
-=========================================================================
-
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
-
-Please read the LICENSE file present in the root directory of this
-distribution.
-
-Aside from contributions to the Apache Qpid project, this software also 
-includes (binary only):
-	- None at this time
-	
-Project requires, not packaged: 	
- * boost version 1.33.1 or later under the Boost Software License, and 
- 	can be downloaded from http://www.boost.org
-	- Included in most OS platforms by default.
+Apache Qpid WCF
+Copyright 2009-2014 The Apache Software Foundation
 
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).