From c6aabb1a3137d64f896d6404285bc04874e8511c Mon Sep 17 00:00:00 2001 From: Everett Toews Date: Tue, 13 Nov 2012 13:32:27 -0600 Subject: [PATCH] Moved openstack-cinder and rackspace-cloudblockstorage-us/uk out of labs. Updated pom.xml files for the move. --- all/pom.xml | 15 +++++++++++++++ {labs => apis}/openstack-cinder/pom.xml | 9 +++++++-- .../jclouds/openstack/cinder/v1/CinderApi.java | 0 .../openstack/cinder/v1/CinderApiMetadata.java | 0 .../openstack/cinder/v1/CinderAsyncApi.java | 0 .../cinder/v1/config/CinderParserModule.java | 0 .../cinder/v1/config/CinderRestClientModule.java | 0 .../openstack/cinder/v1/domain/Snapshot.java | 0 .../openstack/cinder/v1/domain/Volume.java | 0 .../cinder/v1/domain/VolumeAttachment.java | 0 .../openstack/cinder/v1/domain/VolumeType.java | 0 .../openstack/cinder/v1/features/SnapshotApi.java | 0 .../cinder/v1/features/SnapshotAsyncApi.java | 0 .../openstack/cinder/v1/features/VolumeApi.java | 0 .../cinder/v1/features/VolumeAsyncApi.java | 0 .../cinder/v1/features/VolumeTypeApi.java | 0 .../cinder/v1/features/VolumeTypeAsyncApi.java | 0 .../cinder/v1/handlers/CinderErrorHandler.java | 0 .../cinder/v1/options/CreateSnapshotOptions.java | 0 .../cinder/v1/options/CreateVolumeOptions.java | 0 .../cinder/v1/predicates/SnapshotPredicates.java | 0 .../cinder/v1/predicates/VolumePredicates.java | 0 .../services/org.jclouds.apis.ApiMetadata | 0 .../cinder/v1/features/SnapshotApiExpectTest.java | 0 .../v1/features/VolumeAndSnapshotApiLiveTest.java | 0 .../cinder/v1/features/VolumeApiExpectTest.java | 0 .../v1/features/VolumeTypeApiExpectTest.java | 0 .../cinder/v1/features/VolumeTypeApiLiveTest.java | 0 .../v1/internal/BaseCinderApiExpectTest.java | 0 .../cinder/v1/internal/BaseCinderApiLiveTest.java | 0 .../cinder/v1/internal/BaseCinderExpectTest.java | 0 .../src/test/resources/snapshot_create.json | 0 .../test/resources/snapshot_create_response.json | 0 .../src/test/resources/snapshot_get.json | 0 .../src/test/resources/snapshot_list_details.json | 0 .../src/test/resources/snapshot_list_simple.json | 0 .../src/test/resources/volume_create.json | 0 .../test/resources/volume_create_response.json | 0 .../src/test/resources/volume_get.json | 0 .../src/test/resources/volume_list_details.json | 0 .../src/test/resources/volume_list_simple.json | 0 .../src/test/resources/volume_type_get.json | 0 .../test/resources/volume_type_list_simple.json | 0 apis/pom.xml | 1 + labs/pom.xml | 3 --- providers/pom.xml | 2 ++ .../rackspace-cloudblockstorage-uk/pom.xml | 12 +++++++++--- .../uk/CloudBlockStorageUKProviderMetadata.java | 0 .../org.jclouds.providers.ProviderMetadata | 0 ...dBlockStorageUKProviderMetadataExpectTest.java | 0 .../uk/CloudBlockStorageUKProviderTest.java | 0 ...lockStorageUKVolumeAndSnapshotApiLiveTest.java | 0 .../CloudBlockStorageUKVolumeTypeApiLiveTest.java | 0 .../src/test/resources/access_rax_uk.json | 0 .../rackspace-cloudblockstorage-us/pom.xml | 12 +++++++++--- .../us/CloudBlockStorageUSProviderMetadata.java | 0 .../org.jclouds.providers.ProviderMetadata | 0 ...dBlockStorageUSProviderMetadataExpectTest.java | 0 .../us/CloudBlockStorageUSProviderTest.java | 0 ...lockStorageUSVolumeAndSnapshotApiLiveTest.java | 0 .../CloudBlockStorageUSVolumeTypeApiLiveTest.java | 0 .../src/test/resources/access_rax_us.json | 0 62 files changed, 43 insertions(+), 11 deletions(-) rename {labs => apis}/openstack-cinder/pom.xml (95%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderAsyncApi.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderParserModule.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderRestClientModule.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotAsyncApi.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeAsyncApi.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeAsyncApi.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/handlers/CinderErrorHandler.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/SnapshotPredicates.java (100%) rename {labs => apis}/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/VolumePredicates.java (100%) rename {labs => apis}/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata (100%) rename {labs => apis}/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/SnapshotApiExpectTest.java (100%) rename {labs => apis}/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java (100%) rename {labs => apis}/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeApiExpectTest.java (100%) rename {labs => apis}/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiExpectTest.java (100%) rename {labs => apis}/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiLiveTest.java (100%) rename {labs => apis}/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiExpectTest.java (100%) rename {labs => apis}/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiLiveTest.java (100%) rename {labs => apis}/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderExpectTest.java (100%) rename {labs => apis}/openstack-cinder/src/test/resources/snapshot_create.json (100%) rename {labs => apis}/openstack-cinder/src/test/resources/snapshot_create_response.json (100%) rename {labs => apis}/openstack-cinder/src/test/resources/snapshot_get.json (100%) rename {labs => apis}/openstack-cinder/src/test/resources/snapshot_list_details.json (100%) rename {labs => apis}/openstack-cinder/src/test/resources/snapshot_list_simple.json (100%) rename {labs => apis}/openstack-cinder/src/test/resources/volume_create.json (100%) rename {labs => apis}/openstack-cinder/src/test/resources/volume_create_response.json (100%) rename {labs => apis}/openstack-cinder/src/test/resources/volume_get.json (100%) rename {labs => apis}/openstack-cinder/src/test/resources/volume_list_details.json (100%) rename {labs => apis}/openstack-cinder/src/test/resources/volume_list_simple.json (100%) rename {labs => apis}/openstack-cinder/src/test/resources/volume_type_get.json (100%) rename {labs => apis}/openstack-cinder/src/test/resources/volume_type_list_simple.json (100%) rename {labs => providers}/rackspace-cloudblockstorage-uk/pom.xml (95%) rename {labs => providers}/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java (100%) rename {labs => providers}/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata (100%) rename {labs => providers}/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadataExpectTest.java (100%) rename {labs => providers}/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderTest.java (100%) rename {labs => providers}/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeAndSnapshotApiLiveTest.java (100%) rename {labs => providers}/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeTypeApiLiveTest.java (100%) rename {labs => providers}/rackspace-cloudblockstorage-uk/src/test/resources/access_rax_uk.json (100%) rename {labs => providers}/rackspace-cloudblockstorage-us/pom.xml (95%) rename {labs => providers}/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java (100%) rename {labs => providers}/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata (100%) rename {labs => providers}/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java (100%) rename {labs => providers}/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderTest.java (100%) rename {labs => providers}/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeAndSnapshotApiLiveTest.java (100%) rename {labs => providers}/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeTypeApiLiveTest.java (100%) rename {labs => providers}/rackspace-cloudblockstorage-us/src/test/resources/access_rax_us.json (100%) diff --git a/all/pom.xml b/all/pom.xml index 3e97bbd5ea..a770dde4b3 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -35,11 +35,26 @@ rackspace-cloudidentity ${project.version} + + org.jclouds.api + openstack-cinder + ${project.version} + org.jclouds.provider aws-cloudwatch ${project.version} + + org.jclouds.provider + rackspace-cloudblockstorage-us + ${project.version} + + + org.jclouds.provider + rackspace-cloudblockstorage-uk + ${project.version} + org.jclouds.provider aws-sqs diff --git a/labs/openstack-cinder/pom.xml b/apis/openstack-cinder/pom.xml similarity index 95% rename from labs/openstack-cinder/pom.xml rename to apis/openstack-cinder/pom.xml index a37cf406dd..5d0f3e5843 100644 --- a/labs/openstack-cinder/pom.xml +++ b/apis/openstack-cinder/pom.xml @@ -27,7 +27,7 @@ 1.6.0-SNAPSHOT ../../project/pom.xml - org.jclouds.labs + org.jclouds.api openstack-cinder jclouds openstack-cinder api jclouds components to access an implementation of OpenStack Cinder @@ -76,10 +76,15 @@ test-jar test + + org.jclouds.driver + jclouds-slf4j + ${project.version} + test + ch.qos.logback logback-classic - 1.0.0 test diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderAsyncApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderAsyncApi.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderAsyncApi.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderAsyncApi.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderParserModule.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderParserModule.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderParserModule.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderParserModule.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderRestClientModule.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderRestClientModule.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderRestClientModule.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderRestClientModule.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotAsyncApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotAsyncApi.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotAsyncApi.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotAsyncApi.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeAsyncApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeAsyncApi.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeAsyncApi.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeAsyncApi.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeAsyncApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeAsyncApi.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeAsyncApi.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeAsyncApi.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/handlers/CinderErrorHandler.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/handlers/CinderErrorHandler.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/handlers/CinderErrorHandler.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/handlers/CinderErrorHandler.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/SnapshotPredicates.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/SnapshotPredicates.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/SnapshotPredicates.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/SnapshotPredicates.java diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/VolumePredicates.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/VolumePredicates.java similarity index 100% rename from labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/VolumePredicates.java rename to apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/VolumePredicates.java diff --git a/labs/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata similarity index 100% rename from labs/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata rename to apis/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata diff --git a/labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/SnapshotApiExpectTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/SnapshotApiExpectTest.java similarity index 100% rename from labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/SnapshotApiExpectTest.java rename to apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/SnapshotApiExpectTest.java diff --git a/labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java similarity index 100% rename from labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java rename to apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java diff --git a/labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeApiExpectTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeApiExpectTest.java similarity index 100% rename from labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeApiExpectTest.java rename to apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeApiExpectTest.java diff --git a/labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiExpectTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiExpectTest.java similarity index 100% rename from labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiExpectTest.java rename to apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiExpectTest.java diff --git a/labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiLiveTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiLiveTest.java similarity index 100% rename from labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiLiveTest.java rename to apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiLiveTest.java diff --git a/labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiExpectTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiExpectTest.java similarity index 100% rename from labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiExpectTest.java rename to apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiExpectTest.java diff --git a/labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiLiveTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiLiveTest.java similarity index 100% rename from labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiLiveTest.java rename to apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiLiveTest.java diff --git a/labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderExpectTest.java b/apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderExpectTest.java similarity index 100% rename from labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderExpectTest.java rename to apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderExpectTest.java diff --git a/labs/openstack-cinder/src/test/resources/snapshot_create.json b/apis/openstack-cinder/src/test/resources/snapshot_create.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/snapshot_create.json rename to apis/openstack-cinder/src/test/resources/snapshot_create.json diff --git a/labs/openstack-cinder/src/test/resources/snapshot_create_response.json b/apis/openstack-cinder/src/test/resources/snapshot_create_response.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/snapshot_create_response.json rename to apis/openstack-cinder/src/test/resources/snapshot_create_response.json diff --git a/labs/openstack-cinder/src/test/resources/snapshot_get.json b/apis/openstack-cinder/src/test/resources/snapshot_get.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/snapshot_get.json rename to apis/openstack-cinder/src/test/resources/snapshot_get.json diff --git a/labs/openstack-cinder/src/test/resources/snapshot_list_details.json b/apis/openstack-cinder/src/test/resources/snapshot_list_details.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/snapshot_list_details.json rename to apis/openstack-cinder/src/test/resources/snapshot_list_details.json diff --git a/labs/openstack-cinder/src/test/resources/snapshot_list_simple.json b/apis/openstack-cinder/src/test/resources/snapshot_list_simple.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/snapshot_list_simple.json rename to apis/openstack-cinder/src/test/resources/snapshot_list_simple.json diff --git a/labs/openstack-cinder/src/test/resources/volume_create.json b/apis/openstack-cinder/src/test/resources/volume_create.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/volume_create.json rename to apis/openstack-cinder/src/test/resources/volume_create.json diff --git a/labs/openstack-cinder/src/test/resources/volume_create_response.json b/apis/openstack-cinder/src/test/resources/volume_create_response.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/volume_create_response.json rename to apis/openstack-cinder/src/test/resources/volume_create_response.json diff --git a/labs/openstack-cinder/src/test/resources/volume_get.json b/apis/openstack-cinder/src/test/resources/volume_get.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/volume_get.json rename to apis/openstack-cinder/src/test/resources/volume_get.json diff --git a/labs/openstack-cinder/src/test/resources/volume_list_details.json b/apis/openstack-cinder/src/test/resources/volume_list_details.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/volume_list_details.json rename to apis/openstack-cinder/src/test/resources/volume_list_details.json diff --git a/labs/openstack-cinder/src/test/resources/volume_list_simple.json b/apis/openstack-cinder/src/test/resources/volume_list_simple.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/volume_list_simple.json rename to apis/openstack-cinder/src/test/resources/volume_list_simple.json diff --git a/labs/openstack-cinder/src/test/resources/volume_type_get.json b/apis/openstack-cinder/src/test/resources/volume_type_get.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/volume_type_get.json rename to apis/openstack-cinder/src/test/resources/volume_type_get.json diff --git a/labs/openstack-cinder/src/test/resources/volume_type_list_simple.json b/apis/openstack-cinder/src/test/resources/volume_type_list_simple.json similarity index 100% rename from labs/openstack-cinder/src/test/resources/volume_type_list_simple.json rename to apis/openstack-cinder/src/test/resources/volume_type_list_simple.json diff --git a/apis/pom.xml b/apis/pom.xml index e3a08751eb..2aba558e40 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -48,6 +48,7 @@ atmos nova openstack-keystone + openstack-cinder openstack-nova openstack-nova-ec2 cloudwatch diff --git a/labs/pom.xml b/labs/pom.xml index d5759bace4..54d5ef2f2e 100644 --- a/labs/pom.xml +++ b/labs/pom.xml @@ -62,8 +62,5 @@ oauth openstack-quantum openstack-glance - openstack-cinder - rackspace-cloudblockstorage-us - rackspace-cloudblockstorage-uk diff --git a/providers/pom.xml b/providers/pom.xml index 62db71723b..ed05013162 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -73,6 +73,8 @@ trystack-nova rackspace-cloudservers-us rackspace-cloudservers-uk + rackspace-cloudblockstorage-us + rackspace-cloudblockstorage-uk aws-sqs glesys diff --git a/labs/rackspace-cloudblockstorage-uk/pom.xml b/providers/rackspace-cloudblockstorage-uk/pom.xml similarity index 95% rename from labs/rackspace-cloudblockstorage-uk/pom.xml rename to providers/rackspace-cloudblockstorage-uk/pom.xml index fb372acf82..6120159457 100644 --- a/labs/rackspace-cloudblockstorage-uk/pom.xml +++ b/providers/rackspace-cloudblockstorage-uk/pom.xml @@ -27,7 +27,7 @@ 1.6.0-SNAPSHOT ../../project/pom.xml - org.jclouds.labs + org.jclouds.provider rackspace-cloudblockstorage-uk jclouds Rackspace Next Generation Cloud Block Storage UK provider OpenStack Cinder implementation targeted to Rackspace Next Generation Cloud Block Storage UK @@ -56,7 +56,7 @@ ${project.version} - org.jclouds.labs + org.jclouds.api openstack-cinder ${project.version} @@ -78,7 +78,7 @@ test - org.jclouds.labs + org.jclouds.api openstack-cinder ${project.version} test-jar @@ -98,6 +98,12 @@ test-jar test + + org.jclouds.driver + jclouds-slf4j + ${project.version} + test + ch.qos.logback logback-classic diff --git a/labs/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java b/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java similarity index 100% rename from labs/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java rename to providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java diff --git a/labs/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata similarity index 100% rename from labs/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata rename to providers/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata diff --git a/labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadataExpectTest.java b/providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadataExpectTest.java similarity index 100% rename from labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadataExpectTest.java rename to providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadataExpectTest.java diff --git a/labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderTest.java b/providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderTest.java similarity index 100% rename from labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderTest.java rename to providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderTest.java diff --git a/labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeAndSnapshotApiLiveTest.java b/providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeAndSnapshotApiLiveTest.java similarity index 100% rename from labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeAndSnapshotApiLiveTest.java rename to providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeAndSnapshotApiLiveTest.java diff --git a/labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeTypeApiLiveTest.java b/providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeTypeApiLiveTest.java similarity index 100% rename from labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeTypeApiLiveTest.java rename to providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeTypeApiLiveTest.java diff --git a/labs/rackspace-cloudblockstorage-uk/src/test/resources/access_rax_uk.json b/providers/rackspace-cloudblockstorage-uk/src/test/resources/access_rax_uk.json similarity index 100% rename from labs/rackspace-cloudblockstorage-uk/src/test/resources/access_rax_uk.json rename to providers/rackspace-cloudblockstorage-uk/src/test/resources/access_rax_uk.json diff --git a/labs/rackspace-cloudblockstorage-us/pom.xml b/providers/rackspace-cloudblockstorage-us/pom.xml similarity index 95% rename from labs/rackspace-cloudblockstorage-us/pom.xml rename to providers/rackspace-cloudblockstorage-us/pom.xml index 511346b565..07e0d7f6cc 100644 --- a/labs/rackspace-cloudblockstorage-us/pom.xml +++ b/providers/rackspace-cloudblockstorage-us/pom.xml @@ -27,7 +27,7 @@ 1.6.0-SNAPSHOT ../../project/pom.xml - org.jclouds.labs + org.jclouds.provider rackspace-cloudblockstorage-us jclouds Rackspace Next Generation Cloud Block Storage US provider OpenStack Cinder implementation targeted to Rackspace Next Generation Cloud Block Storage US @@ -56,7 +56,7 @@ ${project.version} - org.jclouds.labs + org.jclouds.api openstack-cinder ${project.version} @@ -78,7 +78,7 @@ test - org.jclouds.labs + org.jclouds.api openstack-cinder ${project.version} test-jar @@ -98,6 +98,12 @@ test-jar test + + org.jclouds.driver + jclouds-slf4j + ${project.version} + test + ch.qos.logback logback-classic diff --git a/labs/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java similarity index 100% rename from labs/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java rename to providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java diff --git a/labs/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata similarity index 100% rename from labs/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata rename to providers/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata diff --git a/labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java b/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java similarity index 100% rename from labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java rename to providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java diff --git a/labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderTest.java b/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderTest.java similarity index 100% rename from labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderTest.java rename to providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderTest.java diff --git a/labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeAndSnapshotApiLiveTest.java b/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeAndSnapshotApiLiveTest.java similarity index 100% rename from labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeAndSnapshotApiLiveTest.java rename to providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeAndSnapshotApiLiveTest.java diff --git a/labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeTypeApiLiveTest.java b/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeTypeApiLiveTest.java similarity index 100% rename from labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeTypeApiLiveTest.java rename to providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeTypeApiLiveTest.java diff --git a/labs/rackspace-cloudblockstorage-us/src/test/resources/access_rax_us.json b/providers/rackspace-cloudblockstorage-us/src/test/resources/access_rax_us.json similarity index 100% rename from labs/rackspace-cloudblockstorage-us/src/test/resources/access_rax_us.json rename to providers/rackspace-cloudblockstorage-us/src/test/resources/access_rax_us.json