Update licensing to dual MPL/GPL

pika · Feb 19, 2010 · ffac8a6 · ffac8a6
1 parent 8f2fff7
commit ffac8a6
Show file tree

Hide file tree

Showing 23 changed files with 1,317 additions and 44 deletions.
diff --git a/COPYING b/COPYING
@@ -1,6 +1,9 @@
 This package, Pika, an AMQP client library for use with RabbitMQ and
-other AMQP servers, is licensed under the MPL. For the MPL, please see
+other AMQP servers, is licensed under the MPL, and may also be used
-LICENSE-MPL-Pika.
+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.
 
 If you have any questions regarding licensing, please contact us at 
 info@rabbitmq.com.
diff --git a/LICENSE-GPL-2.0 b/LICENSE-GPL-2.0
diff --git a/README.md b/README.md
@@ -29,6 +29,13 @@ the horizon.
  * Support continuation-passing-style, for asynchronous programming
    (and, eventually, Twisted support)
 
+## Licensing
+
+Pika is licensed under the MPL, and may also be used under the terms
+of the GPL. The full license text is included with the source code for
+the package. If you have any questions regarding licensing, please
+contact us at <info@rabbitmq.com>.
+
 ## Synchronous programming style, no concurrency
 
 This style of programming is especially appropriate for small scripts,

diff --git a/codegen.py b/codegen.py
@@ -1,36 +1,50 @@
-##   The contents of this file are subject to the Mozilla Public License
+# ***** BEGIN LICENSE BLOCK *****
-##   Version 1.1 (the "License"); you may not use this file except in
+# Version: MPL 1.1/GPL 2.0
-##   compliance with the License. You may obtain a copy of the License at
+#
-##   http://www.mozilla.org/MPL/
+# 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
-##   Software distributed under the License is distributed on an "AS IS"
+# compliance with the License. You may obtain a copy of the License at
-##   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# http://www.mozilla.org/MPL/
-##   License for the specific language governing rights and limitations
+#
-##   under the License.
+# Software distributed under the License is distributed on an "AS IS"
-##
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-##   The Original Code is Pika.
+# the License for the specific language governing rights and
-##
+# limitations under the License.
-##   The Initial Developers of the Original Code are LShift Ltd,
+#
-##   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+# The Original Code is Pika.
-##
+#
-##   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+# The Initial Developers of the Original Code are LShift Ltd, Cohesive
-##   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+# Financial Technologies LLC, and Rabbit Technologies Ltd.  Portions
-##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+# created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, Cohesive
-##   Technologies LLC, and Rabbit Technologies Ltd.
+# Financial Technologies LLC, or Rabbit Technologies Ltd are Copyright
-##
+# (C) 2007-2008 LShift Ltd, Cohesive Financial Technologies LLC, and
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+# Rabbit Technologies Ltd.
-##   Ltd. Portions created by Cohesive Financial Technologies LLC are
+#
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+# Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
-##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+# Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+# Copyright (C) 2007-2009 Cohesive Financial Technologies
-##
+# LLC. Portions created by Rabbit Technologies Ltd are Copyright (C)
-##   Portions created by Tony Garnock-Jones are Copyright (C)
+# 2007-2009 Rabbit Technologies Ltd.
-##   2009-2010 LShift Ltd and Tony Garnock-Jones.
+#
-##
+# Portions created by Tony Garnock-Jones are Copyright (C) 2009-2010
-##   All Rights Reserved.
+# LShift Ltd and Tony Garnock-Jones.
-##
+#
-##   Contributor(s): ______________________________________.
+# 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 *****
 
 from __future__ import nested_scopes
 

diff --git a/examples/demo_receive.py b/examples/demo_receive.py
@@ -1,4 +1,52 @@
 #!/usr/bin/env python
+# ***** 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 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.
+#
+# ***** END LICENSE BLOCK *****
+
 '''
 Example of simple consumer, waits one message, replies an ack and exits.
 '''

diff --git a/examples/demo_relay.py b/examples/demo_relay.py
@@ -1,4 +1,51 @@
 #!/usr/bin/env python
+# ***** 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 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.
+#
+# ***** END LICENSE BLOCK *****
 
 import pika
 import asyncore

diff --git a/examples/demo_send.py b/examples/demo_send.py
@@ -1,4 +1,52 @@
 #!/usr/bin/env python
+# ***** 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 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.
+#
+# ***** END LICENSE BLOCK *****
+
 '''
 Example of simple producer, creates one message and exits.
 '''

diff --git a/pika/__init__.py b/pika/__init__.py
@@ -1,3 +1,51 @@
+# ***** 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 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.
+#
+# ***** END LICENSE BLOCK *****
+
 from pika.spec import \
     BasicProperties
 from pika.connection import \

diff --git a/pika/asyncore_adapter.py b/pika/asyncore_adapter.py
@@ -1,3 +1,51 @@
+# ***** 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 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.
+#
+# ***** END LICENSE BLOCK *****
+
 import sys
 import traceback
 import socket