diff --git a/README.txt b/README.txt index a146e4f169..5eae26689a 100644 --- a/README.txt +++ b/README.txt @@ -10,7 +10,7 @@ data. our current version is 1.0-beta-9b our dev version is 1.0-SNAPSHOT -our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), +our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), deltacloud, cloudservers-uk, vcloud (generic), ec2 (generic), byon, trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic), cloudsigma-zrh, elasticstack(generic), bluelock-vclouddirector, diff --git a/allcompute/pom.xml b/allcompute/pom.xml index 9e145f8790..06be1cbc40 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -34,6 +34,11 @@ eucalyptus-partnercloud-ec2 ${project.version} + + org.jclouds.api + deltacloud + ${project.version} + org.jclouds.provider aws-ec2 diff --git a/sandbox-apis/deltacloud/README.txt b/apis/deltacloud/README.txt similarity index 100% rename from sandbox-apis/deltacloud/README.txt rename to apis/deltacloud/README.txt diff --git a/sandbox-apis/deltacloud/pom.xml b/apis/deltacloud/pom.xml similarity index 100% rename from sandbox-apis/deltacloud/pom.xml rename to apis/deltacloud/pom.xml diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/config/DeltacloudComputeServiceContextModule.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/config/DeltacloudComputeServiceContextModule.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/config/DeltacloudComputeServiceContextModule.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/config/DeltacloudComputeServiceContextModule.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/DeltacloudImageToImage.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/DeltacloudImageToImage.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/DeltacloudImageToImage.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/DeltacloudImageToImage.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/DeltacloudImageToOperatingSystem.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/DeltacloudImageToOperatingSystem.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/DeltacloudImageToOperatingSystem.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/DeltacloudImageToOperatingSystem.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/HardwareProfileToHardware.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/HardwareProfileToHardware.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/HardwareProfileToHardware.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/HardwareProfileToHardware.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/InstanceToNodeMetadata.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/InstanceToNodeMetadata.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/InstanceToNodeMetadata.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/InstanceToNodeMetadata.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/RealmToLocation.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/RealmToLocation.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/RealmToLocation.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/RealmToLocation.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/strategy/DeltacloudComputeServiceAdapter.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/strategy/DeltacloudComputeServiceAdapter.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/strategy/DeltacloudComputeServiceAdapter.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/strategy/DeltacloudComputeServiceAdapter.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/KeyAuthentication.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/KeyAuthentication.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/KeyAuthentication.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/KeyAuthentication.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/PasswordAuthentication.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/PasswordAuthentication.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/PasswordAuthentication.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/PasswordAuthentication.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceFinished.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceFinished.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceFinished.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceFinished.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceRunning.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceRunning.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceRunning.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceRunning.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceState.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceState.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceState.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/predicates/InstanceState.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java diff --git a/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java similarity index 100% rename from sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java rename to apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudComputeServiceLiveTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudComputeServiceLiveTest.java similarity index 99% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudComputeServiceLiveTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudComputeServiceLiveTest.java index 822318cb6e..f6c4b4b2dd 100644 --- a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudComputeServiceLiveTest.java +++ b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudComputeServiceLiveTest.java @@ -59,7 +59,7 @@ public class DeltacloudComputeServiceLiveTest extends BaseComputeServiceLiveTest protected void checkNodes(Iterable nodes, String tag) throws IOException { super.checkNodes(nodes, tag); for (NodeMetadata node : nodes) { - assertEquals(node.getLocation().getScope(), LocationScope.HOST); + assertEquals(node.getLocation().getScope(), LocationScope.ZONE); } } diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudTemplateBuilderLiveTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudTemplateBuilderLiveTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudTemplateBuilderLiveTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudTemplateBuilderLiveTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java similarity index 100% rename from sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java rename to apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java diff --git a/sandbox-apis/deltacloud/src/test/resources/links.xml b/apis/deltacloud/src/test/resources/links.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/links.xml rename to apis/deltacloud/src/test/resources/links.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/log4j.xml b/apis/deltacloud/src/test/resources/log4j.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/log4j.xml rename to apis/deltacloud/src/test/resources/log4j.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_get_hardware_profile.xml b/apis/deltacloud/src/test/resources/test_get_hardware_profile.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_get_hardware_profile.xml rename to apis/deltacloud/src/test/resources/test_get_hardware_profile.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_get_image.xml b/apis/deltacloud/src/test/resources/test_get_image.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_get_image.xml rename to apis/deltacloud/src/test/resources/test_get_image.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_get_instance.xml b/apis/deltacloud/src/test/resources/test_get_instance.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_get_instance.xml rename to apis/deltacloud/src/test/resources/test_get_instance.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_get_instance_key.xml b/apis/deltacloud/src/test/resources/test_get_instance_key.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_get_instance_key.xml rename to apis/deltacloud/src/test/resources/test_get_instance_key.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_get_instance_nokey.xml b/apis/deltacloud/src/test/resources/test_get_instance_nokey.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_get_instance_nokey.xml rename to apis/deltacloud/src/test/resources/test_get_instance_nokey.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_get_instance_pw.xml b/apis/deltacloud/src/test/resources/test_get_instance_pw.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_get_instance_pw.xml rename to apis/deltacloud/src/test/resources/test_get_instance_pw.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_get_realm.xml b/apis/deltacloud/src/test/resources/test_get_realm.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_get_realm.xml rename to apis/deltacloud/src/test/resources/test_get_realm.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_get_states.xml b/apis/deltacloud/src/test/resources/test_get_states.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_get_states.xml rename to apis/deltacloud/src/test/resources/test_get_states.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_list_hardware_profiles.xml b/apis/deltacloud/src/test/resources/test_list_hardware_profiles.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_list_hardware_profiles.xml rename to apis/deltacloud/src/test/resources/test_list_hardware_profiles.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_list_images.xml b/apis/deltacloud/src/test/resources/test_list_images.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_list_images.xml rename to apis/deltacloud/src/test/resources/test_list_images.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_list_instances.xml b/apis/deltacloud/src/test/resources/test_list_instances.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_list_instances.xml rename to apis/deltacloud/src/test/resources/test_list_instances.xml diff --git a/sandbox-apis/deltacloud/src/test/resources/test_list_realms.xml b/apis/deltacloud/src/test/resources/test_list_realms.xml similarity index 100% rename from sandbox-apis/deltacloud/src/test/resources/test_list_realms.xml rename to apis/deltacloud/src/test/resources/test_list_realms.xml diff --git a/apis/pom.xml b/apis/pom.xml index 3bc72e0129..1c913b32bb 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -37,6 +37,7 @@ byon s3 ec2 + deltacloud walrus scality-rs2 eucalyptus diff --git a/compute/src/main/clojure/org/jclouds/compute.clj b/compute/src/main/clojure/org/jclouds/compute.clj index ae357d167c..a972889405 100644 --- a/compute/src/main/clojure/org/jclouds/compute.clj +++ b/compute/src/main/clojure/org/jclouds/compute.clj @@ -25,7 +25,7 @@ Current supported providers are: cloudservers-uk, cloudservers-us, byon, cloudsigma-zrh, stub, trmk-ecloud, trmk-vcloudexpress, vcloud, bluelock, eucalyptus, slicehost, elastichosts-lon-p, elastichosts-sat-p, elastichosts, - openhosting-east1, serverlove-z1-man, skalicloud-sdg-my] + openhosting-east1, serverlove-z1-man, skalicloud-sdg-my, deltacloud] Here's an example of getting some compute configuration from rackspace: diff --git a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java index 4eb69cb03f..12c79988b1 100755 --- a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java @@ -35,8 +35,8 @@ import static org.jclouds.compute.options.TemplateOptions.Builder.blockOnComplet import static org.jclouds.compute.options.TemplateOptions.Builder.overrideCredentialsWith; import static org.jclouds.compute.predicates.NodePredicates.TERMINATED; import static org.jclouds.compute.predicates.NodePredicates.all; -import static org.jclouds.compute.predicates.NodePredicates.runningInGroup; import static org.jclouds.compute.predicates.NodePredicates.inGroup; +import static org.jclouds.compute.predicates.NodePredicates.runningInGroup; import static org.jclouds.compute.util.ComputeServiceUtils.getCores; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -64,7 +64,6 @@ import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeState; import org.jclouds.compute.domain.OperatingSystem; -import org.jclouds.compute.domain.OperatingSystemBuilder; import org.jclouds.compute.domain.OsFamily; import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.TemplateBuilder; @@ -207,7 +206,7 @@ public abstract class BaseComputeServiceLiveTest { @Test(enabled = true, expectedExceptions = NoSuchElementException.class) public void testCorrectExceptionRunningNodesNotFound() throws Exception { - client.runScriptOnNodesMatching(runningInGroup("zebras-are-awesome"), buildScript(new OperatingSystemBuilder() + client.runScriptOnNodesMatching(runningInGroup("zebras-are-awesome"), buildScript(new OperatingSystem.Builder() .family(OsFamily.UBUNTU).description("ffoo").build())); } diff --git a/compute/src/test/java/org/jclouds/compute/RunScriptData.java b/compute/src/test/java/org/jclouds/compute/RunScriptData.java index 6d7595a54c..177621d3b6 100644 --- a/compute/src/test/java/org/jclouds/compute/RunScriptData.java +++ b/compute/src/test/java/org/jclouds/compute/RunScriptData.java @@ -76,9 +76,9 @@ public class RunScriptData { envVariables, ImmutableList. of(new AuthorizeRSAPublicKey(publicKey),// installJavaAndCurl(os),// - authorizePortInIpTables(8080),// + authorizePortInIpTables(8080), extractTargzIntoDirectory(URI.create(System.getProperty("test.jboss-url", - "http://d19xvfg065k8li.cloudfront.net/jboss-6.0.0.Final.tar.gz")), "/usr/local"),// + "http://d37gkgjhl3prlk.cloudfront.net/jboss-6.0.0.Final.tar.gz")), "/usr/local"),// exec("{md} " + jbossHome), exec("mv /usr/local/jboss-*/* " + jbossHome),// exec("chmod -R oug+r+w " + jbossHome)),// ImmutableList diff --git a/compute/src/test/resources/initscript_with_jboss.sh b/compute/src/test/resources/initscript_with_jboss.sh index 9c1b7f3242..42eea52f62 100644 --- a/compute/src/test/resources/initscript_with_jboss.sh +++ b/compute/src/test/resources/initscript_with_jboss.sh @@ -72,7 +72,7 @@ END_OF_FILE iptables -I INPUT 1 -p tcp --dport 8080 -j ACCEPT iptables -I RH-Firewall-1-INPUT 1 -p tcp --dport 8080 -j ACCEPT iptables-save - curl -X GET -s --retry 20 http://d19xvfg065k8li.cloudfront.net/jboss-6.0.0.Final.tar.gz |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) + curl -X GET -s --retry 20 http://d37gkgjhl3prlk.cloudfront.net/jboss-6.0.0.Final.tar.gz |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) mkdir -p /usr/local/jboss mv /usr/local/jboss-*/* /usr/local/jboss chmod -R oug+r+w /usr/local/jboss