From ce212001d82cca08751a74bf770c0a9c88c538a2 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Thu, 28 Apr 2011 11:53:45 -0700
Subject: [PATCH] nova out of sandbox

---
 apis/nova/pom.xml                              |  2 +-
 .../openstack/nova/NovaPropertiesBuilder.java  |  3 +--
 .../jclouds/openstack/nova/domain/Address.java | 18 ++++++++++++++++++
 .../openstack/nova/domain/Resource.java        | 18 ++++++++++++++++++
 .../nova/domain/ServerStatusTest.java          |  3 +--
 .../ParseFaultFromJsonResponseTest.java        |  3 +--
 .../compute/NovaComputeServiceLiveTest.java    |  3 +--
 .../DeleteServersInVariousStatesLiveTest.java  |  4 +---
 .../live/novaclient/ServerCreateLiveTest.java  |  4 +---
 9 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/apis/nova/pom.xml b/apis/nova/pom.xml
index 3bfbacda2c..0104b4bd9c 100644
--- a/apis/nova/pom.xml
+++ b/apis/nova/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+    Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
 
     ====================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java
index 5c808e974b..8e98a04fcd 100644
--- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java
+++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.openstack.nova;
 
 import org.jclouds.PropertiesBuilder;
diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java
index 96a8538d99..ce2908a29a 100644
--- a/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java
+++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * 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.
+ * ====================================================================
+ */
 package org.jclouds.openstack.nova.domain;
 
 import com.google.common.base.Function;
diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Resource.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Resource.java
index 6e6f9f241e..ed415c03dd 100644
--- a/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Resource.java
+++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Resource.java
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * 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.
+ * ====================================================================
+ */
 package org.jclouds.openstack.nova.domain;
 
 import java.net.URI;
diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerStatusTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerStatusTest.java
index 76d54f2d37..c22d10b579 100644
--- a/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerStatusTest.java
+++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerStatusTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.openstack.nova.domain;
 
 import com.google.common.collect.Lists;
diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFaultFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFaultFromJsonResponseTest.java
index ba70574d1c..5a62140cd2 100644
--- a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFaultFromJsonResponseTest.java
+++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFaultFromJsonResponseTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.openstack.nova.functions;
 
 import com.google.inject.Guice;
diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/NovaComputeServiceLiveTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/NovaComputeServiceLiveTest.java
index 0878913e88..b3d6690b27 100644
--- a/apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/NovaComputeServiceLiveTest.java
+++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/NovaComputeServiceLiveTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.openstack.nova.live.compute;
 
 import com.google.common.base.Function;
diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/DeleteServersInVariousStatesLiveTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/DeleteServersInVariousStatesLiveTest.java
index 58993f3fde..e6b5c67e29 100644
--- a/apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/DeleteServersInVariousStatesLiveTest.java
+++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/DeleteServersInVariousStatesLiveTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.openstack.nova.live.novaclient;
 
 import com.google.common.base.Predicate;
@@ -34,7 +33,6 @@ import java.util.Map;
 /**
  * @author Victor Galkin
  */
-
 @Test(groups = "live", sequential = true)
 public class DeleteServersInVariousStatesLiveTest {
 
diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ServerCreateLiveTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ServerCreateLiveTest.java
index 30093e0a6e..9f3fb72947 100644
--- a/apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ServerCreateLiveTest.java
+++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ServerCreateLiveTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.openstack.nova.live.novaclient;
 
 import com.google.common.base.Predicate;
@@ -50,7 +49,6 @@ import static org.jclouds.openstack.nova.options.CreateServerOptions.Builder.wit
 /**
  * @author Victor Galkin
  */
-
 @Test(groups = "live", sequential = true)
 public class ServerCreateLiveTest {