cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Nalley <da...@gnsa.us>
Subject Re: [Patch] fixing python directory license file and headers
Date Thu, 07 Jun 2012 19:14:16 GMT
Chip - - this looks good except that we don't need python/LICENSE -
we'll put a top level LICENSE and NOTICE file in the root of the repo.
Can you remove that and send the patch again. Thanks for stepping up!

--David

On Thu, Jun 7, 2012 at 1:13 PM, Chip Childers <chip.childers@gmail.com> wrote:
> From 53e0867737236540475bf286b696def278cdb23b Mon Sep 17 00:00:00 2001
> From: Chip Childers <chip.childers@gmail.com>
> Date: Thu, 7 Jun 2012 12:54:56 -0400
> Subject: fixing python directory license file and headers
>
>
> Signed-off-by: Chip Childers <chip.childers@gmail.com>
> ---
>  python/LICENSE                                     |  202 ++++++++++++++++++++
>  python/bindir/cloud-external-ipallocator.py        |   32 ++--
>  .../bindir/cloud-grab-dependent-library-versions   |   16 ++
>  python/bindir/cloud-setup-baremetal                |   26 ++-
>  .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in    |   17 ++
>  .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in    |   17 ++
>  .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in    |   17 ++
>  .../sles/SYSCONFDIR/init.d/cloud-ipallocator.in    |   17 ++
>  .../ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in  |   17 ++
>  python/incubation/cloud-web-ipallocator.py         |   32 ++--
>  python/lib/cloud_utils.py                          |   32 ++--
>  python/lib/cloudutils/__init__.py                  |   28 ++--
>  python/lib/cloudutils/cloudException.py            |   28 ++--
>  python/lib/cloudutils/configFileOps.py             |   28 ++--
>  python/lib/cloudutils/db.py                        |   28 ++--
>  python/lib/cloudutils/globalEnv.py                 |   28 ++--
>  python/lib/cloudutils/networkConfig.py             |   28 ++--
>  python/lib/cloudutils/serviceConfig.py             |   28 ++--
>  python/lib/cloudutils/serviceConfigServer.py       |   29 ++--
>  python/lib/cloudutils/syscfg.py                    |   29 ++--
>  python/lib/cloudutils/utilities.py                 |   28 ++--
>  21 files changed, 528 insertions(+), 179 deletions(-)
>  create mode 100644 python/LICENSE
>
> diff --git a/python/LICENSE b/python/LICENSE
> new file mode 100644
> index 0000000..6279e52
> --- /dev/null
> +++ b/python/LICENSE
> @@ -0,0 +1,202 @@
> +
> +                                 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.
> +
> +   END OF TERMS AND CONDITIONS
> +
> +   APPENDIX: How to apply the Apache License to your work.
> +
> +      To apply the Apache License to your work, attach the following
> +      boilerplate notice, with the fields enclosed by brackets "[]"
> +      replaced with your own identifying information. (Don't include
> +      the brackets!)  The text should be enclosed in the appropriate
> +      comment syntax for the file format. We also recommend that a
> +      file or class name and description of purpose be included on the
> +      same "printed page" as the copyright notice for easier
> +      identification within third-party archives.
> +
> +   Copyright 1999-2005 The Apache Software Foundation
> +
> +   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/python/bindir/cloud-external-ipallocator.py
> b/python/bindir/cloud-external-ipallocator.py
> index 53709d0..b4cdea3 100755
> --- a/python/bindir/cloud-external-ipallocator.py
> +++ b/python/bindir/cloud-external-ipallocator.py
> @@ -1,20 +1,20 @@
>  #! /usr/bin/python
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> -
> -
> -
> -
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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 web
>  import socket, struct
> diff --git a/python/bindir/cloud-grab-dependent-library-versions
> b/python/bindir/cloud-grab-dependent-library-versions
> index 7d65e53..e649387 100755
> --- a/python/bindir/cloud-grab-dependent-library-versions
> +++ b/python/bindir/cloud-grab-dependent-library-versions
> @@ -1,4 +1,20 @@
>  #!/usr/bin/python
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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.
>  '''
>  Created on Nov 21, 2011
>
> diff --git a/python/bindir/cloud-setup-baremetal
> b/python/bindir/cloud-setup-baremetal
> index 6a4fbf7..d5eaafc 100755
> --- a/python/bindir/cloud-setup-baremetal
> +++ b/python/bindir/cloud-setup-baremetal
> @@ -1,16 +1,20 @@
>  #!/usr/bin/python
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# the License.  You may obtain a copy of the License at
>  #
> -
> -#copyright 2012 Citrix Systems, Inc. Licensed under the
> -#Apache License, Version 2.0 (the "License"); you may not use this
> -#file except in compliance with the License.  Citrix Systems, Inc.
> -#reserves all rights not expressly granted by 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.
> +# 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 sys, os
>  from subprocess import PIPE, Popen
> diff --git a/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> b/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> index dca8f00..613b4a9 100755
> --- a/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> +++ b/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> @@ -3,6 +3,23 @@
>  # chkconfig: 35 99 10
>  # description: Cloud Agent
>
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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.
> +
>  # WARNING: if this script is changed, then all other initscripts MUST
> BE changed to match it as well
>
>  . /etc/rc.d/init.d/functions
> diff --git a/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> b/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> index e0b6b61..cccb62b 100755
> --- a/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> +++ b/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> @@ -3,6 +3,23 @@
>  # chkconfig: 35 99 10
>  # description: Cloud Agent
>
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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.
> +
>  # WARNING: if this script is changed, then all other initscripts MUST
> BE changed to match it as well
>
>  . /etc/rc.d/init.d/functions
> diff --git a/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> b/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> index e0b6b61..cccb62b 100644
> --- a/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> +++ b/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
> @@ -3,6 +3,23 @@
>  # chkconfig: 35 99 10
>  # description: Cloud Agent
>
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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.
> +
>  # WARNING: if this script is changed, then all other initscripts MUST
> BE changed to match it as well
>
>  . /etc/rc.d/init.d/functions
> diff --git a/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
> b/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
> index 5980528..eee49e1 100755
> --- a/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
> +++ b/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
> @@ -8,6 +8,23 @@
>  # description:       Cloud IP address allocation
>  ### END INIT INFO
>
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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.
> +
>  # WARNING: if this script is changed, then all other initscripts MUST
> BE changed to match it as well
>
>  . /lib/lsb/init-functions
> diff --git a/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in
> b/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in
> index 0407f91..ca3b516 100755
> --- a/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in
> +++ b/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in
> @@ -3,6 +3,23 @@
>  # chkconfig: 35 99 10
>  # description: Cloud Agent
>
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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.
> +
>  # WARNING: if this script is changed, then all other initscripts MUST
> BE changed to match it as well
>
>  . /lib/lsb/init-functions
> diff --git a/python/incubation/cloud-web-ipallocator.py
> b/python/incubation/cloud-web-ipallocator.py
> index 53709d0..b4cdea3 100755
> --- a/python/incubation/cloud-web-ipallocator.py
> +++ b/python/incubation/cloud-web-ipallocator.py
> @@ -1,20 +1,20 @@
>  #! /usr/bin/python
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> -
> -
> -
> -
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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 web
>  import socket, struct
> diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py
> index b3d952a..8c84f3a 100644
> --- a/python/lib/cloud_utils.py
> +++ b/python/lib/cloud_utils.py
> @@ -1,20 +1,20 @@
>  #!/usr/bin/env python
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> -
> -
> -
> -
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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.
>
>  # -*- coding: utf-8 -*-
>  """CloudStack Python utility library"""
> diff --git a/python/lib/cloudutils/__init__.py
> b/python/lib/cloudutils/__init__.py
> index 37f96ce..e24dcce 100644
> --- a/python/lib/cloudutils/__init__.py
> +++ b/python/lib/cloudutils/__init__.py
> @@ -1,12 +1,16 @@
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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/python/lib/cloudutils/cloudException.py
> b/python/lib/cloudutils/cloudException.py
> index 3ce37b3..20a0f63 100644
> --- a/python/lib/cloudutils/cloudException.py
> +++ b/python/lib/cloudutils/cloudException.py
> @@ -1,15 +1,19 @@
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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 sys
>  import traceback
>  class CloudRuntimeException(Exception):
> diff --git a/python/lib/cloudutils/configFileOps.py
> b/python/lib/cloudutils/configFileOps.py
> index 3e9b3e8..92f7437 100644
> --- a/python/lib/cloudutils/configFileOps.py
> +++ b/python/lib/cloudutils/configFileOps.py
> @@ -1,15 +1,19 @@
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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 re
>  import tempfile
>  import shutil
> diff --git a/python/lib/cloudutils/db.py b/python/lib/cloudutils/db.py
> index 5865d3c..da4ee9e 100644
> --- a/python/lib/cloudutils/db.py
> +++ b/python/lib/cloudutils/db.py
> @@ -1,15 +1,19 @@
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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 MySQLdb
>  import os
>  from utilities import bash
> diff --git a/python/lib/cloudutils/globalEnv.py
> b/python/lib/cloudutils/globalEnv.py
> index f7c375d..468d5a1 100644
> --- a/python/lib/cloudutils/globalEnv.py
> +++ b/python/lib/cloudutils/globalEnv.py
> @@ -1,15 +1,19 @@
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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.
>  class globalEnv:
>     def __init__(self):
>         #Agent/Server/Db
> diff --git a/python/lib/cloudutils/networkConfig.py
> b/python/lib/cloudutils/networkConfig.py
> index d15820e..5aabf94 100644
> --- a/python/lib/cloudutils/networkConfig.py
> +++ b/python/lib/cloudutils/networkConfig.py
> @@ -1,15 +1,19 @@
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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 utilities import bash
>  from cloudException import CloudRuntimeException, CloudInternalException
>  import logging
> diff --git a/python/lib/cloudutils/serviceConfig.py
> b/python/lib/cloudutils/serviceConfig.py
> index 539e26a..0b60e89 100755
> --- a/python/lib/cloudutils/serviceConfig.py
> +++ b/python/lib/cloudutils/serviceConfig.py
> @@ -1,15 +1,19 @@
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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 utilities import writeProgressBar, bash
>  from cloudException import CloudRuntimeException,
> CloudInternalException, formatExceptionInfo
>  import logging
> diff --git a/python/lib/cloudutils/serviceConfigServer.py
> b/python/lib/cloudutils/serviceConfigServer.py
> index b113390..dc17987 100644
> --- a/python/lib/cloudutils/serviceConfigServer.py
> +++ b/python/lib/cloudutils/serviceConfigServer.py
> @@ -1,15 +1,20 @@
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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 db import Database
>  from configFileOps import configFileOps
>  from serviceConfig import serviceCfgBase
> diff --git a/python/lib/cloudutils/syscfg.py b/python/lib/cloudutils/syscfg.py
> index e8ddcf7..f470a02 100755
> --- a/python/lib/cloudutils/syscfg.py
> +++ b/python/lib/cloudutils/syscfg.py
> @@ -1,15 +1,20 @@
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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 utilities import Distribution, serviceOpsRedhat,serviceOpsUbuntu
>  from serviceConfig import *
>  class sysConfigFactory:
> diff --git a/python/lib/cloudutils/utilities.py
> b/python/lib/cloudutils/utilities.py
> index d62b9ec..8a25559 100755
> --- a/python/lib/cloudutils/utilities.py
> +++ b/python/lib/cloudutils/utilities.py
> @@ -1,15 +1,19 @@
> -# Copyright 2012 Citrix Systems, Inc. Licensed under the
> -# Apache License, Version 2.0 (the "License"); you may not use this
> -# file except in compliance with the License.  Citrix Systems, Inc.
> -# reserves all rights not expressly granted by 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.
> -#
> -# Automatically generated by addcopyright.py at 04/03/2012
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# 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 cloudException import CloudRuntimeException, formatExceptionInfo
>  import logging
>  from subprocess import PIPE, Popen
> --
> 1.7.7.5 (Apple Git-26)

Mime
View raw message