diff --git a/LICENSE b/LICENSE index 55a3b2db9..89280a6c4 100644 --- a/LICENSE +++ b/LICENSE @@ -2,13 +2,13 @@ The JsonCpp library's source code, including accompanying documentation, tests and demonstration applications, are licensed under the following conditions... -The JsonCpp Authors explicitly disclaim copyright in all +Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all jurisdictions which recognize such a disclaimer. In such jurisdictions, this software is released into the Public Domain. In jurisdictions which do not recognize Public Domain property (e.g. Germany as of -2010), this software is Copyright (c) 2007-2010 by The JsonCpp Authors, and is -released under the terms of the MIT License (see below). +2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and +The JsonCpp Authors, and is released under the terms of the MIT License (see below). In jurisdictions which recognize Public Domain property, the user of this software may choose to accept it either as 1) Public Domain, 2) under the @@ -23,7 +23,7 @@ described in clear, concise terms at: The full text of the MIT License follows: ======================================================================== -Copyright (c) 2007-2010 The JsonCpp Authors +Copyright (c) 2007-2010 Baptiste Lepilleur and The JsonCpp Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/devtools/__init__.py b/devtools/__init__.py index 90b4fd7fb..4a51e6514 100644 --- a/devtools/__init__.py +++ b/devtools/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2010 The JsonCpp Authors +# Copyright 2010 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/antglob.py b/devtools/antglob.py index 75615ed41..98437658c 100644 --- a/devtools/antglob.py +++ b/devtools/antglob.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # encoding: utf-8 -# Copyright 2009 The JsonCpp Authors +# Copyright 2009 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/fixeol.py b/devtools/fixeol.py index e089f9f93..45252a07d 100644 --- a/devtools/fixeol.py +++ b/devtools/fixeol.py @@ -1,4 +1,4 @@ -# Copyright 2010 The JsonCpp Authors +# Copyright 2010 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/licenseupdater.py b/devtools/licenseupdater.py index 43ddb4f46..36bdb5c09 100644 --- a/devtools/licenseupdater.py +++ b/devtools/licenseupdater.py @@ -6,7 +6,7 @@ # and ends with the first blank line. LICENSE_BEGIN = "// Copyright " -BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 The JsonCpp Authors +BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/tarball.py b/devtools/tarball.py index ce3659444..3c0ba65e7 100644 --- a/devtools/tarball.py +++ b/devtools/tarball.py @@ -1,4 +1,4 @@ -# Copyright 2010 The JsonCpp Authors +# Copyright 2010 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/include/json/allocator.h b/include/json/allocator.h index 2492758cd..9c7e573ae 100644 --- a/include/json/allocator.h +++ b/include/json/allocator.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/include/json/assertions.h b/include/json/assertions.h index 9c5f8bc0f..1cca28d95 100644 --- a/include/json/assertions.h +++ b/include/json/assertions.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/include/json/autolink.h b/include/json/autolink.h index 6fcc8afac..b2c0f0024 100644 --- a/include/json/autolink.h +++ b/include/json/autolink.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/include/json/config.h b/include/json/config.h index 6e3f3ac64..b2bfb29ab 100644 --- a/include/json/config.h +++ b/include/json/config.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/include/json/features.h b/include/json/features.h index de45248fb..72eb6a8a0 100644 --- a/include/json/features.h +++ b/include/json/features.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/include/json/forwards.h b/include/json/forwards.h index ccfe09abf..70bbe191c 100644 --- a/include/json/forwards.h +++ b/include/json/forwards.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/include/json/json.h b/include/json/json.h index 8f10ac2bf..3d2798a6c 100644 --- a/include/json/json.h +++ b/include/json/json.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/include/json/reader.h b/include/json/reader.h index 6ab5bdbf7..5ee962a15 100644 --- a/include/json/reader.h +++ b/include/json/reader.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/include/json/value.h b/include/json/value.h index ba7365c32..f0570899e 100644 --- a/include/json/value.h +++ b/include/json/value.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/include/json/writer.h b/include/json/writer.h index d0944eeb8..8a1279bfc 100644 --- a/include/json/writer.h +++ b/include/json/writer.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/makerelease.py b/makerelease.py index 6f9a2f24f..ba2e9aa40 100644 --- a/makerelease.py +++ b/makerelease.py @@ -1,4 +1,4 @@ -# Copyright 2010 The JsonCpp Authors +# Copyright 2010 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/globtool.py b/scons-tools/globtool.py index 1aa73fc79..e51af0f41 100644 --- a/scons-tools/globtool.py +++ b/scons-tools/globtool.py @@ -1,4 +1,4 @@ -# Copyright 2009 The JsonCpp Authors +# Copyright 2009 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/srcdist.py b/scons-tools/srcdist.py index 3c9b1418e..afbd2fa99 100644 --- a/scons-tools/srcdist.py +++ b/scons-tools/srcdist.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/substinfile.py b/scons-tools/substinfile.py index 5d235e7ee..7e9d526e6 100644 --- a/scons-tools/substinfile.py +++ b/scons-tools/substinfile.py @@ -1,4 +1,4 @@ -# Copyright 2010 The JsonCpp Authors +# Copyright 2010 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/targz.py b/scons-tools/targz.py index 9e2e8d468..f5a98ba16 100644 --- a/scons-tools/targz.py +++ b/scons-tools/targz.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index 45db464a1..c4cfa05a5 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp index ec7907525..23d732ca1 100644 --- a/src/lib_json/json_reader.cpp +++ b/src/lib_json/json_reader.cpp @@ -1,4 +1,4 @@ -// Copyright 2007-2011 Baptiste Lepilleur +// Copyright 2007-2011 Baptiste Lepilleur and The JsonCpp Authors // Copyright (C) 2016 InfoTeCS JSC. All rights reserved. // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. diff --git a/src/lib_json/json_tool.h b/src/lib_json/json_tool.h index 41d0f49d2..431617830 100644 --- a/src/lib_json/json_tool.h +++ b/src/lib_json/json_tool.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp index 5f5cf8bf0..056c4750b 100644 --- a/src/lib_json/json_value.cpp +++ b/src/lib_json/json_value.cpp @@ -1,4 +1,4 @@ -// Copyright 2011 Baptiste Lepilleur +// Copyright 2011 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/src/lib_json/json_valueiterator.inl b/src/lib_json/json_valueiterator.inl index b45162b4a..5243bfe4b 100644 --- a/src/lib_json/json_valueiterator.inl +++ b/src/lib_json/json_valueiterator.inl @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index 4fb186dd5..02f1cb11b 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -1,4 +1,4 @@ -// Copyright 2011 Baptiste Lepilleur +// Copyright 2011 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/src/test_lib_json/jsontest.cpp b/src/test_lib_json/jsontest.cpp index 4c10a37cf..f8c076771 100644 --- a/src/test_lib_json/jsontest.cpp +++ b/src/test_lib_json/jsontest.cpp @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/src/test_lib_json/jsontest.h b/src/test_lib_json/jsontest.h index f0ba1fafb..955317df2 100644 --- a/src/test_lib_json/jsontest.h +++ b/src/test_lib_json/jsontest.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp index 47cd981aa..44f6591ed 100644 --- a/src/test_lib_json/main.cpp +++ b/src/test_lib_json/main.cpp @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/cleantests.py b/test/cleantests.py index 6a441dc5a..36d5b9b46 100644 --- a/test/cleantests.py +++ b/test/cleantests.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/generate_expected.py b/test/generate_expected.py index 4d56bce73..e049ab5f4 100644 --- a/test/generate_expected.py +++ b/test/generate_expected.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/pyjsontestrunner.py b/test/pyjsontestrunner.py index 6111ea9e8..bd749b530 100644 --- a/test/pyjsontestrunner.py +++ b/test/pyjsontestrunner.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/runjsontests.py b/test/runjsontests.py index d0c938685..48cfe8235 100644 --- a/test/runjsontests.py +++ b/test/runjsontests.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/rununittests.py b/test/rununittests.py index cffe2c70e..6634e7241 100644 --- a/test/rununittests.py +++ b/test/rununittests.py @@ -1,4 +1,4 @@ -# Copyright 2009 The JsonCpp Authors +# Copyright 2009 Baptiste Lepilleur and The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE