From cab63fa848aae847c9576b9540c0e12e4d0cbbea Mon Sep 17 00:00:00 2001 From: Endre Karlson Date: Wed, 31 Oct 2012 18:26:52 +0100 Subject: [PATCH] Fix up license headers I hope. --- billistix/__init__.py | 17 ++++++++++++++++- billistix/api/__init__.py | 16 ++++++++++++++++ billistix/api/auth.py | 1 + billistix/api/service.py | 16 ++++++++++++++++ billistix/api/v1.py | 15 +++++++++++++++ billistix/central/__init__.py | 16 ++++++++++++++++ billistix/central/api.py | 16 ++++++++++++++++ billistix/central/service.py | 16 ++++++++++++++++ billistix/exceptions.py | 4 ++-- billistix/recorder/__init__.py | 15 +++++++++++++++ billistix/recorder/base.py | 15 +++++++++++++++ billistix/recorder/impl_ceilometer.py | 16 ++++++++++++++++ billistix/recorder/openstack.py | 15 +++++++++++++++ billistix/recorder/service.py | 15 +++++++++++++++ billistix/storage/__init__.py | 7 +++++-- billistix/storage/base.py | 16 ++++++++++++++++ billistix/tests/__init__.py | 1 + billistix/tests/test_storage/__init__.py | 15 +++++++++++++++ billistix/tests/test_storage/test_sqlalchemy.py | 15 +++++++++++++++ billistix/utils.py | 15 +++++++++++++++ 20 files changed, 257 insertions(+), 5 deletions(-) diff --git a/billistix/__init__.py b/billistix/__init__.py index eaa320a..1f7054d 100644 --- a/billistix/__init__.py +++ b/billistix/__init__.py @@ -1,4 +1,19 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 +# Copyright 2012 Managed I.T. +# +# Author: Kiall Mac Innes +# +# 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.:q + import os import socket from billistix.openstack.common import cfg diff --git a/billistix/api/__init__.py b/billistix/api/__init__.py index 6b720f0..58c1d31 100644 --- a/billistix/api/__init__.py +++ b/billistix/api/__init__.py @@ -1,3 +1,19 @@ +# Copyright 2012 Managed I.T. +# +# Author: Kiall Mac Innes +# +# 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. +# NOTE(zykes): Copied from Moniker import flask from billistix.openstack.common import cfg from billistix.openstack.common import jsonutils diff --git a/billistix/api/auth.py b/billistix/api/auth.py index 6054048..e71cdd1 100644 --- a/billistix/api/auth.py +++ b/billistix/api/auth.py @@ -13,6 +13,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +# NOTE(zykes): Copied from Moniker from billistix.openstack.common.context import RequestContext from billistix.openstack.common import cfg from billistix.openstack.common import log as logging diff --git a/billistix/api/service.py b/billistix/api/service.py index 969205e..f2fb30b 100644 --- a/billistix/api/service.py +++ b/billistix/api/service.py @@ -1,3 +1,19 @@ +# Copyright 2012 Managed I.T. +# +# Author: Kiall Mac Innes +# +# 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. +# NOTE(zykes): Copied from Moniker from paste import deploy from billistix.openstack.common import log as logging from billistix.openstack.common import wsgi diff --git a/billistix/api/v1.py b/billistix/api/v1.py index d6f5117..c18eb90 100644 --- a/billistix/api/v1.py +++ b/billistix/api/v1.py @@ -1,3 +1,18 @@ +# Copyright 2012 Bouvet ASA +# +# Author: Endre Karlson +# +# 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 datetime import flask diff --git a/billistix/central/__init__.py b/billistix/central/__init__.py index e69de29..a1b3c5e 100644 --- a/billistix/central/__init__.py +++ b/billistix/central/__init__.py @@ -0,0 +1,16 @@ +# Copyright 2012 Bouvet ASA +# +# Author: Endre Karlson +# +# 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. + diff --git a/billistix/central/api.py b/billistix/central/api.py index 2f4609e..05e712a 100644 --- a/billistix/central/api.py +++ b/billistix/central/api.py @@ -1,3 +1,19 @@ +# Copyright 2012 Bouvet ASA +# +# Author: Endre Karlson +# +# 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. +# NOTE(zykes): Copied verbatim from Moniker from billistix.openstack.common import cfg from billistix.openstack.common import log as logging from billistix.openstack.common.rpc.proxy import RpcProxy diff --git a/billistix/central/service.py b/billistix/central/service.py index 2d6379a..0300b1a 100644 --- a/billistix/central/service.py +++ b/billistix/central/service.py @@ -1,3 +1,19 @@ +# Copyright 2012 Bouvet ASA +# +# Author: Endre Karlson +# +# 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. +# NOTE(zykes): Copied verbatim from Moniker from billistix.openstack.common import cfg from billistix.openstack.common import log from billistix.openstack.common.rpc import service as rpc_service diff --git a/billistix/exceptions.py b/billistix/exceptions.py index eb6c3ce..fa0c06a 100644 --- a/billistix/exceptions.py +++ b/billistix/exceptions.py @@ -1,6 +1,6 @@ -# Copyright 2012 Bouvet ASA +# Copyright 2012 Managed I.T. # -# Author: Endre Karlson +# Author: Kiall Mac Innes # # 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 diff --git a/billistix/recorder/__init__.py b/billistix/recorder/__init__.py index 9882cbd..29e7c13 100644 --- a/billistix/recorder/__init__.py +++ b/billistix/recorder/__init__.py @@ -1,3 +1,18 @@ +# Copyright 2012 Bouvet ASA +# +# Author: Endre Karlson +# +# 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 stevedore import driver from billistix.openstack.common import cfg from billistix.openstack.common import log diff --git a/billistix/recorder/base.py b/billistix/recorder/base.py index 9669f5b..dda81b3 100644 --- a/billistix/recorder/base.py +++ b/billistix/recorder/base.py @@ -1,3 +1,18 @@ +# Copyright 2012 Bouvet ASA +# +# Author: Endre Karlson +# +# 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 abc diff --git a/billistix/recorder/impl_ceilometer.py b/billistix/recorder/impl_ceilometer.py index 03b4cd5..28d570f 100644 --- a/billistix/recorder/impl_ceilometer.py +++ b/billistix/recorder/impl_ceilometer.py @@ -1,3 +1,19 @@ +# Copyright 2012 Bouvet ASA +# +# Author: Endre Karlson +# +# 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. +# NOTE(zykes): Copied verbatim from ceilometerclient import ceilometerclient from billistix.openstack.common import log diff --git a/billistix/recorder/openstack.py b/billistix/recorder/openstack.py index 19a5e0d..8b7ce59 100644 --- a/billistix/recorder/openstack.py +++ b/billistix/recorder/openstack.py @@ -1,3 +1,18 @@ +# Copyright 2012 Bouvet ASA +# +# Author: Endre Karlson +# +# 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 urlparse import urlparse from keystoneclient.v2_0 import client as ksclient diff --git a/billistix/recorder/service.py b/billistix/recorder/service.py index f3e17c7..aa4dbcf 100644 --- a/billistix/recorder/service.py +++ b/billistix/recorder/service.py @@ -1,3 +1,18 @@ +# Copyright 2012 Bouvet ASA +# +# Author: Endre Karlson +# +# 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 os from billistix.openstack.common import cfg diff --git a/billistix/storage/__init__.py b/billistix/storage/__init__.py index 1e8b766..8a485f2 100644 --- a/billistix/storage/__init__.py +++ b/billistix/storage/__init__.py @@ -1,6 +1,8 @@ -# Copyright 2012 Bouvet ASA +# -*- encoding: utf-8 -*- # -# Author: Endre Karlson +# Copyright © 2012 New Dream Network, LLC (DreamHost) +# +# Author: Doug Hellmann # # 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 @@ -13,6 +15,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +# NOTE(zykes): Copied from Ceilometer from urlparse import urlparse from stevedore import driver from billistix.openstack.common import cfg diff --git a/billistix/storage/base.py b/billistix/storage/base.py index a77b635..9dc3b0f 100644 --- a/billistix/storage/base.py +++ b/billistix/storage/base.py @@ -1,3 +1,19 @@ +# -*- encoding: utf-8 -*- +# Copyright 2012 Bouvet ASA +# +# Author: Endre Karlson +# +# 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 abc diff --git a/billistix/tests/__init__.py b/billistix/tests/__init__.py index 189037f..c5802a1 100644 --- a/billistix/tests/__init__.py +++ b/billistix/tests/__init__.py @@ -13,6 +13,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +# NOTE(zykes): Copied from Moniker import sys import unittest import mox diff --git a/billistix/tests/test_storage/__init__.py b/billistix/tests/test_storage/__init__.py index 397d919..38346c0 100644 --- a/billistix/tests/test_storage/__init__.py +++ b/billistix/tests/test_storage/__init__.py @@ -1,3 +1,18 @@ +# Copyright 2012 Managed I.T. +# +# Author: Kiall Mac Innes +# +# 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 copy from nose import SkipTest from billistix.openstack.common import cfg diff --git a/billistix/tests/test_storage/test_sqlalchemy.py b/billistix/tests/test_storage/test_sqlalchemy.py index 1447034..11a88da 100644 --- a/billistix/tests/test_storage/test_sqlalchemy.py +++ b/billistix/tests/test_storage/test_sqlalchemy.py @@ -1,3 +1,18 @@ +# Copyright 2012 Managed I.T. +# +# Author: Kiall Mac Innes +# +# 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 billistix.openstack.common import log as logging from billistix.tests.test_storage import StorageDriverTestCase diff --git a/billistix/utils.py b/billistix/utils.py index 2a5521b..7d3c93c 100644 --- a/billistix/utils.py +++ b/billistix/utils.py @@ -1,3 +1,18 @@ +# Copyright 2012 Managed I.T. +# +# Author: Kiall Mac Innes +# +# 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 os from billistix.openstack.common import log as logging from billistix.openstack.common import cfg