fixing license headers in marvin

docs/runbook/en-US/Overview.xml

@@ -62,8 +62,9 @@
             </listitem>
             <listitem>
               <para>
-                The CentOS 6.2 x86_64 minimal installation CD available from here:
+                The 
                 <ulink url="http://mirrors.kernel.org/centos/6.2/isos/x86_64/CentOS-6.2-x86_64-minimal.iso">
+                CentOS 6.2 x86_64 minimal install CD
                 </ulink>
               </para>
             </listitem>
@@ -75,8 +76,9 @@
             </listitem>
             <listitem>
               <para>
-                Copy of CloudStack 3.0.2 for Red Hat Enterprise Linux (RHEL) and CentOS 6.2 available here:
+                Copy of 
                 <ulink url="http://sourceforge.net/projects/cloudstack/files/CloudStack%20Acton/3.0.2/CloudStack-oss-3.0.2-1-rhel6.2.tar.gz/download">
+                  CloudStack 3.0.2 for RHEL and CentOS 6.2
                 </ulink>
               </para>
             </listitem>

patches/systemvm/debian/buildsystemvm.sh

@@ -1,16 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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.
 
  
 set -e

patches/systemvm/debian/convert.sh

@@ -1,16 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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.
 
 
 

patches/systemvm/debian/qemuconvert.sh

@@ -1,16 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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.
 
 
 

patches/systemvm/debian/vhdconvert.sh

@@ -1,16 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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.
 
 
 

tools/bugs-wiki/search-bugs.py

@@ -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
+# 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 imp
 import os

tools/bugs-wiki/search-wiki.py

@@ -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
+# 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 imp
 import os

tools/marvin/marvin/NoseTestExecuteEngine.py

@@ -1,3 +1,20 @@
+# 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
+# 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 functools import partial
 import unittest
 import nose

tools/marvin/marvin/TestCaseExecuteEngine.py

@@ -1,15 +1,19 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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
 import xmlrunner

tools/marvin/marvin/asyncJobMgr.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 threading
 import cloudstackException
 import time

tools/marvin/marvin/cloudstackConnection.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 urllib2
 import urllib
 import base64

tools/marvin/marvin/cloudstackException.py

@@ -1,15 +1,19 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 cloudstackAPIException(Exception):
     def __init__(self, cmd = "", result = ""):

tools/marvin/marvin/cloudstackTestCase.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 cloudstackAPI import *
 import unittest
 import cloudstackTestClient

tools/marvin/marvin/cloudstackTestClient.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 cloudstackConnection
 import asyncJobMgr
 import dbConnection

tools/marvin/marvin/codegenerator.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 xml.dom.minidom
 from optparse import OptionParser
 import os

tools/marvin/marvin/configGenerator.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 json
 import os
 from optparse import OptionParser

tools/marvin/marvin/dbConnection.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 pymysql
 import cloudstackException
 import sys

tools/marvin/marvin/deployAndRun.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 deployDataCenter
 import TestCaseExecuteEngine
 import NoseTestExecuteEngine

tools/marvin/marvin/deployDataCenter.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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.
+
 """Deploy datacenters according to a json configuration file"""
 import configGenerator
 import cloudstackException

tools/marvin/marvin/jsonHelper.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 cloudstackException
 import json
 import inspect

tools/marvin/marvin/remoteSSHClient.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 paramiko 
 import time
 import cloudstackException

tools/test/apisession.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 cookielib
 import hashlib
 import json

tools/test/cloudkit.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 apisession import ApiSession
 from physicalresource import ZoneCreator
 from globalconfig import GlobalConfig

tools/test/db.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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
 
 class Database:

tools/test/globalconfig.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 json
 import os
 import random

tools/test/physicalresource.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 json
 import os
 import random

tools/test/vm.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 json
 import os
 import random

tools/test/vmcreate.py

@@ -1,15 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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
+#   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 apisession import ApiSession
 from vm import VMCreator