Dual licensed libstrophe under MIT and GPLv3.

Updated copyright headers.
catap · Jun 15, 2009 · 370a371 · 370a371
1 parent a58b0e4
commit 370a371
Show file tree

Hide file tree

Showing 46 changed files with 739 additions and 409 deletions.
diff --git a/COPYING.txt b/COPYING.txt
diff --git a/GPL-LICENSE.txt b/GPL-LICENSE.txt
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,28 +1,5 @@
-strophe XMPP client library
-Copyright (C) 2005-2008 OGG, LLC.
+libstrophe XMPP client library
+Copyright (C) 2005-2009 Collecta, Inc.
 
-Free Software License
----------------------
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program (in a file named COPYING). If not, write to 
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-Boston, MA  02110-1301, USA.
-
-
-Commericial Licenses
---------------------
-
-For information about purchasing an exemption for use with
-proprietary software under terms other than the above, please
-contact <sales@onlinegamegroup.com>.
+This program is dual licensed under the MIT and GPLv3 licenses.
+Please the files MIT-LICENSE.txt and GPL-LICENSE.txt for details.
diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2005-2009 Collecta, Inc.
+
+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.
diff --git a/examples/active.c b/examples/active.c
@@ -1,7 +1,7 @@
 /* active.c
 ** libstrophe XMPP client library -- basic usage example
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/examples/basic.c b/examples/basic.c
@@ -1,7 +1,7 @@
 /* basic.c
 ** libstrophe XMPP client library -- basic usage example
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/examples/bot.c b/examples/bot.c
@@ -1,7 +1,7 @@
 /* bot.c
 ** libstrophe XMPP client library -- basic usage example
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/examples/roster.c b/examples/roster.c
@@ -1,7 +1,7 @@
 /* roster.c
 ** libstrophe XMPP client library -- handler example
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/auth.c b/src/auth.c
@@ -1,7 +1,7 @@
 /* auth.c
 ** strophe XMPP client library -- auth functions and handlers
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.

diff --git a/src/common.h b/src/common.h
@@ -1,7 +1,7 @@
 /* common.h
 ** strophe XMPP client library -- internal common structures
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.

diff --git a/src/conn.c b/src/conn.c
@@ -1,7 +1,7 @@
 /* conn.c
 ** strophe XMPP client library -- connection object functions
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/ctx.c b/src/ctx.c
@@ -1,7 +1,7 @@
 /* ctx.c
 ** strophe XMPP client library -- run-time context implementation
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express 
 **  or implied.

diff --git a/src/event.c b/src/event.c
@@ -1,7 +1,7 @@
 /* event.c
 ** strophe XMPP client library -- event loop and management
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/handler.c b/src/handler.c
@@ -1,7 +1,7 @@
 /* handler.c
 ** strophe XMPP client library -- event handler management
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/hash.c b/src/hash.c
@@ -1,7 +1,7 @@
 /* hash.c
 ** strophe XMPP client library -- hash table implementation
 ** 
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/hash.h b/src/hash.h
@@ -1,7 +1,7 @@
 /* hash.h
 ** strophe XMPP client library -- hash table interface
 ** 
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/jid.c b/src/jid.c
@@ -1,7 +1,7 @@
 /* jid.c
 ** strophe XMPP client library -- helper functions for parsing JIDs
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/oocontext.cpp b/src/oocontext.cpp
@@ -1,7 +1,7 @@
 /* oocontext.cpp
 ** strophe XMPP client library -- C++ context implementation
 ** 
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/oostanza.cpp b/src/oostanza.cpp
@@ -1,7 +1,7 @@
 /* oostanza.cpp
 ** strophe XMPP client library -- C++ context implementation
 ** 
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/ostypes.h b/src/ostypes.h
@@ -2,7 +2,7 @@
 ** strophe XMPP client library -- type definitions for platforms 
 **     without stdint.h
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/parser.h b/src/parser.h
@@ -1,7 +1,7 @@
 /* parser.h
 ** strophe XMPP client library -- parser structures and functions
 **
-** Copyright (C) 2005-2009 Stanziq, Inc. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.

diff --git a/src/parser_expat.c b/src/parser_expat.c
@@ -1,7 +1,7 @@
 /* parser.c
 ** strophe XMPP client library -- xml parser handlers and utility functions
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/parser_libxml2.c b/src/parser_libxml2.c
@@ -1,7 +1,7 @@
 /* parser.c
 ** strophe XMPP client library -- xml parser handlers and utility functions
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/sasl.c b/src/sasl.c
@@ -1,7 +1,7 @@
 /* sasl.c
 ** strophe XMPP client library -- SASL authentication helpers
 ** 
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/sasl.h b/src/sasl.h
@@ -1,7 +1,7 @@
 /* sasl.h
 ** strophe XMPP client library -- SASL authentication helpers
 ** 
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/sock.c b/src/sock.c
@@ -1,7 +1,7 @@
 /* sock.c
 ** strophe XMPP client library -- socket abstraction implementation
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/sock.h b/src/sock.h
@@ -1,7 +1,7 @@
 /* sock.h
 ** strophe XMPP client library -- socket abstraction header
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/stanza.c b/src/stanza.c
@@ -1,7 +1,7 @@
 /* stanza.c
 ** strophe XMPP client library -- XMPP stanza object and utilities
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/thread.c b/src/thread.c
@@ -1,7 +1,7 @@
 /* thread.c
 ** strophe XMPP client library -- thread abstraction
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/thread.h b/src/thread.h
@@ -1,7 +1,7 @@
 /* thread.h
 ** strophe XMPP client library -- thread abstraction header
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/tls.h b/src/tls.h
@@ -1,7 +1,7 @@
 /* tls.h
 ** strophe XMPP client library -- TLS abstraction header
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/tls_dummy.c b/src/tls_dummy.c
@@ -1,7 +1,7 @@
 /* tls_dummy.c
 ** strophe XMPP client library -- TLS abstraction dummy impl.
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/tls_gnutls.c b/src/tls_gnutls.c
@@ -1,7 +1,7 @@
 /* tls.c
 ** strophe XMPP client library -- TLS abstraction header
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/tls_openssl.c b/src/tls_openssl.c
@@ -1,7 +1,7 @@
 /* tls_openssl.c
 ** strophe XMPP client library -- TLS abstraction openssl impl.
 **
-** Copyright (C) 2005-008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-008 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/tls_schannel.c b/src/tls_schannel.c
@@ -1,7 +1,7 @@
 /* tls_schannel.c
 ** strophe XMPP client library -- TLS abstraction schannel impl.
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/util.c b/src/util.c
@@ -1,7 +1,7 @@
 /* util.c
 ** strophe XMPP client library -- various utility functions
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/src/util.h b/src/util.h
@@ -1,7 +1,7 @@
 /* util.h
 ** strophe XMPP client library -- various utility functions
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/strophe.h b/strophe.h
@@ -1,7 +1,7 @@
 /* strophe.h
 ** strophe XMPP client library C API
 **
-** Copyright (C) 2005-2008 OGG, LLC.
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.

diff --git a/strophepp.h b/strophepp.h
@@ -1,7 +1,7 @@
 /* strophepp.h
 ** strophe XMPP client library C++ API
 **
-** Copyright (C) 2005-2008 OGG, LLC.
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.

diff --git a/tests/check_parser.c b/tests/check_parser.c
@@ -1,7 +1,7 @@
 /* check_parser.h
 ** strophe XMPP client library -- parser tests
 **
-** Copyright (C) 2005-2009 Stanziq, Inc. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.

diff --git a/tests/test_base64.c b/tests/test_base64.c
@@ -1,7 +1,7 @@
 /* test_base64.c
 ** libstrophe XMPP client library -- test routines for the base64 codec
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

diff --git a/tests/test_ctx.c b/tests/test_ctx.c
@@ -1,7 +1,7 @@
 /* test_ctx.c
 ** libstrophe XMPP client library -- test routines for the library run-time context
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.