Updated and simplified license boilerplate.

COPYING

@@ -1,9 +1,51 @@
 This package, Pika, an AMQP client library for use with RabbitMQ and
 other AMQP servers, is licensed under the MPL, and may also be used
 under the terms of the GPL. For the MPL, please see
-LICENSE-MPL-Pika. For the GPL, please see LICENSE-GPL-2.0. Please see
-also the license block near the top of each source file in the
-package.
+LICENSE-MPL-Pika. For the GPL, please see LICENSE-GPL-2.0.
 
-If you have any questions regarding licensing, please contact us at 
+If you have any questions regarding licensing, please contact us at
 [email protected].
+
+
+The following license boilerplate should be included near the top of
+each source file in the package:
+
+
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and
+# limitations under the License.
+#
+# The Original Code is Pika.
+#
+# The Initial Developers of the Original Code are VMWare, Inc. and
+# Tony Garnock-Jones.
+#
+# Portions created by VMware, Inc. or by Tony Garnock-Jones are
+# Copyright (C) 2009-2011 VMware, Inc. and Tony Garnock-Jones.
+#
+# All Rights Reserved.
+#
+# Contributor(s): ______________________________________.
+#
+# Alternatively, the contents of this file may be used under the terms
+# of the GNU General Public License Version 2 or later (the "GPL"), in
+# which case the provisions of the GPL are applicable instead of those
+# above. If you wish to allow use of your version of this file only
+# under the terms of the GPL, and not to allow others to use your
+# version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the
+# notice and other provisions required by the GPL. If you do not
+# delete the provisions above, a recipient may use your version of
+# this file under the terms of any one of the MPL or the GPL.
+#
+# ***** END LICENSE BLOCK *****
+

LICENSE-MPL-Pika

@@ -446,11 +446,11 @@ EXHIBIT A -Mozilla Public License.
 
      The Original Code is Pika.
 
-     The Initial Developers of the Original Code are LShift Ltd and
+     The Initial Developers of the Original Code are VMWare, Inc. and
      Tony Garnock-Jones.
 
-     Portions created by LShift Ltd or by Tony Garnock-Jones are
-     Copyright (C) 2009-2010 LShift Ltd and Tony Garnock-Jones.
+     Portions created by VMware, Inc. or by Tony Garnock-Jones are
+     Copyright (C) 2009-2011 VMware, Inc. and Tony Garnock-Jones.
 
      All Rights Reserved.
 

setup.py

@@ -1,48 +1,10 @@
 # ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are licensed under the Mozilla Public
+# License Version 1.1, and may also be used under the terms of the
+# General Public License 2.0.
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and
-# limitations under the License.
-#
-# The Original Code is Pika.
-#
-# The Initial Developers of the Original Code are LShift Ltd, Cohesive
-# Financial Technologies LLC, and Rabbit Technologies Ltd.  Portions
-# created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, Cohesive
-# Financial Technologies LLC, or Rabbit Technologies Ltd are Copyright
-# (C) 2007-2008 LShift Ltd, Cohesive Financial Technologies LLC, and
-# Rabbit Technologies Ltd.
-#
-# Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
-# Ltd. Portions created by Cohesive Financial Technologies LLC are
-# Copyright (C) 2007-2009 Cohesive Financial Technologies
-# LLC. Portions created by Rabbit Technologies Ltd are Copyright (C)
-# 2007-2009 Rabbit Technologies Ltd.
-#
-# Portions created by Tony Garnock-Jones are Copyright (C) 2009-2010
-# LShift Ltd and Tony Garnock-Jones.
-#
-# All Rights Reserved.
-#
-# Contributor(s): ______________________________________.
-#
-# Alternatively, the contents of this file may be used under the terms
-# of the GNU General Public License Version 2 or later (the "GPL"), in
-# which case the provisions of the GPL are applicable instead of those
-# above. If you wish to allow use of your version of this file only
-# under the terms of the GPL, and not to allow others to use your
-# version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the
-# notice and other provisions required by the GPL. If you do not
-# delete the provisions above, a recipient may use your version of
-# this file under the terms of any one of the MPL or the GPL.
+# Refer to COPYING for details.
 #
 # ***** END LICENSE BLOCK *****