Updated licenses

bin/nova-api

@@ -1,19 +1,24 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright [2010] [Anso Labs, LLC]
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
+
 """
   Tornado daemon for the main API endpoint.  
 """

bin/nova-compute

@@ -1,19 +1,24 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright [2010] [Anso Labs, LLC]
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
+
 """
   Twistd daemon for the nova compute nodes.
   Receives messages via AMQP, manages pool of worker threads

bin/nova-instancemonitor

@@ -1,19 +1,24 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright [2010] [Anso Labs, LLC]
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
+
 """
   Daemon for Nova RRD based instance resource monitoring.
 """

bin/nova-manage

@@ -1,19 +1,24 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright [2010] [Anso Labs, LLC]
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
+
 """
   CLI interface for nova management.
   Connects to the running ADMIN api in the api daemon.

bin/nova-objectstore

@@ -1,19 +1,24 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright [2010] [Anso Labs, LLC]
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
+
 """
   Tornado daemon for nova objectstore. Supports S3 API.  
 """

bin/nova-volume

@@ -1,19 +1,24 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright [2010] [Anso Labs, LLC]
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
+
 """
     Tornado Storage daemon manages AoE volumes via AMQP messaging.
 """

builddeb.sh

@@ -1,16 +1,22 @@
 #!/bin/sh
-# Copyright [2010] [Anso Labs, LLC]
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 dpkg-buildpackage -b -rfakeroot -tc -uc -D

docs/architecture.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 nova System Architecture
 ========================

docs/auth.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 Auth Documentation
 ==================    

docs/binaries.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 Nova Binaries
 ===============

docs/compute.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 Compute Documentation
 =====================

docs/endpoint.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 Endpoint Documentation
 ======================

docs/fakes.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 Nova Fakes
 ==========

docs/getting.started.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 Getting Started with Nova
 =========================

docs/index.rst

@@ -1,18 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
-
 
 Welcome to nova's documentation!
 ================================

docs/modules.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 Nova Documentation
 ==================

docs/network.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 nova Networking
 ================

docs/nova.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 NOVA Libraries
 ===============

docs/objectstore.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 Objectstore Documentation
 =========================

docs/packages.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 nova Packages & Dependencies
 ============================

docs/storage.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 Storage in the Nova Cloud
 =========================

docs/volume.rst

@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
+      Copyright 2010 Anso Labs, LLC
-      you may not use this file except in compliance with the License.
+
-      You may obtain a copy of the License at
+      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,
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      See the License for the specific language governing permissions and
+      License for the specific language governing permissions and limitations
-      limitations under the License.
+      under the License.
 
 Volume Documentation
 ====================

nova/adminclient.py

@@ -1,17 +1,22 @@
-# Copyright [2010] [Anso Labs, LLC]
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
-
 """
 Nova User API client library.
 """

nova/auth/__init__.py

@@ -1,17 +1,22 @@
-# Copyright [2010] [Anso Labs, LLC]
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
-
 """
 :mod:`nova.auth` -- Authentication and Access Control
 =====================================================

nova/auth/fakeldap.py

@@ -1,18 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
-
 """
   Fake LDAP server for test harnesses.
 """

nova/auth/novarc.template

@@ -1,16 +1,22 @@
-# Copyright [2010] [Anso Labs, LLC]
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 NOVA_KEY_DIR=$(pushd $(dirname $BASH_SOURCE)>/dev/null; pwd; popd>/dev/null)
 export EC2_ACCESS_KEY="%(access)s:%(project)s"

nova/auth/rbac.py

@@ -1,3 +1,23 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
+#
+# Copyright 2010 Anso Labs, LLC
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
 from nova import exception
 from nova.auth import users
 

nova/auth/signer.py

@@ -1,17 +1,23 @@
-# Copyright [2010] [Anso Labs, LLC]
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
-
+#
 # PORTIONS OF THIS FILE ARE FROM:
 # http://code.google.com/p/boto
 # Copyright (c) 2006-2009 Mitch Garnaat http://garnaat.org/

nova/auth/slap.sh

@@ -1,18 +1,23 @@
 #!/usr/bin/env bash
-# Copyright [2010] [Anso Labs, LLC]
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
-
 # LDAP INSTALL SCRIPT - SHOULD BE IDEMPOTENT, but it SCRUBS all USERS
 
 apt-get install -y slapd ldap-utils python-ldap

nova/auth/users.py

@@ -1,18 +1,23 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 Nova users and user management, including RBAC hooks.

nova/datastore.py

@@ -1,18 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright [2010] [Anso Labs, LLC]
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 Datastore:

nova/endpoint/__init__.py

@@ -1,16 +1,22 @@
-# Copyright [2010] [Anso Labs, LLC]
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 :mod:`nova.endpoint` -- Main NOVA Api endpoints

nova/endpoint/admin.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 Admin API controller, exposed through http via the api worker.

nova/endpoint/api.py

@@ -1,18 +1,22 @@
-#!/usr/bin/python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 Tornado REST API Request Handlers for Nova functions

nova/endpoint/cloud.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 Cloud Controller: Implementation of EC2 REST API calls, which are

nova/endpoint/images.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 Proxy AMI-related calls from the cloud controller, to the running

nova/fakerabbit.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """ Based a bit on the carrot.backeds.queue backend... but a lot better """
 

nova/fakevirt.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 A fake (in-memory) hypervisor+api. Allows nova testing w/o KVM and libvirt.

nova/flags.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 Package-level global flags are defined here, the rest are defined

nova/process.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 Process pool, still buggy right now.

nova/rpc.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 AMQP-based RPC. Queues have consumers and publishers.

nova/server.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 Base functionality for nova daemons - gradually being replaced with twistd.py.

nova/tests/access_unittest.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import unittest
 import logging

nova/tests/api_integration.py

@@ -1,16 +1,22 @@
-# Copyright [2010] [Anso Labs, LLC]
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import unittest
 

nova/tests/api_unittest.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import httplib
 import random

nova/tests/cloud_unittest.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import logging
 import StringIO

nova/tests/datastore_unittest.py

@@ -1,3 +1,23 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
+#
+# Copyright 2010 Anso Labs, LLC
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
 from nova import test
 from nova import datastore
 import random

nova/tests/fake_flags.py

@@ -1,16 +1,22 @@
-# Copyright [2010] [Anso Labs, LLC]
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 from nova import flags
 

nova/tests/future_unittest.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import logging
 import StringIO

nova/tests/keeper_unittest.py

@@ -1,4 +1,23 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
+#
+# Copyright 2010 Anso Labs, LLC
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
 import random
 
 from nova import datastore

nova/tests/network_unittest.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import logging
 import unittest

nova/tests/node_unittest.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import logging
 import time

nova/tests/objectstore_unittest.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import glob
 import hashlib

nova/tests/process_unittest.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import logging
 from xml.etree import ElementTree

nova/tests/real_flags.py

@@ -1,16 +1,22 @@
-# Copyright [2010] [Anso Labs, LLC]
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 from nova import flags
 

nova/tests/storage_unittest.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import logging
 

nova/tests/users_unittest.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import logging
 import unittest

nova/tests/validator_unittest.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 import logging
 import unittest

nova/twistd.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 Twisted daemon helpers, specifically to parse out gFlags from twisted flags,

nova/validate.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
   Decorators for argument validation, courtesy of 

nova/vendor.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 Get our vendor folders into the system path.

run_tests.py

@@ -1,17 +1,22 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. 
+# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
+# Copyright 2010 Anso Labs, LLC
-#    you may not use this file except in compliance with the License.
+#
-#    You may obtain a copy of the License at
+#    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,
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    See the License for the specific language governing permissions and
+#    License for the specific language governing permissions and limitations
-#    limitations under the License.
+#    under the License.
 
 """
 This is our basic test running framework based on Twisted's Trial.