From dfa95985451b59b1e9c9f784b287ffe15127b28a Mon Sep 17 00:00:00 2001 From: memo Date: Mon, 9 Nov 2015 15:29:07 +0000 Subject: [PATCH] Updated LICENSE file and headers removed unnecesary header in license added missing header in files Change-Id: Iea79505307479541de01231dd25c3821e9e8999c --- LICENSE | 175 +++++++++++++++++++++++++++ LICENSE.rst | 19 --- devstack/lib/freezer-api | 14 +++ devstack/local.conf.example | 14 +++ devstack/plugin.sh | 14 +++ devstack/settings | 14 +++ etc/freezer-api.conf | 14 +++ freezer_api/api/common/middleware.py | 4 - freezer_api/api/v1/__init__.py | 4 - freezer_api/api/v1/actions.py | 4 - freezer_api/api/v1/backups.py | 4 - freezer_api/api/v1/clients.py | 4 - freezer_api/api/v1/homedoc.py | 5 - freezer_api/api/v1/jobs.py | 4 - freezer_api/api/v1/sessions.py | 4 - freezer_api/api/versions.py | 4 - freezer_api/cmd/api.py | 4 - freezer_api/cmd/db_init.py | 4 - freezer_api/common/_i18n.py | 14 +++ freezer_api/common/config.py | 5 - freezer_api/common/db_mappings.py | 4 - freezer_api/common/exceptions.py | 4 - freezer_api/common/json_schemas.py | 4 - freezer_api/common/log.py | 4 - freezer_api/common/utils.py | 5 - freezer_api/storage/driver.py | 4 - freezer_api/storage/elastic.py | 4 - setup.py | 14 +++ tests/common.py | 4 - tests/test_actions.py | 4 - tests/test_api.py | 4 - tests/test_backups.py | 4 - tests/test_clients.py | 14 +++ tests/test_db_init.py | 4 - tests/test_driver.py | 4 - tests/test_elastic.py | 4 - tests/test_exceptions.py | 14 +++ tests/test_homedoc.py | 4 - tests/test_jobs.py | 4 - tests/test_middleware.py | 5 - tests/test_sessions.py | 4 - tests/test_utils.py | 4 - tests/test_versions.py | 4 - 43 files changed, 301 insertions(+), 151 deletions(-) create mode 100644 LICENSE delete mode 100644 LICENSE.rst diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..e97bf01c --- /dev/null +++ b/LICENSE @@ -0,0 +1,175 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + diff --git a/LICENSE.rst b/LICENSE.rst deleted file mode 100644 index aa82c773..00000000 --- a/LICENSE.rst +++ /dev/null @@ -1,19 +0,0 @@ -(c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P. - -Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). diff --git a/devstack/lib/freezer-api b/devstack/lib/freezer-api index eeafa8f4..c5899d09 100644 --- a/devstack/lib/freezer-api +++ b/devstack/lib/freezer-api @@ -1,5 +1,19 @@ #!/usr/bin/env bash +# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # Install and start Freezer service # add the following to localrc: diff --git a/devstack/local.conf.example b/devstack/local.conf.example index 26f65285..acd96f78 100644 --- a/devstack/local.conf.example +++ b/devstack/local.conf.example @@ -1,3 +1,17 @@ +# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + [[local|localrc]] disable_all_services diff --git a/devstack/plugin.sh b/devstack/plugin.sh index c065f4ef..906a6a9b 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -1,3 +1,17 @@ +# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # check for service enabled if is_service_enabled freezer-api; then if [[ "$1" == "source" || "`type -t install_freezer_api`" != 'function' ]]; then diff --git a/devstack/settings b/devstack/settings index 5cf9205e..619ceb73 100644 --- a/devstack/settings +++ b/devstack/settings @@ -1,3 +1,17 @@ +# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # Defaults # -------- diff --git a/etc/freezer-api.conf b/etc/freezer-api.conf index bb7c9f29..6ca7e758 100644 --- a/etc/freezer-api.conf +++ b/etc/freezer-api.conf @@ -1,3 +1,17 @@ +# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + [DEFAULT] # Show more verbose log output (sets INFO log level output) verbose = false diff --git a/freezer_api/api/common/middleware.py b/freezer_api/api/common/middleware.py index 341bd035..b76002cd 100644 --- a/freezer_api/api/common/middleware.py +++ b/freezer_api/api/common/middleware.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ from freezer_api.common import exceptions as freezer_api_exc diff --git a/freezer_api/api/v1/__init__.py b/freezer_api/api/v1/__init__.py index 376356de..487c3936 100644 --- a/freezer_api/api/v1/__init__.py +++ b/freezer_api/api/v1/__init__.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ from freezer_api.api.v1 import actions diff --git a/freezer_api/api/v1/actions.py b/freezer_api/api/v1/actions.py index 3af42367..d17c5ede 100644 --- a/freezer_api/api/v1/actions.py +++ b/freezer_api/api/v1/actions.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import falcon diff --git a/freezer_api/api/v1/backups.py b/freezer_api/api/v1/backups.py index 8889bad0..9d8d7e26 100644 --- a/freezer_api/api/v1/backups.py +++ b/freezer_api/api/v1/backups.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import falcon diff --git a/freezer_api/api/v1/clients.py b/freezer_api/api/v1/clients.py index a0a29e5f..2c3e4151 100644 --- a/freezer_api/api/v1/clients.py +++ b/freezer_api/api/v1/clients.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import falcon diff --git a/freezer_api/api/v1/homedoc.py b/freezer_api/api/v1/homedoc.py index 2b8e83f9..5c7a15ab 100644 --- a/freezer_api/api/v1/homedoc.py +++ b/freezer_api/api/v1/homedoc.py @@ -13,11 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== - http://tools.ietf.org/html/draft-nottingham-json-home-03 """ diff --git a/freezer_api/api/v1/jobs.py b/freezer_api/api/v1/jobs.py index d8f2150d..fd820c36 100644 --- a/freezer_api/api/v1/jobs.py +++ b/freezer_api/api/v1/jobs.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import falcon diff --git a/freezer_api/api/v1/sessions.py b/freezer_api/api/v1/sessions.py index bf7001c0..d4c6d862 100644 --- a/freezer_api/api/v1/sessions.py +++ b/freezer_api/api/v1/sessions.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import falcon diff --git a/freezer_api/api/versions.py b/freezer_api/api/versions.py index 7d1fa7b4..109d60b8 100644 --- a/freezer_api/api/versions.py +++ b/freezer_api/api/versions.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import json diff --git a/freezer_api/cmd/api.py b/freezer_api/cmd/api.py index c2037d7f..48dedefe 100644 --- a/freezer_api/cmd/api.py +++ b/freezer_api/cmd/api.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import logging diff --git a/freezer_api/cmd/db_init.py b/freezer_api/cmd/db_init.py index 741e3470..3230d058 100755 --- a/freezer_api/cmd/db_init.py +++ b/freezer_api/cmd/db_init.py @@ -14,10 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import argparse diff --git a/freezer_api/common/_i18n.py b/freezer_api/common/_i18n.py index 8fc1929d..cb23e003 100644 --- a/freezer_api/common/_i18n.py +++ b/freezer_api/common/_i18n.py @@ -1,5 +1,19 @@ # app/i18n.py +# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + import oslo_i18n _translators = oslo_i18n.TranslatorFactory(domain='freezer-api') diff --git a/freezer_api/common/config.py b/freezer_api/common/config.py index c5be193b..768dfcd0 100644 --- a/freezer_api/common/config.py +++ b/freezer_api/common/config.py @@ -12,11 +12,6 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ from oslo_config import cfg diff --git a/freezer_api/common/db_mappings.py b/freezer_api/common/db_mappings.py index b069c661..5acabfaf 100644 --- a/freezer_api/common/db_mappings.py +++ b/freezer_api/common/db_mappings.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ diff --git a/freezer_api/common/exceptions.py b/freezer_api/common/exceptions.py index 7a5fbb93..23cedff2 100644 --- a/freezer_api/common/exceptions.py +++ b/freezer_api/common/exceptions.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ diff --git a/freezer_api/common/json_schemas.py b/freezer_api/common/json_schemas.py index 1af922b5..a53e29cf 100644 --- a/freezer_api/common/json_schemas.py +++ b/freezer_api/common/json_schemas.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ freezer_action_properties = { diff --git a/freezer_api/common/log.py b/freezer_api/common/log.py index 3419249f..cf16ad69 100644 --- a/freezer_api/common/log.py +++ b/freezer_api/common/log.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ diff --git a/freezer_api/common/utils.py b/freezer_api/common/utils.py index 5e4b26dd..f77ebe5c 100644 --- a/freezer_api/common/utils.py +++ b/freezer_api/common/utils.py @@ -12,11 +12,6 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import jsonschema diff --git a/freezer_api/storage/driver.py b/freezer_api/storage/driver.py index c571a08f..1d74436e 100644 --- a/freezer_api/storage/driver.py +++ b/freezer_api/storage/driver.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import logging diff --git a/freezer_api/storage/elastic.py b/freezer_api/storage/elastic.py index 95874718..5ef1cd8f 100644 --- a/freezer_api/storage/elastic.py +++ b/freezer_api/storage/elastic.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import elasticsearch diff --git a/setup.py b/setup.py index aa2d8a01..165df56d 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,19 @@ #!/usr/bin/env python +# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + from setuptools import setup setup( diff --git a/tests/common.py b/tests/common.py index c1f3ef2b..05766ba9 100644 --- a/tests/common.py +++ b/tests/common.py @@ -14,10 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ diff --git a/tests/test_actions.py b/tests/test_actions.py index d170c2f5..ef9207c7 100644 --- a/tests/test_actions.py +++ b/tests/test_actions.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import unittest diff --git a/tests/test_api.py b/tests/test_api.py index 41c49fef..3be0d879 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -14,10 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import unittest diff --git a/tests/test_backups.py b/tests/test_backups.py index e1213ffd..ce219376 100644 --- a/tests/test_backups.py +++ b/tests/test_backups.py @@ -14,10 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import unittest diff --git a/tests/test_clients.py b/tests/test_clients.py index 2da17f77..5ceb0767 100644 --- a/tests/test_clients.py +++ b/tests/test_clients.py @@ -1,3 +1,17 @@ +# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + import unittest from mock import Mock, patch diff --git a/tests/test_db_init.py b/tests/test_db_init.py index 41dc57d2..98428f53 100644 --- a/tests/test_db_init.py +++ b/tests/test_db_init.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import os diff --git a/tests/test_driver.py b/tests/test_driver.py index 9f7a43e8..ee86cca6 100644 --- a/tests/test_driver.py +++ b/tests/test_driver.py @@ -14,10 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ diff --git a/tests/test_elastic.py b/tests/test_elastic.py index f9c74154..c9a310eb 100644 --- a/tests/test_elastic.py +++ b/tests/test_elastic.py @@ -14,10 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import unittest diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index a3756220..219b04c8 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -1,3 +1,17 @@ +# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + import unittest from mock import Mock, patch diff --git a/tests/test_homedoc.py b/tests/test_homedoc.py index d86d51fc..a468b27d 100644 --- a/tests/test_homedoc.py +++ b/tests/test_homedoc.py @@ -14,10 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import unittest diff --git a/tests/test_jobs.py b/tests/test_jobs.py index dfc41866..645c4744 100644 --- a/tests/test_jobs.py +++ b/tests/test_jobs.py @@ -14,10 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import unittest diff --git a/tests/test_middleware.py b/tests/test_middleware.py index d92d4434..46acab1c 100644 --- a/tests/test_middleware.py +++ b/tests/test_middleware.py @@ -13,11 +13,6 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ diff --git a/tests/test_sessions.py b/tests/test_sessions.py index 4a78f1ea..9cca93f0 100644 --- a/tests/test_sessions.py +++ b/tests/test_sessions.py @@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import unittest diff --git a/tests/test_utils.py b/tests/test_utils.py index 6fd390bf..dac49ca9 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -14,10 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import unittest diff --git a/tests/test_versions.py b/tests/test_versions.py index 9127ee33..7f289751 100644 --- a/tests/test_versions.py +++ b/tests/test_versions.py @@ -14,10 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). -======================================================================== """ import unittest