mirror of https://github.com/apache/jclouds.git
Merge pull request #1388 from hpcloud/feature/openstack-labs
1385 - Restructure openstack projects in labs
This commit is contained in:
Adrian Cole
commit
f88d20b722
|
|
@ -25,11 +25,11 @@
|
|||
<groupId>org.jclouds</groupId>
|
||||
<artifactId>jclouds-project</artifactId>
|
||||
<version>1.6.0-SNAPSHOT</version>
|
||||
<relativePath>../../project/pom.xml</relativePath>
|
||||
<relativePath>../../../project/pom.xml</relativePath>
|
||||
</parent>
|
||||
<groupId>org.jclouds.labs</groupId>
|
||||
<artifactId>openstack-glance</artifactId>
|
||||
<name>jcloud openstack-glance api</name>
|
||||
<name>jclouds openstack-glance api</name>
|
||||
<description>jclouds components to access an implementation of OpenStack Glance</description>
|
||||
<packaging>bundle</packaging>
|
||||
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>live</id>
|
||||
|
|
@ -1,24 +1,24 @@
|
|||
{
|
||||
"images": [{
|
||||
"name": "debian",
|
||||
"container_format": "bare",
|
||||
"disk_format": "raw",
|
||||
"checksum": "233afa7b8809d840679b5f0d36d7350a",
|
||||
"id": "f0209a30-25b8-4d9a-8e2f-dbc028e20b2b",
|
||||
"size": 65645798
|
||||
}, {
|
||||
"name": "debian",
|
||||
"container_format": "bare",
|
||||
"disk_format": "raw",
|
||||
"checksum": "233afa7b8809d840679b5f0d36d7350a",
|
||||
"id": "fcc451d0-f6e4-4824-ad8f-70ec12326d07",
|
||||
"size": 65645798
|
||||
}, {
|
||||
"name": "debian",
|
||||
"container_format": "bare",
|
||||
"disk_format": "raw",
|
||||
"checksum": "233afa7b8809d840679b5f0d36d7350a",
|
||||
"id": "f9fcb127-071d-4670-883e-eedb7efac183",
|
||||
"size": 65645798
|
||||
}]
|
||||
{
|
||||
"images": [{
|
||||
"name": "debian",
|
||||
"container_format": "bare",
|
||||
"disk_format": "raw",
|
||||
"checksum": "233afa7b8809d840679b5f0d36d7350a",
|
||||
"id": "f0209a30-25b8-4d9a-8e2f-dbc028e20b2b",
|
||||
"size": 65645798
|
||||
}, {
|
||||
"name": "debian",
|
||||
"container_format": "bare",
|
||||
"disk_format": "raw",
|
||||
"checksum": "233afa7b8809d840679b5f0d36d7350a",
|
||||
"id": "fcc451d0-f6e4-4824-ad8f-70ec12326d07",
|
||||
"size": 65645798
|
||||
}, {
|
||||
"name": "debian",
|
||||
"container_format": "bare",
|
||||
"disk_format": "raw",
|
||||
"checksum": "233afa7b8809d840679b5f0d36d7350a",
|
||||
"id": "f9fcb127-071d-4670-883e-eedb7efac183",
|
||||
"size": 65645798
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,39 +1,39 @@
|
|||
{
|
||||
"images": [{
|
||||
"status": "active",
|
||||
"name": "debian",
|
||||
"deleted": false,
|
||||
"container_format": "bare",
|
||||
"created_at": "2012-05-18T18:06:44",
|
||||
"disk_format": "raw",
|
||||
"updated_at": "2012-05-18T18:06:45",
|
||||
"properties": {},
|
||||
"min_disk": 0,
|
||||
"protected": false,
|
||||
"id": "fcc451d0-f6e4-4824-ad8f-70ec12326d07",
|
||||
"checksum": "233afa7b8809d840679b5f0d36d7350a",
|
||||
"owner": "5821675",
|
||||
"is_public": true,
|
||||
"deleted_at": null,
|
||||
"min_ram": 0,
|
||||
"size": 65645798
|
||||
}, {
|
||||
"status": "active",
|
||||
"name": "debian",
|
||||
"deleted": false,
|
||||
"container_format": "bare",
|
||||
"created_at": "2012-05-11T15:04:47",
|
||||
"disk_format": "raw",
|
||||
"updated_at": "2012-05-11T15:04:48",
|
||||
"properties": {},
|
||||
"min_disk": 0,
|
||||
"protected": false,
|
||||
"id": "f9fcb127-071d-4670-883e-eedb7efac183",
|
||||
"checksum": "233afa7b8809d840679b5f0d36d7350a",
|
||||
"owner": "5821675",
|
||||
"is_public": true,
|
||||
"deleted_at": null,
|
||||
"min_ram": 0,
|
||||
"size": 65645798
|
||||
}]
|
||||
{
|
||||
"images": [{
|
||||
"status": "active",
|
||||
"name": "debian",
|
||||
"deleted": false,
|
||||
"container_format": "bare",
|
||||
"created_at": "2012-05-18T18:06:44",
|
||||
"disk_format": "raw",
|
||||
"updated_at": "2012-05-18T18:06:45",
|
||||
"properties": {},
|
||||
"min_disk": 0,
|
||||
"protected": false,
|
||||
"id": "fcc451d0-f6e4-4824-ad8f-70ec12326d07",
|
||||
"checksum": "233afa7b8809d840679b5f0d36d7350a",
|
||||
"owner": "5821675",
|
||||
"is_public": true,
|
||||
"deleted_at": null,
|
||||
"min_ram": 0,
|
||||
"size": 65645798
|
||||
}, {
|
||||
"status": "active",
|
||||
"name": "debian",
|
||||
"deleted": false,
|
||||
"container_format": "bare",
|
||||
"created_at": "2012-05-11T15:04:47",
|
||||
"disk_format": "raw",
|
||||
"updated_at": "2012-05-11T15:04:48",
|
||||
"properties": {},
|
||||
"min_disk": 0,
|
||||
"protected": false,
|
||||
"id": "f9fcb127-071d-4670-883e-eedb7efac183",
|
||||
"checksum": "233afa7b8809d840679b5f0d36d7350a",
|
||||
"owner": "5821675",
|
||||
"is_public": true,
|
||||
"deleted_at": null,
|
||||
"min_ram": 0,
|
||||
"size": 65645798
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,51 +1,51 @@
|
|||
<?xml version="1.0"?>
|
||||
<configuration scan="false">
|
||||
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds-wire.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds-blobstore.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root>
|
||||
<level value="warn" />
|
||||
</root>
|
||||
|
||||
<logger name="org.jclouds">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="FILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.wire">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="WIREFILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.headers">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="WIREFILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.blobstore">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="BLOBSTOREFILE" />
|
||||
</logger>
|
||||
|
||||
</configuration>
|
||||
<?xml version="1.0"?>
|
||||
<configuration scan="false">
|
||||
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds-wire.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds-blobstore.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root>
|
||||
<level value="warn" />
|
||||
</root>
|
||||
|
||||
<logger name="org.jclouds">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="FILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.wire">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="WIREFILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.headers">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="WIREFILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.blobstore">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="BLOBSTOREFILE" />
|
||||
</logger>
|
||||
|
||||
</configuration>
|
||||
|
|
@ -25,11 +25,11 @@
|
|||
<groupId>org.jclouds</groupId>
|
||||
<artifactId>jclouds-project</artifactId>
|
||||
<version>1.6.0-SNAPSHOT</version>
|
||||
<relativePath>../../project/pom.xml</relativePath>
|
||||
<relativePath>../../../project/pom.xml</relativePath>
|
||||
</parent>
|
||||
<groupId>org.jclouds.labs</groupId>
|
||||
<artifactId>openstack-quantum</artifactId>
|
||||
<name>jcloud openstack-quantum api</name>
|
||||
<name>jclouds openstack-quantum api</name>
|
||||
<description>jclouds components to access an implementation of OpenStack Quantum</description>
|
||||
<packaging>bundle</packaging>
|
||||
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>live</id>
|
||||
|
|
@ -1,51 +1,51 @@
|
|||
<?xml version="1.0"?>
|
||||
<configuration scan="false">
|
||||
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds-wire.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds-blobstore.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root>
|
||||
<level value="warn" />
|
||||
</root>
|
||||
|
||||
<logger name="org.jclouds">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="FILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.wire">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="WIREFILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.headers">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="WIREFILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.blobstore">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="BLOBSTOREFILE" />
|
||||
</logger>
|
||||
|
||||
</configuration>
|
||||
<?xml version="1.0"?>
|
||||
<configuration scan="false">
|
||||
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds-wire.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
|
||||
<file>target/test-data/jclouds-blobstore.log</file>
|
||||
|
||||
<encoder>
|
||||
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root>
|
||||
<level value="warn" />
|
||||
</root>
|
||||
|
||||
<logger name="org.jclouds">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="FILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.wire">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="WIREFILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.headers">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="WIREFILE" />
|
||||
</logger>
|
||||
|
||||
<logger name="jclouds.blobstore">
|
||||
<level value="DEBUG" />
|
||||
<appender-ref ref="BLOBSTOREFILE" />
|
||||
</logger>
|
||||
|
||||
</configuration>
|
||||
|
|
@ -25,11 +25,11 @@
|
|||
<groupId>org.jclouds</groupId>
|
||||
<artifactId>jclouds-project</artifactId>
|
||||
<version>1.6.0-SNAPSHOT</version>
|
||||
<relativePath>../../project/pom.xml</relativePath>
|
||||
<relativePath>../../../project/pom.xml</relativePath>
|
||||
</parent>
|
||||
<groupId>org.jclouds.labs</groupId>
|
||||
<artifactId>openstack-swift</artifactId>
|
||||
<name>jcloud openstack-swift api</name>
|
||||
<name>jclouds openstack-swift api</name>
|
||||
<description>jclouds components to access an implementation of OpenStack Swift</description>
|
||||
<packaging>bundle</packaging>
|
||||
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>live</id>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue