committing some more changes to marvins license headers

tools/marvin/LICENSE.txt

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

tools/marvin/marvin/sandbox/demo/live/testSshDeployVM.py

@@ -1,16 +1,20 @@
 #!/usr/bin/env python
-# 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/marvin/marvin/sandbox/demo/simulator/simulator_setup.py

@@ -1,4 +1,21 @@
 #!/usr/bin/env 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.
+
 
 from ConfigParser import SafeConfigParser
 from optparse import OptionParser

tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/base.py

@@ -1,7 +1,20 @@
 # -*- encoding: utf-8 -*-
+# 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
 # 
-# Copyright (c) 2012 Citrix.  All rights reserved.
+#   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.
 
 """ Base class for all Cloudstack resources
     -Virtual machine, Volume, Snapshot etc

tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/common.py

@@ -1,7 +1,20 @@
 # -*- encoding: utf-8 -*-
+# 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
 # 
-# Copyright (c) 2012 Citrix.  All rights reserved.
+#   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.
 
 """Common functions
 """

tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/utils.py

@@ -1,7 +1,20 @@
 # -*- encoding: utf-8 -*-
+# 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
 # 
-# Copyright (c) 2012 Citrix.  All rights reserved.
+#   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.
 
 """Utilities functions
 """

tools/marvin/marvin/sandbox/demo/simulator/testcase/test_vm_life_cycle.py

@@ -1,16 +1,21 @@
 # -*- encoding: utf-8 -*-
-# 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.
+
 """ BVT tests for Virtual Machine Life Cycle
 """
 #Import Local Modules

tools/marvin/setup.py

@@ -1,7 +1,20 @@
 #!/usr/bin/env python
-# 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
+# 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 distutils.core import setup
 from sys import version