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/04/05 17:29:17 UTC
svn commit: r1585103 - in /qpid/trunk/qpid/java:
amqp-1-0-client-jms/src/main/assembly/
amqp-1-0-client-websocket/src/main/assembly/ broker/src/main/assembly/
Author: robbie
Date: Sat Apr 5 15:29:17 2014
New Revision: 1585103
URL: http://svn.apache.org/r1585103
Log:
QPID-5048: some minor additions and whitespace fixups to the licence/notice info
Modified:
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/assembly/NOTICE
qpid/trunk/qpid/java/amqp-1-0-client-websocket/src/main/assembly/NOTICE
qpid/trunk/qpid/java/amqp-1-0-client-websocket/src/main/assembly/qpid-amqp-1-0-client-websocket-bin.xml
qpid/trunk/qpid/java/broker/src/main/assembly/LICENSE
qpid/trunk/qpid/java/broker/src/main/assembly/NOTICE
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/assembly/NOTICE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/assembly/NOTICE?rev=1585103&r1=1585102&r2=1585103&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/assembly/NOTICE (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/assembly/NOTICE Sat Apr 5 15:29:17 2014
@@ -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
Modified: qpid/trunk/qpid/java/amqp-1-0-client-websocket/src/main/assembly/NOTICE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-websocket/src/main/assembly/NOTICE?rev=1585103&r1=1585102&r2=1585103&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-websocket/src/main/assembly/NOTICE (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-websocket/src/main/assembly/NOTICE Sat Apr 5 15:29:17 2014
@@ -45,10 +45,10 @@ Copyright 2003-2010 The Apache Software
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
+###############################################
Modified: qpid/trunk/qpid/java/amqp-1-0-client-websocket/src/main/assembly/qpid-amqp-1-0-client-websocket-bin.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-websocket/src/main/assembly/qpid-amqp-1-0-client-websocket-bin.xml?rev=1585103&r1=1585102&r2=1585103&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-websocket/src/main/assembly/qpid-amqp-1-0-client-websocket-bin.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-websocket/src/main/assembly/qpid-amqp-1-0-client-websocket-bin.xml Sat Apr 5 15:29:17 2014
@@ -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>
Modified: qpid/trunk/qpid/java/broker/src/main/assembly/LICENSE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/assembly/LICENSE?rev=1585103&r1=1585102&r2=1585103&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/assembly/LICENSE (original)
+++ qpid/trunk/qpid/java/broker/src/main/assembly/LICENSE Sat Apr 5 15:29:17 2014
@@ -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
Modified: qpid/trunk/qpid/java/broker/src/main/assembly/NOTICE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/assembly/NOTICE?rev=1585103&r1=1585102&r2=1585103&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/assembly/NOTICE (original)
+++ qpid/trunk/qpid/java/broker/src/main/assembly/NOTICE Sat Apr 5 15:29:17 2014
@@ -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 noti
###############################################
-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 Found
Apache ServiceMix
Copyright 2005-2011 The Apache Software Foundation
-###############################################
\ No newline at end of file
+###############################################
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org