You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/08/11 16:42:26 UTC
svn commit: r1617301 - in /qpid/trunk/qpid: ./ java/
java/broker-plugins/management-http/src/main/appended-resources/
java/broker-plugins/management-http/src/main/appended-resources/META-INF/
java/broker/src/main/assembly/dependency-verification/ java/...
Author: robbie
Date: Mon Aug 11 14:42:25 2014
New Revision: 1617301
URL: http://svn.apache.org/r1617301
Log:
QPID-5813, QPID-5913: various LICENCE and NOTICE file updates
- Ensure the main java directory has LICENSE and NOTICE files for use in new source archive.
- Update pointers within the files at the repo root.
- Ensure the main java directory has LICENSE entry for crypto-js for inclusion in source release.
- Ensure the management-http binary jar contains LICENSE file entry for crypto-js, clarify entry in brokers binary assembly tar.gz file.
- Update reference file for dep change verification.
Added:
qpid/trunk/qpid/java/LICENSE
- copied, changed from r1617293, qpid/trunk/qpid/java/resources/LICENSE
qpid/trunk/qpid/java/NOTICE
- copied, changed from r1617293, qpid/trunk/qpid/java/resources/NOTICE
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/appended-resources/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/appended-resources/META-INF/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/appended-resources/META-INF/LICENSE.vm
Removed:
qpid/trunk/qpid/java/resources/LICENSE
qpid/trunk/qpid/java/resources/NOTICE
qpid/trunk/qpid/java/resources/README.txt
qpid/trunk/qpid/tools/src/java/TODO
Modified:
qpid/trunk/qpid/LICENSE
qpid/trunk/qpid/NOTICE
qpid/trunk/qpid/java/README.txt
qpid/trunk/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
Modified: qpid/trunk/qpid/LICENSE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/LICENSE?rev=1617301&r1=1617300&r2=1617301&view=diff
==============================================================================
--- qpid/trunk/qpid/LICENSE (original)
+++ qpid/trunk/qpid/LICENSE Mon Aug 11 14:42:25 2014
@@ -1,5 +1,8 @@
-Please see the individual LICENSE files for each language
+Please see the individual LICENSE[.txt] files in each main directory, e.g:
+
cpp/LICENSE
-gentools/lib/LICENSE
-java/resources/LICENSE
+java/LICENSE
python/LICENSE.txt
+tools/LICENSE.txt
+tools/src/java/LICENSE
+wcf/LICENSE.txt
Modified: qpid/trunk/qpid/NOTICE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/NOTICE?rev=1617301&r1=1617300&r2=1617301&view=diff
==============================================================================
--- qpid/trunk/qpid/NOTICE (original)
+++ qpid/trunk/qpid/NOTICE Mon Aug 11 14:42:25 2014
@@ -1,6 +1,8 @@
-Please see the individual NOTICE files for each language:
+Please see the individual NOTICE[.txt] files in each main directory, e.g:
cpp/NOTICE
-gentools/lib/NOTICE
-java/resources/NOTICE
+java/NOTICE
python/NOTICE.txt
+tools/NOTICE.txt
+tools/src/java/NOTICE
+wcf/NOTICE.txt
Copied: qpid/trunk/qpid/java/LICENSE (from r1617293, qpid/trunk/qpid/java/resources/LICENSE)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/LICENSE?p2=qpid/trunk/qpid/java/LICENSE&p1=qpid/trunk/qpid/java/resources/LICENSE&r1=1617293&r2=1617301&rev=1617301&view=diff
==============================================================================
--- qpid/trunk/qpid/java/resources/LICENSE (original)
+++ qpid/trunk/qpid/java/LICENSE Mon Aug 11 14:42:25 2014
@@ -200,3 +200,35 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+
+###############################################
+# Third Party Dependency Licensing Information:
+###############################################
+
+broker-plugins/management-http/src/main/java/resources/js/crypto-js/
+
+This bundles portions of crypto-js jar which is under the MIT licence:
+
+
+Copyright (c) 2009-2013 Jeff Mott
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ 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
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
Copied: qpid/trunk/qpid/java/NOTICE (from r1617293, qpid/trunk/qpid/java/resources/NOTICE)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/NOTICE?p2=qpid/trunk/qpid/java/NOTICE&p1=qpid/trunk/qpid/java/resources/NOTICE&r1=1617293&r2=1617301&rev=1617301&view=diff
==============================================================================
(empty)
Modified: qpid/trunk/qpid/java/README.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/README.txt?rev=1617301&r1=1617300&r2=1617301&view=diff
==============================================================================
--- qpid/trunk/qpid/java/README.txt (original)
+++ qpid/trunk/qpid/java/README.txt Mon Aug 11 14:42:25 2014
@@ -1,3 +1,10 @@
+Documentation for the Qpid components can be accessed on our website at:
+
+http://qpid.apache.org/documentation.html
+
+Some initial helper info can be found below.
+
+
==== Building the code and running the tests ====
Here are some example Maven build commands that you may find usefull.
@@ -23,6 +30,7 @@ Execute the unit tests and then produce
For more details on how to build see:
https://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Build+How+To
+
==== Running client examples =====
Use maven to build the modules, and additionally copy the dependencies alongside their output:
Added: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/appended-resources/META-INF/LICENSE.vm?rev=1617301&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/appended-resources/META-INF/LICENSE.vm Mon Aug 11 14:42:25 2014
@@ -0,0 +1,33 @@
+
+
+#==============================================
+# Third Party Dependency Licensing Information:
+#==============================================
+
+resources/js/crypto-js/
+
+This bundles portions of crypto-js, which is under the MIT licence:
+
+
+Copyright (c) 2009-2013 Jeff Mott
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ 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
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF 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/trunk/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1617301&r1=1617300&r2=1617301&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (original)
+++ qpid/trunk/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Mon Aug 11 14:42:25 2014
@@ -28,8 +28,6 @@ From: 'an unknown organization'
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- bcel org.apache.bcel:bcel:jar:5.2
- - CryptoJS (http://webjars.org) org.webjars:cryptojs:jar:3.1.2
- License: New BSD (http://opensource.org/licenses/BSD-3-Clause)
From: 'Apache Software Foundation' (http://db.apache.org/)
- Apache Derby Database Engine and Embedded JDBC Driver (http://db.apache.org/derby/derby/) org.apache.derby:derby:jar:10.8.2.2
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org