Author: robbie
Date: Wed Aug 27 10:15:41 2014
New Revision: 1620853
URL: http://svn.apache.org/r1620853
Log:
QPID-5813: fix up LICENSE + NOTICE etc files
merge from trunk r1620850
Removed:
qpid/branches/0.30/qpid/python/RELEASE_NOTES
Modified:
qpid/branches/0.30/ (props changed)
qpid/branches/0.30/qpid/ (props changed)
qpid/branches/0.30/qpid/cpp/LICENSE
qpid/branches/0.30/qpid/cpp/NOTICE
qpid/branches/0.30/qpid/extras/qmf/NOTICE.txt
qpid/branches/0.30/qpid/java/ (props changed)
qpid/branches/0.30/qpid/java/LICENSE
qpid/branches/0.30/qpid/java/NOTICE
qpid/branches/0.30/qpid/java/broker/src/main/assembly/LICENSE
qpid/branches/0.30/qpid/python/ (props changed)
qpid/branches/0.30/qpid/python/NOTICE.txt
qpid/branches/0.30/qpid/tests/NOTICE.txt
qpid/branches/0.30/qpid/tools/NOTICE.txt
qpid/branches/0.30/qpid/wcf/NOTICE.txt
Propchange: qpid/branches/0.30/
------------------------------------------------------------------------------
Merged /qpid/trunk:r1620850
Propchange: qpid/branches/0.30/qpid/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid:r1620850
Modified: qpid/branches/0.30/qpid/cpp/LICENSE
URL:
http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/cpp/LICENSE?rev=1620853&r1=1620852&r2=1620853&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/cpp/LICENSE (original)
+++ qpid/branches/0.30/qpid/cpp/LICENSE Wed Aug 27 10:15:41 2014
@@ -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.
-
Modified: qpid/branches/0.30/qpid/cpp/NOTICE
URL:
http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/cpp/NOTICE?rev=1620853&r1=1620852&r2=1620853&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/cpp/NOTICE (original)
+++ qpid/branches/0.30/qpid/cpp/NOTICE Wed Aug 27 10:15:41 2014
@@ -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/).
Modified: qpid/branches/0.30/qpid/extras/qmf/NOTICE.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/extras/qmf/NOTICE.txt?rev=1620853&r1=1620852&r2=1620853&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/extras/qmf/NOTICE.txt (original)
+++ qpid/branches/0.30/qpid/extras/qmf/NOTICE.txt Wed Aug 27 10:15:41 2014
@@ -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/).
Propchange: qpid/branches/0.30/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1620850
Modified: qpid/branches/0.30/qpid/java/LICENSE
URL:
http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/LICENSE?rev=1620853&r1=1620852&r2=1620853&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/LICENSE (original)
+++ qpid/branches/0.30/qpid/java/LICENSE Wed Aug 27 10:15:41 2014
@@ -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
Modified: qpid/branches/0.30/qpid/java/NOTICE
URL:
http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/NOTICE?rev=1620853&r1=1620852&r2=1620853&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/NOTICE (original)
+++ qpid/branches/0.30/qpid/java/NOTICE Wed Aug 27 10:15:41 2014
@@ -1,4 +1,4 @@
-Apache Qpid
+Apache Qpid Java
Copyright 2006-2014 The Apache Software Foundation
This product includes software developed at
Modified: qpid/branches/0.30/qpid/java/broker/src/main/assembly/LICENSE
URL:
http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker/src/main/assembly/LICENSE?rev=1620853&r1=1620852&r2=1620853&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker/src/main/assembly/LICENSE (original)
+++ qpid/branches/0.30/qpid/java/broker/src/main/assembly/LICENSE Wed Aug 27
10:15:41 2014
@@ -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
Propchange: qpid/branches/0.30/qpid/python/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python:r1620850
Modified: qpid/branches/0.30/qpid/python/NOTICE.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/python/NOTICE.txt?rev=1620853&r1=1620852&r2=1620853&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/python/NOTICE.txt (original)
+++ qpid/branches/0.30/qpid/python/NOTICE.txt Wed Aug 27 10:15:41 2014
@@ -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/).
Modified: qpid/branches/0.30/qpid/tests/NOTICE.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/tests/NOTICE.txt?rev=1620853&r1=1620852&r2=1620853&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/tests/NOTICE.txt (original)
+++ qpid/branches/0.30/qpid/tests/NOTICE.txt Wed Aug 27 10:15:41 2014
@@ -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/).
Modified: qpid/branches/0.30/qpid/tools/NOTICE.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/tools/NOTICE.txt?rev=1620853&r1=1620852&r2=1620853&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/tools/NOTICE.txt (original)
+++ qpid/branches/0.30/qpid/tools/NOTICE.txt Wed Aug 27 10:15:41 2014
@@ -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/).
Modified: qpid/branches/0.30/qpid/wcf/NOTICE.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/wcf/NOTICE.txt?rev=1620853&r1=1620852&r2=1620853&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/wcf/NOTICE.txt (original)
+++ qpid/branches/0.30/qpid/wcf/NOTICE.txt Wed Aug 27 10:15:41 2014
@@ -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/).
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
