Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #990 from rackspace/mv-cinder-and-cbs-out-of-labs 

Moved openstack-cinder and rackspace-cloudblockstorage-us/uk out of labs.
This commit is contained in:
Adrian Cole 2012-11-13 17:46:08 -08:00
parent 59db77b7b1 c6aabb1a31
commit f4edcff226
62 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
all/pom.xml
View File

@ -35,11 +35,26 @@
<artifactId>rackspace-cloudidentity</artifactId> <artifactId>rackspace-cloudidentity</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jclouds.api</groupId>
<artifactId>openstack-cinder</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.jclouds.provider</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>aws-cloudwatch</artifactId> <artifactId>aws-cloudwatch</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jclouds.provider</groupId>
<artifactId>rackspace-cloudblockstorage-us</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jclouds.provider</groupId>
<artifactId>rackspace-cloudblockstorage-uk</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.jclouds.provider</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>aws-sqs</artifactId> <artifactId>aws-sqs</artifactId>

9
labs/openstack-cinder/pom.xml → apis/openstack-cinder/pom.xml
View File

@ -27,7 +27,7 @@
<version>1.6.0-SNAPSHOT</version> <version>1.6.0-SNAPSHOT</version>
<relativePath>../../project/pom.xml</relativePath> <relativePath>../../project/pom.xml</relativePath>
</parent> </parent>
<groupId>org.jclouds.labs</groupId> <groupId>org.jclouds.api</groupId>
<artifactId>openstack-cinder</artifactId> <artifactId>openstack-cinder</artifactId>
<name>jclouds openstack-cinder api</name> <name>jclouds openstack-cinder api</name>
<description>jclouds components to access an implementation of OpenStack Cinder</description> <description>jclouds components to access an implementation of OpenStack Cinder</description>
@ -76,10 +76,15 @@
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-slf4j</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>1.0.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderAsyncApi.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderAsyncApi.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderParserModule.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderParserModule.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderRestClientModule.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/config/CinderRestClientModule.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotAsyncApi.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotAsyncApi.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeAsyncApi.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeAsyncApi.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeAsyncApi.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeAsyncApi.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/handlers/CinderErrorHandler.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/handlers/CinderErrorHandler.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/SnapshotPredicates.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/SnapshotPredicates.java
View File

0
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/VolumePredicates.java → apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/predicates/VolumePredicates.java
View File

0
labs/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata → apis/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

0
labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/SnapshotApiExpectTest.java → apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/SnapshotApiExpectTest.java
View File

0
labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java → apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeAndSnapshotApiLiveTest.java
View File

0
labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeApiExpectTest.java → apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeApiExpectTest.java
View File

0
labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiExpectTest.java → apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiExpectTest.java
View File

0
labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiLiveTest.java → apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApiLiveTest.java
View File

0
labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiExpectTest.java → apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiExpectTest.java
View File

0
labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiLiveTest.java → apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderApiLiveTest.java
View File

0
labs/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderExpectTest.java → apis/openstack-cinder/src/test/java/org/jclouds/openstack/cinder/v1/internal/BaseCinderExpectTest.java
View File

0
labs/openstack-cinder/src/test/resources/snapshot_create.json → apis/openstack-cinder/src/test/resources/snapshot_create.json
View File

0
labs/openstack-cinder/src/test/resources/snapshot_create_response.json → apis/openstack-cinder/src/test/resources/snapshot_create_response.json
View File

0
labs/openstack-cinder/src/test/resources/snapshot_get.json → apis/openstack-cinder/src/test/resources/snapshot_get.json
View File

0
labs/openstack-cinder/src/test/resources/snapshot_list_details.json → apis/openstack-cinder/src/test/resources/snapshot_list_details.json
View File

0
labs/openstack-cinder/src/test/resources/snapshot_list_simple.json → apis/openstack-cinder/src/test/resources/snapshot_list_simple.json
View File

0
labs/openstack-cinder/src/test/resources/volume_create.json → apis/openstack-cinder/src/test/resources/volume_create.json
View File

0
labs/openstack-cinder/src/test/resources/volume_create_response.json → apis/openstack-cinder/src/test/resources/volume_create_response.json
View File

0
labs/openstack-cinder/src/test/resources/volume_get.json → apis/openstack-cinder/src/test/resources/volume_get.json
View File

0
labs/openstack-cinder/src/test/resources/volume_list_details.json → apis/openstack-cinder/src/test/resources/volume_list_details.json
View File

0
labs/openstack-cinder/src/test/resources/volume_list_simple.json → apis/openstack-cinder/src/test/resources/volume_list_simple.json
View File

0
labs/openstack-cinder/src/test/resources/volume_type_get.json → apis/openstack-cinder/src/test/resources/volume_type_get.json
View File

0
labs/openstack-cinder/src/test/resources/volume_type_list_simple.json → apis/openstack-cinder/src/test/resources/volume_type_list_simple.json
View File

1
apis/pom.xml
View File

@ -48,6 +48,7 @@
<module>atmos</module> <module>atmos</module>
<module>nova</module> <module>nova</module>
<module>openstack-keystone</module> <module>openstack-keystone</module>
<module>openstack-cinder</module>
<module>openstack-nova</module> <module>openstack-nova</module>
<module>openstack-nova-ec2</module> <module>openstack-nova-ec2</module>
<module>cloudwatch</module> <module>cloudwatch</module>

3
labs/pom.xml
View File

@ -62,8 +62,5 @@
<module>oauth</module> <module>oauth</module>
<module>openstack-quantum</module> <module>openstack-quantum</module>
<module>openstack-glance</module> <module>openstack-glance</module>
<module>openstack-cinder</module>
<module>rackspace-cloudblockstorage-us</module>
<module>rackspace-cloudblockstorage-uk</module>
</modules> </modules>
</project> </project>

2
providers/pom.xml
View File

@ -73,6 +73,8 @@
<module>trystack-nova</module> <module>trystack-nova</module>
<module>rackspace-cloudservers-us</module> <module>rackspace-cloudservers-us</module>
<module>rackspace-cloudservers-uk</module> <module>rackspace-cloudservers-uk</module>
<module>rackspace-cloudblockstorage-us</module>
<module>rackspace-cloudblockstorage-uk</module>
<module>aws-sqs</module> <module>aws-sqs</module>
<module>glesys</module> <module>glesys</module>
</modules> </modules>

12
labs/rackspace-cloudblockstorage-uk/pom.xml → providers/rackspace-cloudblockstorage-uk/pom.xml
View File

@ -27,7 +27,7 @@
<version>1.6.0-SNAPSHOT</version> <version>1.6.0-SNAPSHOT</version>
<relativePath>../../project/pom.xml</relativePath> <relativePath>../../project/pom.xml</relativePath>
</parent> </parent>
<groupId>org.jclouds.labs</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>rackspace-cloudblockstorage-uk</artifactId> <artifactId>rackspace-cloudblockstorage-uk</artifactId>
<name>jclouds Rackspace Next Generation Cloud Block Storage UK provider</name> <name>jclouds Rackspace Next Generation Cloud Block Storage UK provider</name>
<description>OpenStack Cinder implementation targeted to Rackspace Next Generation Cloud Block Storage UK</description> <description>OpenStack Cinder implementation targeted to Rackspace Next Generation Cloud Block Storage UK</description>
@ -56,7 +56,7 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jclouds.labs</groupId> <groupId>org.jclouds.api</groupId>
<artifactId>openstack-cinder</artifactId> <artifactId>openstack-cinder</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
@ -78,7 +78,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jclouds.labs</groupId> <groupId>org.jclouds.api</groupId>
<artifactId>openstack-cinder</artifactId> <artifactId>openstack-cinder</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
@ -98,6 +98,12 @@
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-slf4j</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>

0
labs/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java → providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java
View File

0
labs/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata → providers/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
View File

0
labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadataExpectTest.java → providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadataExpectTest.java
View File

0
labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderTest.java → providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderTest.java
View File

0
labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeAndSnapshotApiLiveTest.java → providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeAndSnapshotApiLiveTest.java
View File

0
labs/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeTypeApiLiveTest.java → providers/rackspace-cloudblockstorage-uk/src/test/java/org/jclouds/rackspace/cloudblockstorage/uk/features/CloudBlockStorageUKVolumeTypeApiLiveTest.java
View File

0
labs/rackspace-cloudblockstorage-uk/src/test/resources/access_rax_uk.json → providers/rackspace-cloudblockstorage-uk/src/test/resources/access_rax_uk.json
View File

12
labs/rackspace-cloudblockstorage-us/pom.xml → providers/rackspace-cloudblockstorage-us/pom.xml
View File

@ -27,7 +27,7 @@
<version>1.6.0-SNAPSHOT</version> <version>1.6.0-SNAPSHOT</version>
<relativePath>../../project/pom.xml</relativePath> <relativePath>../../project/pom.xml</relativePath>
</parent> </parent>
<groupId>org.jclouds.labs</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>rackspace-cloudblockstorage-us</artifactId> <artifactId>rackspace-cloudblockstorage-us</artifactId>
<name>jclouds Rackspace Next Generation Cloud Block Storage US provider</name> <name>jclouds Rackspace Next Generation Cloud Block Storage US provider</name>
<description>OpenStack Cinder implementation targeted to Rackspace Next Generation Cloud Block Storage US</description> <description>OpenStack Cinder implementation targeted to Rackspace Next Generation Cloud Block Storage US</description>
@ -56,7 +56,7 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jclouds.labs</groupId> <groupId>org.jclouds.api</groupId>
<artifactId>openstack-cinder</artifactId> <artifactId>openstack-cinder</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
@ -78,7 +78,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jclouds.labs</groupId> <groupId>org.jclouds.api</groupId>
<artifactId>openstack-cinder</artifactId> <artifactId>openstack-cinder</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
@ -98,6 +98,12 @@
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-slf4j</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>

0
labs/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java → providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java
View File

0
labs/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata → providers/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
View File

0
labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java → providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java
View File

0
labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderTest.java → providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderTest.java
View File

0
labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeAndSnapshotApiLiveTest.java → providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeAndSnapshotApiLiveTest.java
View File

0
labs/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeTypeApiLiveTest.java → providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/features/CloudBlockStorageUSVolumeTypeApiLiveTest.java
View File

0
labs/rackspace-cloudblockstorage-us/src/test/resources/access_rax_us.json → providers/rackspace-cloudblockstorage-us/src/test/resources/access_rax_us.json
View File