From a5bcf3c8230a5abb0d1b8c6388f288bac2371d9c Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 12 Mar 2012 12:25:03 -0700 Subject: [PATCH] moved openstack extensions into package marked as such --- .../HPCloudComputeFloatingIPClientLiveTest.java | 2 +- .../jclouds/openstack/nova/v1_1/NovaAsyncClient.java | 6 +++--- .../org/jclouds/openstack/nova/v1_1/NovaClient.java | 6 +++--- .../nova/v1_1/config/NovaRestClientModule.java | 12 ++++++------ .../FloatingIPAsyncClient.java | 3 ++- .../{features => extensions}/FloatingIPClient.java | 2 +- .../{features => extensions}/KeyPairAsyncClient.java | 3 ++- .../v1_1/{features => extensions}/KeyPairClient.java | 2 +- .../SecurityGroupAsyncClient.java | 3 ++- .../SecurityGroupClient.java | 2 +- .../openstack/nova/v1_1/features/FlavorClient.java | 2 +- .../FloatingIPClientExpectTest.java | 2 +- .../FloatingIPClientLiveTest.java | 6 +++++- .../KeyPairClientExpectTest.java | 2 +- .../KeyPairClientLiveTest.java | 3 ++- 15 files changed, 32 insertions(+), 24 deletions(-) rename labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/{features => extensions}/FloatingIPAsyncClient.java (97%) rename labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/{features => extensions}/FloatingIPClient.java (97%) rename labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/{features => extensions}/KeyPairAsyncClient.java (96%) rename labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/{features => extensions}/KeyPairClient.java (97%) rename labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/{features => extensions}/SecurityGroupAsyncClient.java (97%) rename labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/{features => extensions}/SecurityGroupClient.java (97%) rename labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/{features => extensions}/FloatingIPClientExpectTest.java (99%) rename labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/{features => extensions}/FloatingIPClientLiveTest.java (95%) rename labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/{features => extensions}/KeyPairClientExpectTest.java (98%) rename labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/{features => extensions}/KeyPairClientLiveTest.java (96%) diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFloatingIPClientLiveTest.java b/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFloatingIPClientLiveTest.java index 81856da6b1..0135c44035 100644 --- a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFloatingIPClientLiveTest.java +++ b/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFloatingIPClientLiveTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.hpcloud.compute.features; -import org.jclouds.openstack.nova.v1_1.features.FloatingIPClientLiveTest; +import org.jclouds.openstack.nova.v1_1.extensions.FloatingIPClientLiveTest; import org.testng.annotations.Test; /** diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java index 5c99d5bd83..1c24c998ef 100644 --- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java +++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java @@ -23,11 +23,11 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Region; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; +import org.jclouds.openstack.nova.v1_1.extensions.FloatingIPAsyncClient; +import org.jclouds.openstack.nova.v1_1.extensions.KeyPairAsyncClient; +import org.jclouds.openstack.nova.v1_1.extensions.SecurityGroupAsyncClient; import org.jclouds.openstack.nova.v1_1.features.FlavorAsyncClient; -import org.jclouds.openstack.nova.v1_1.features.FloatingIPAsyncClient; import org.jclouds.openstack.nova.v1_1.features.ImageAsyncClient; -import org.jclouds.openstack.nova.v1_1.features.KeyPairAsyncClient; -import org.jclouds.openstack.nova.v1_1.features.SecurityGroupAsyncClient; import org.jclouds.openstack.nova.v1_1.features.ServerAsyncClient; import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.EndpointParam; diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java index 3f2dab31d3..cb9cdd07b0 100644 --- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java +++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java @@ -25,11 +25,11 @@ import org.jclouds.concurrent.Timeout; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Region; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; +import org.jclouds.openstack.nova.v1_1.extensions.FloatingIPClient; +import org.jclouds.openstack.nova.v1_1.extensions.KeyPairClient; +import org.jclouds.openstack.nova.v1_1.extensions.SecurityGroupClient; import org.jclouds.openstack.nova.v1_1.features.FlavorClient; -import org.jclouds.openstack.nova.v1_1.features.FloatingIPClient; import org.jclouds.openstack.nova.v1_1.features.ImageClient; -import org.jclouds.openstack.nova.v1_1.features.KeyPairClient; -import org.jclouds.openstack.nova.v1_1.features.SecurityGroupClient; import org.jclouds.openstack.nova.v1_1.features.ServerClient; import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.EndpointParam; diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaRestClientModule.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaRestClientModule.java index 3e9ea93bac..7f5cda266a 100644 --- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaRestClientModule.java +++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaRestClientModule.java @@ -28,16 +28,16 @@ import org.jclouds.http.annotation.ServerError; import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule; import org.jclouds.openstack.nova.v1_1.NovaAsyncClient; import org.jclouds.openstack.nova.v1_1.NovaClient; +import org.jclouds.openstack.nova.v1_1.extensions.FloatingIPAsyncClient; +import org.jclouds.openstack.nova.v1_1.extensions.FloatingIPClient; +import org.jclouds.openstack.nova.v1_1.extensions.KeyPairAsyncClient; +import org.jclouds.openstack.nova.v1_1.extensions.KeyPairClient; +import org.jclouds.openstack.nova.v1_1.extensions.SecurityGroupAsyncClient; +import org.jclouds.openstack.nova.v1_1.extensions.SecurityGroupClient; import org.jclouds.openstack.nova.v1_1.features.FlavorAsyncClient; import org.jclouds.openstack.nova.v1_1.features.FlavorClient; -import org.jclouds.openstack.nova.v1_1.features.FloatingIPAsyncClient; -import org.jclouds.openstack.nova.v1_1.features.FloatingIPClient; import org.jclouds.openstack.nova.v1_1.features.ImageAsyncClient; import org.jclouds.openstack.nova.v1_1.features.ImageClient; -import org.jclouds.openstack.nova.v1_1.features.KeyPairAsyncClient; -import org.jclouds.openstack.nova.v1_1.features.KeyPairClient; -import org.jclouds.openstack.nova.v1_1.features.SecurityGroupAsyncClient; -import org.jclouds.openstack.nova.v1_1.features.SecurityGroupClient; import org.jclouds.openstack.nova.v1_1.features.ServerAsyncClient; import org.jclouds.openstack.nova.v1_1.features.ServerClient; import org.jclouds.openstack.nova.v1_1.handlers.NovaErrorHandler; diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPAsyncClient.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClient.java similarity index 97% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPAsyncClient.java rename to labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClient.java index f70a68f12b..3fc4d16046 100644 --- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPAsyncClient.java +++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.openstack.nova.v1_1.features; +package org.jclouds.openstack.nova.v1_1.extensions; import java.util.Set; @@ -48,6 +48,7 @@ import com.google.common.util.concurrent.ListenableFuture; * * @see FloatingIPClient * @author Jeremy Daggett + * @see */ @SkipEncoding({ '/', '=' }) @RequestFilters(AuthenticateRequest.class) diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPClient.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClient.java similarity index 97% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPClient.java rename to labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClient.java index 7c1e72681e..59934d94f3 100644 --- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPClient.java +++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.openstack.nova.v1_1.features; +package org.jclouds.openstack.nova.v1_1.extensions; import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/KeyPairAsyncClient.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairAsyncClient.java similarity index 96% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/KeyPairAsyncClient.java rename to labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairAsyncClient.java index 0827db62fa..4dd69cb597 100644 --- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/KeyPairAsyncClient.java +++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.openstack.nova.v1_1.features; +package org.jclouds.openstack.nova.v1_1.extensions; import java.util.Map; import java.util.Set; @@ -49,6 +49,7 @@ import com.google.common.util.concurrent.ListenableFuture; * * @see KeyPairClient * @author Jeremy Daggett + * @see */ @SkipEncoding({ '/', '=' }) @RequestFilters(AuthenticateRequest.class) diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/KeyPairClient.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClient.java similarity index 97% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/KeyPairClient.java rename to labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClient.java index 7c4cc70094..075272b3a8 100644 --- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/KeyPairClient.java +++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.openstack.nova.v1_1.features; +package org.jclouds.openstack.nova.v1_1.extensions; import java.util.Map; import java.util.Set; diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/SecurityGroupAsyncClient.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupAsyncClient.java similarity index 97% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/SecurityGroupAsyncClient.java rename to labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupAsyncClient.java index 9ce69670cb..3eb027efc1 100644 --- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/SecurityGroupAsyncClient.java +++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.openstack.nova.v1_1.features; +package org.jclouds.openstack.nova.v1_1.extensions; import java.util.Set; @@ -50,6 +50,7 @@ import com.google.common.util.concurrent.ListenableFuture; * * @see SecurityGroupClient * @author Jeremy Daggett + * @see */ @SkipEncoding({ '/', '=' }) @RequestFilters(AuthenticateRequest.class) diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/SecurityGroupClient.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClient.java similarity index 97% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/SecurityGroupClient.java rename to labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClient.java index afe97e09f2..8b78950119 100644 --- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/SecurityGroupClient.java +++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.openstack.nova.v1_1.features; +package org.jclouds.openstack.nova.v1_1.extensions; import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorClient.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorClient.java index ffad009fb4..12780ce772 100644 --- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorClient.java +++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorClient.java @@ -35,7 +35,7 @@ import org.jclouds.openstack.nova.v1_1.domain.Flavor; * /> * @author Jeremy Daggett */ -@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS) +@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS) public interface FlavorClient { /** diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPClientExpectTest.java b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java similarity index 99% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPClientExpectTest.java rename to labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java index ba637b22f4..e373ed1295 100644 --- a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPClientExpectTest.java +++ b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.openstack.nova.v1_1.features; +package org.jclouds.openstack.nova.v1_1.extensions; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPClientLiveTest.java b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientLiveTest.java similarity index 95% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPClientLiveTest.java rename to labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientLiveTest.java index fbfdd941a1..da46fdff87 100644 --- a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FloatingIPClientLiveTest.java +++ b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.openstack.nova.v1_1.features; +package org.jclouds.openstack.nova.v1_1.extensions; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -30,6 +30,10 @@ import org.jclouds.openstack.nova.v1_1.domain.Address; import org.jclouds.openstack.nova.v1_1.domain.FloatingIP; import org.jclouds.openstack.nova.v1_1.domain.Server; import org.jclouds.openstack.nova.v1_1.domain.ServerStatus; +import org.jclouds.openstack.nova.v1_1.extensions.FloatingIPClient; +import org.jclouds.openstack.nova.v1_1.features.FlavorClient; +import org.jclouds.openstack.nova.v1_1.features.ImageClient; +import org.jclouds.openstack.nova.v1_1.features.ServerClient; import org.jclouds.openstack.nova.v1_1.internal.BaseNovaClientLiveTest; import org.testng.annotations.Test; diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/KeyPairClientExpectTest.java b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java similarity index 98% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/KeyPairClientExpectTest.java rename to labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java index 4cf4f04aff..12a2c50afb 100644 --- a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/KeyPairClientExpectTest.java +++ b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.openstack.nova.v1_1.features; +package org.jclouds.openstack.nova.v1_1.extensions; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/KeyPairClientLiveTest.java b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientLiveTest.java similarity index 96% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/KeyPairClientLiveTest.java rename to labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientLiveTest.java index 937acebc44..be1797c75c 100644 --- a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/KeyPairClientLiveTest.java +++ b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientLiveTest.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.openstack.nova.v1_1.features; +package org.jclouds.openstack.nova.v1_1.extensions; import org.jclouds.openstack.nova.v1_1.domain.KeyPair; +import org.jclouds.openstack.nova.v1_1.extensions.KeyPairClient; import org.jclouds.openstack.nova.v1_1.internal.BaseNovaClientLiveTest; import org.testng.annotations.Test;