diff --git a/README.txt b/README.txt index a547eb6471..aaeafe287a 100644 --- a/README.txt +++ b/README.txt @@ -30,7 +30,7 @@ our current version is 1.0-beta-9c our dev version is 1.0-SNAPSHOT our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), deltacloud, - cloudservers-uk, vcloud (generic), ec2 (generic), byon, + cloudservers-uk, vcloud (generic), ec2 (generic), byon, nova, trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic), cloudsigma-zrh, elasticstack(generic), bluelock-vclouddirector, slicehost, eucalyptus-partnercloud-ec2, elastichosts-lon-p (Peer 1), diff --git a/allcompute/pom.xml b/allcompute/pom.xml index 47cdbc898f..8f41d5f0a8 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -44,6 +44,11 @@ aws-ec2 ${project.version} + + org.jclouds.api + nova + ${project.version} + org.jclouds.api byon diff --git a/sandbox-apis/nova/pom.xml b/apis/nova/pom.xml similarity index 100% rename from sandbox-apis/nova/pom.xml rename to apis/nova/pom.xml diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/NovaContextBuilder.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaContextBuilder.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/NovaContextBuilder.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/NovaContextBuilder.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/ServerManagement.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/ServerManagement.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/ServerManagement.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/ServerManagement.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaBindComputeStrategiesByClass.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaBindComputeStrategiesByClass.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaBindComputeStrategiesByClass.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaBindComputeStrategiesByClass.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaBindComputeSuppliersByClass.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaBindComputeSuppliersByClass.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaBindComputeSuppliersByClass.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaBindComputeSuppliersByClass.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceContextModule.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceContextModule.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceContextModule.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceContextModule.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceDependenciesModule.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceDependenciesModule.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceDependenciesModule.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceDependenciesModule.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardware.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardware.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardware.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardware.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/NovaImageToImage.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/NovaImageToImage.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/NovaImageToImage.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/NovaImageToImage.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/NovaImageToOperatingSystem.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/NovaImageToOperatingSystem.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/NovaImageToOperatingSystem.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/NovaImageToOperatingSystem.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/ServerToNodeMetadata.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/ServerToNodeMetadata.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/ServerToNodeMetadata.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/functions/ServerToNodeMetadata.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaCreateNodeWithGroupEncodedIntoName.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaCreateNodeWithGroupEncodedIntoName.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaCreateNodeWithGroupEncodedIntoName.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaCreateNodeWithGroupEncodedIntoName.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaDestroyNodeStrategy.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaDestroyNodeStrategy.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaDestroyNodeStrategy.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaDestroyNodeStrategy.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaGetNodeMetadataStrategy.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaGetNodeMetadataStrategy.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaGetNodeMetadataStrategy.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaGetNodeMetadataStrategy.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaLifeCycleStrategy.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaLifeCycleStrategy.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaLifeCycleStrategy.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaLifeCycleStrategy.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaListNodesStrategy.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaListNodesStrategy.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaListNodesStrategy.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/strategy/NovaListNodesStrategy.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/suppliers/NovaHardwareSupplier.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/suppliers/NovaHardwareSupplier.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/suppliers/NovaHardwareSupplier.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/suppliers/NovaHardwareSupplier.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/suppliers/NovaImageSupplier.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/compute/suppliers/NovaImageSupplier.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/compute/suppliers/NovaImageSupplier.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/compute/suppliers/NovaImageSupplier.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/config/NovaRestClientModule.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/config/NovaRestClientModule.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/config/NovaRestClientModule.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/config/NovaRestClientModule.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/AbsoluteLimit.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/AbsoluteLimit.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/AbsoluteLimit.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/AbsoluteLimit.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Action.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Action.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Action.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Action.java diff --git a/sandbox-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 similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Addresses.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Addresses.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Addresses.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Addresses.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Flavor.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Flavor.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Flavor.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Flavor.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Image.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Image.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Image.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Image.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/ImageStatus.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/ImageStatus.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/ImageStatus.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/ImageStatus.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Limits.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Limits.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Limits.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Limits.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RateLimit.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RateLimit.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RateLimit.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RateLimit.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RateLimitUnit.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RateLimitUnit.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RateLimitUnit.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RateLimitUnit.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RebootType.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RebootType.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RebootType.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RebootType.java diff --git a/sandbox-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 similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Resource.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Resource.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Server.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Server.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Server.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Server.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/ServerStatus.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/ServerStatus.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/domain/ServerStatus.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/domain/ServerStatus.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/handlers/ParseNovaErrorFromHttpResponse.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/handlers/ParseNovaErrorFromHttpResponse.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/handlers/ParseNovaErrorFromHttpResponse.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/handlers/ParseNovaErrorFromHttpResponse.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/options/CreateServerOptions.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/options/CreateServerOptions.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/options/CreateServerOptions.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/options/CreateServerOptions.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/options/ListOptions.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/options/ListOptions.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/options/ListOptions.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/options/ListOptions.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/options/RebuildServerOptions.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/options/RebuildServerOptions.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/options/RebuildServerOptions.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/options/RebuildServerOptions.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/predicates/ServerActive.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/predicates/ServerActive.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/predicates/ServerActive.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/predicates/ServerActive.java diff --git a/sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/predicates/ServerDeleted.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/predicates/ServerDeleted.java similarity index 100% rename from sandbox-apis/nova/src/main/java/org/jclouds/openstack/nova/predicates/ServerDeleted.java rename to apis/nova/src/main/java/org/jclouds/openstack/nova/predicates/ServerDeleted.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceContextModuleTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceContextModuleTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceContextModuleTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/compute/config/NovaComputeServiceContextModuleTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/NovaImageToImageTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/NovaImageToImageTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/NovaImageToImageTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/NovaImageToImageTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/ServerToNodeMetadataTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/ServerToNodeMetadataTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/ServerToNodeMetadataTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/ServerToNodeMetadataTest.java diff --git a/sandbox-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 similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerStatusTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerStatusTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseAddressesFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseAddressesFromJsonResponseTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseAddressesFromJsonResponseTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseAddressesFromJsonResponseTest.java diff --git a/sandbox-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 similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFaultFromJsonResponseTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFaultFromJsonResponseTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageFromJsonResponseTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageFromJsonResponseTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageFromJsonResponseTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageListFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageListFromJsonResponseTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageListFromJsonResponseTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageListFromJsonResponseTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseInetAddressListFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseInetAddressListFromJsonResponseTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseInetAddressListFromJsonResponseTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseInetAddressListFromJsonResponseTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseServerFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseServerFromJsonResponseTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseServerFromJsonResponseTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseServerFromJsonResponseTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseServerListFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseServerListFromJsonResponseTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseServerListFromJsonResponseTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseServerListFromJsonResponseTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/PropertyHelper.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/PropertyHelper.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/PropertyHelper.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/live/PropertyHelper.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ComputeBase.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ComputeBase.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ComputeBase.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ComputeBase.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ComputeServiceCheck.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ComputeServiceCheck.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ComputeServiceCheck.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ComputeServiceCheck.java diff --git a/sandbox-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 similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/NovaComputeServiceLiveTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/NovaComputeServiceLiveTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ServiceActionsLiveTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ServiceActionsLiveTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ServiceActionsLiveTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/live/compute/ServiceActionsLiveTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ClientBase.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ClientBase.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ClientBase.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ClientBase.java diff --git a/sandbox-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 similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/DeleteServersInVariousStatesLiveTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/DeleteServersInVariousStatesLiveTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/NovaClientLiveTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/NovaClientLiveTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/NovaClientLiveTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/NovaClientLiveTest.java diff --git a/sandbox-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 similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ServerCreateLiveTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/live/novaclient/ServerCreateLiveTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/options/CreateServerOptionsTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/options/CreateServerOptionsTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/options/CreateServerOptionsTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/options/CreateServerOptionsTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/options/ListOptionsTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/options/ListOptionsTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/options/ListOptionsTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/options/ListOptionsTest.java diff --git a/sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/options/RebuildServerOptionsTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/options/RebuildServerOptionsTest.java similarity index 100% rename from sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/options/RebuildServerOptionsTest.java rename to apis/nova/src/test/java/org/jclouds/openstack/nova/options/RebuildServerOptionsTest.java diff --git a/sandbox-apis/nova/src/test/resources/.gitignore b/apis/nova/src/test/resources/.gitignore similarity index 100% rename from sandbox-apis/nova/src/test/resources/.gitignore rename to apis/nova/src/test/resources/.gitignore diff --git a/sandbox-apis/nova/src/test/resources/keys/rhelimg.pem b/apis/nova/src/test/resources/keys/rhelimg.pem similarity index 100% rename from sandbox-apis/nova/src/test/resources/keys/rhelimg.pem rename to apis/nova/src/test/resources/keys/rhelimg.pem diff --git a/sandbox-apis/nova/src/test/resources/keys/rhelimpg.pub b/apis/nova/src/test/resources/keys/rhelimpg.pub similarity index 100% rename from sandbox-apis/nova/src/test/resources/keys/rhelimpg.pub rename to apis/nova/src/test/resources/keys/rhelimpg.pub diff --git a/sandbox-apis/nova/src/test/resources/logback.xml b/apis/nova/src/test/resources/logback.xml similarity index 100% rename from sandbox-apis/nova/src/test/resources/logback.xml rename to apis/nova/src/test/resources/logback.xml diff --git a/sandbox-apis/nova/src/test/resources/test.properties.template b/apis/nova/src/test/resources/test.properties.template similarity index 100% rename from sandbox-apis/nova/src/test/resources/test.properties.template rename to apis/nova/src/test/resources/test.properties.template diff --git a/sandbox-apis/nova/src/test/resources/test_fault_response413.json b/apis/nova/src/test/resources/test_fault_response413.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_fault_response413.json rename to apis/nova/src/test/resources/test_fault_response413.json diff --git a/sandbox-apis/nova/src/test/resources/test_get_flavor_details.json b/apis/nova/src/test/resources/test_get_flavor_details.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_get_flavor_details.json rename to apis/nova/src/test/resources/test_get_flavor_details.json diff --git a/sandbox-apis/nova/src/test/resources/test_get_image_details.json b/apis/nova/src/test/resources/test_get_image_details.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_get_image_details.json rename to apis/nova/src/test/resources/test_get_image_details.json diff --git a/sandbox-apis/nova/src/test/resources/test_get_server_detail.json b/apis/nova/src/test/resources/test_get_server_detail.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_get_server_detail.json rename to apis/nova/src/test/resources/test_get_server_detail.json diff --git a/sandbox-apis/nova/src/test/resources/test_list_addresses.json b/apis/nova/src/test/resources/test_list_addresses.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_list_addresses.json rename to apis/nova/src/test/resources/test_list_addresses.json diff --git a/sandbox-apis/nova/src/test/resources/test_list_addresses_private.json b/apis/nova/src/test/resources/test_list_addresses_private.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_list_addresses_private.json rename to apis/nova/src/test/resources/test_list_addresses_private.json diff --git a/sandbox-apis/nova/src/test/resources/test_list_addresses_public.json b/apis/nova/src/test/resources/test_list_addresses_public.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_list_addresses_public.json rename to apis/nova/src/test/resources/test_list_addresses_public.json diff --git a/sandbox-apis/nova/src/test/resources/test_list_flavors.json b/apis/nova/src/test/resources/test_list_flavors.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_list_flavors.json rename to apis/nova/src/test/resources/test_list_flavors.json diff --git a/sandbox-apis/nova/src/test/resources/test_list_flavors_detail.json b/apis/nova/src/test/resources/test_list_flavors_detail.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_list_flavors_detail.json rename to apis/nova/src/test/resources/test_list_flavors_detail.json diff --git a/sandbox-apis/nova/src/test/resources/test_list_images.json b/apis/nova/src/test/resources/test_list_images.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_list_images.json rename to apis/nova/src/test/resources/test_list_images.json diff --git a/sandbox-apis/nova/src/test/resources/test_list_images_detail.json b/apis/nova/src/test/resources/test_list_images_detail.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_list_images_detail.json rename to apis/nova/src/test/resources/test_list_images_detail.json diff --git a/sandbox-apis/nova/src/test/resources/test_list_servers.json b/apis/nova/src/test/resources/test_list_servers.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_list_servers.json rename to apis/nova/src/test/resources/test_list_servers.json diff --git a/sandbox-apis/nova/src/test/resources/test_list_servers_detail.json b/apis/nova/src/test/resources/test_list_servers_detail.json similarity index 100% rename from sandbox-apis/nova/src/test/resources/test_list_servers_detail.json rename to apis/nova/src/test/resources/test_list_servers_detail.json diff --git a/apis/pom.xml b/apis/pom.xml index 1c913b32bb..d69cc78bac 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -48,5 +48,6 @@ vcloudexpress elasticstack atmos + nova diff --git a/compute/src/main/clojure/org/jclouds/compute.clj b/compute/src/main/clojure/org/jclouds/compute.clj index baa65f6bae..0ce39bf26a 100644 --- a/compute/src/main/clojure/org/jclouds/compute.clj +++ b/compute/src/main/clojure/org/jclouds/compute.clj @@ -21,7 +21,7 @@ "A clojure binding to the jclouds ComputeService. Current supported providers are: - [aws-ec2, eucualyptus-partnercloud-ec2, elastichosts-lon-b, + [aws-ec2, eucualyptus-partnercloud-ec2, elastichosts-lon-b, nova, cloudservers-uk, cloudservers-us, byon, cloudsigma-zrh, stub, trmk-ecloud, trmk-vcloudexpress, vcloud, bluelock, eucalyptus, slicehost, elastichosts-lon-p, elastichosts-sat-p, elastichosts,