diff --git a/README.txt b/README.txt index 20b8a9e591..f3a1cf5037 100644 --- a/README.txt +++ b/README.txt @@ -28,7 +28,7 @@ our dev version is 1.0-SNAPSHOT our compute api supports: ec2, gogrid, rackspace, rimuhosting, vcloud, trmk-ecloud, trmk-vcloudexpress, eucalyptus, bluelock-vclouddirector, - bluelock-vcloudexpress, ibmdev, slicehost + bluelock-vcloudexpress, slicehost * note * the pom dependency org.jclouds/jclouds-allcompute gives you access to to all of these providers diff --git a/allcompute/pom.xml b/allcompute/pom.xml index 760cb00133..000e927a1f 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -64,11 +64,6 @@ jclouds-gogrid ${project.version} - - ${project.groupId} - jclouds-ibmdev - ${project.version} - ${project.groupId} jclouds-slicehost diff --git a/compute/src/main/clojure/org/jclouds/compute.clj b/compute/src/main/clojure/org/jclouds/compute.clj index bfc99fb758..14065000f2 100644 --- a/compute/src/main/clojure/org/jclouds/compute.clj +++ b/compute/src/main/clojure/org/jclouds/compute.clj @@ -22,7 +22,7 @@ Current supported services are: [ec2, rimuhosting, cloudservers, trmk-ecloud, trmk-vcloudexpress, vcloud, bluelock, - ibmdev, eucalyptus, slicehost] + eucalyptus, slicehost] Here's an example of getting some compute configuration from rackspace: diff --git a/pom.xml b/pom.xml index 45f67aba87..d321f80014 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,6 @@ gogrid chef opscodeplatform - ibmdev boxdotnet slicehost allcompute diff --git a/ibmdev/pom.xml b/sandbox/ibmdev/pom.xml similarity index 100% rename from ibmdev/pom.xml rename to sandbox/ibmdev/pom.xml diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClient.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClient.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClient.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClient.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudContextBuilder.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudContextBuilder.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudContextBuilder.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudContextBuilder.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModule.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModule.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModule.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModule.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/domain/IBMImage.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/domain/IBMImage.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/domain/IBMImage.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/domain/IBMImage.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/domain/IBMSize.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/domain/IBMSize.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/domain/IBMSize.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/domain/IBMSize.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/options/IBMDeveloperCloudTemplateOptions.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/options/IBMDeveloperCloudTemplateOptions.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/options/IBMDeveloperCloudTemplateOptions.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/options/IBMDeveloperCloudTemplateOptions.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/CreateKeyPairEncodeTagIntoNameRunNodesAndAddToSet.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/CreateKeyPairEncodeTagIntoNameRunNodesAndAddToSet.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/CreateKeyPairEncodeTagIntoNameRunNodesAndAddToSet.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/CreateKeyPairEncodeTagIntoNameRunNodesAndAddToSet.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudAddNodeWithTagStrategy.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudAddNodeWithTagStrategy.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudAddNodeWithTagStrategy.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudAddNodeWithTagStrategy.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudDestroyNodeStrategy.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudDestroyNodeStrategy.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudDestroyNodeStrategy.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudDestroyNodeStrategy.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudGetNodeMetadataStrategy.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudGetNodeMetadataStrategy.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudGetNodeMetadataStrategy.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudGetNodeMetadataStrategy.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudListNodesStrategy.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudListNodesStrategy.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudListNodesStrategy.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudListNodesStrategy.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudRebootNodeStrategy.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudRebootNodeStrategy.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudRebootNodeStrategy.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudRebootNodeStrategy.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudImageSupplier.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudImageSupplier.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudImageSupplier.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudImageSupplier.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudLocationSupplier.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudLocationSupplier.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudLocationSupplier.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudLocationSupplier.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudSizeSupplier.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudSizeSupplier.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudSizeSupplier.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudSizeSupplier.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudParserModule.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudParserModule.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudParserModule.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudParserModule.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudRestClientModule.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudRestClientModule.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudRestClientModule.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudRestClientModule.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Address.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Address.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/domain/Address.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Address.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Location.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Location.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/domain/Location.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Location.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Volume.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Volume.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/domain/Volume.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Volume.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressFromJson.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressFromJson.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressFromJson.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressFromJson.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressesFromJson.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressesFromJson.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressesFromJson.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressesFromJson.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJson.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJson.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJson.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJson.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImageFromJson.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImageFromJson.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImageFromJson.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImageFromJson.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImagesFromJson.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImagesFromJson.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImagesFromJson.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImagesFromJson.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstanceFromJson.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstanceFromJson.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstanceFromJson.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstanceFromJson.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstancesFromJson.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstancesFromJson.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstancesFromJson.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstancesFromJson.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseKeysFromJson.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseKeysFromJson.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseKeysFromJson.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseKeysFromJson.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseLongFromDate.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseLongFromDate.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseLongFromDate.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseLongFromDate.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumeFromJson.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumeFromJson.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumeFromJson.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumeFromJson.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumesFromJson.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumesFromJson.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumesFromJson.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumesFromJson.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/options/CreateInstanceOptions.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/options/CreateInstanceOptions.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/options/CreateInstanceOptions.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/options/CreateInstanceOptions.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/options/RestartInstanceOptions.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/options/RestartInstanceOptions.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/options/RestartInstanceOptions.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/options/RestartInstanceOptions.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/AddressFree.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/AddressFree.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/predicates/AddressFree.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/AddressFree.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActive.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActive.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActive.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActive.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/VolumeUnmounted.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/VolumeUnmounted.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/predicates/VolumeUnmounted.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/VolumeUnmounted.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/reference/IBMDeveloperCloudConstants.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/reference/IBMDeveloperCloudConstants.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/reference/IBMDeveloperCloudConstants.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/reference/IBMDeveloperCloudConstants.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationHandler.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationHandler.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationHandler.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationHandler.java diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationsHandler.java b/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationsHandler.java similarity index 100% rename from ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationsHandler.java rename to sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationsHandler.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/ProvidersInPropertiesTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/ProvidersInPropertiesTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/ProvidersInPropertiesTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/ProvidersInPropertiesTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModuleTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModuleTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModuleTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModuleTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressesFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressesFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressesFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressesFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstanceFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstanceFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstanceFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstanceFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeyFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeyFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeyFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeyFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeysFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeysFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeysFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeysFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumeFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumeFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumeFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumeFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumesFromJsonTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumesFromJsonTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumesFromJsonTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumesFromJsonTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationHandlerTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationHandlerTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationHandlerTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationHandlerTest.java diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationsHandlerTest.java b/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationsHandlerTest.java similarity index 100% rename from ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationsHandlerTest.java rename to sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationsHandlerTest.java diff --git a/ibmdev/src/test/resources/address.json b/sandbox/ibmdev/src/test/resources/address.json similarity index 100% rename from ibmdev/src/test/resources/address.json rename to sandbox/ibmdev/src/test/resources/address.json diff --git a/ibmdev/src/test/resources/addresses.json b/sandbox/ibmdev/src/test/resources/addresses.json similarity index 100% rename from ibmdev/src/test/resources/addresses.json rename to sandbox/ibmdev/src/test/resources/addresses.json diff --git a/ibmdev/src/test/resources/image.json b/sandbox/ibmdev/src/test/resources/image.json similarity index 100% rename from ibmdev/src/test/resources/image.json rename to sandbox/ibmdev/src/test/resources/image.json diff --git a/ibmdev/src/test/resources/images.json b/sandbox/ibmdev/src/test/resources/images.json similarity index 100% rename from ibmdev/src/test/resources/images.json rename to sandbox/ibmdev/src/test/resources/images.json diff --git a/ibmdev/src/test/resources/instance.json b/sandbox/ibmdev/src/test/resources/instance.json similarity index 100% rename from ibmdev/src/test/resources/instance.json rename to sandbox/ibmdev/src/test/resources/instance.json diff --git a/ibmdev/src/test/resources/instances.json b/sandbox/ibmdev/src/test/resources/instances.json similarity index 100% rename from ibmdev/src/test/resources/instances.json rename to sandbox/ibmdev/src/test/resources/instances.json diff --git a/ibmdev/src/test/resources/key.json b/sandbox/ibmdev/src/test/resources/key.json similarity index 100% rename from ibmdev/src/test/resources/key.json rename to sandbox/ibmdev/src/test/resources/key.json diff --git a/ibmdev/src/test/resources/keys.json b/sandbox/ibmdev/src/test/resources/keys.json similarity index 100% rename from ibmdev/src/test/resources/keys.json rename to sandbox/ibmdev/src/test/resources/keys.json diff --git a/ibmdev/src/test/resources/location.xml b/sandbox/ibmdev/src/test/resources/location.xml similarity index 100% rename from ibmdev/src/test/resources/location.xml rename to sandbox/ibmdev/src/test/resources/location.xml diff --git a/ibmdev/src/test/resources/log4j.xml b/sandbox/ibmdev/src/test/resources/log4j.xml similarity index 100% rename from ibmdev/src/test/resources/log4j.xml rename to sandbox/ibmdev/src/test/resources/log4j.xml diff --git a/ibmdev/src/test/resources/storage-offerings.json b/sandbox/ibmdev/src/test/resources/storage-offerings.json similarity index 100% rename from ibmdev/src/test/resources/storage-offerings.json rename to sandbox/ibmdev/src/test/resources/storage-offerings.json diff --git a/ibmdev/src/test/resources/volume.json b/sandbox/ibmdev/src/test/resources/volume.json similarity index 100% rename from ibmdev/src/test/resources/volume.json rename to sandbox/ibmdev/src/test/resources/volume.json diff --git a/ibmdev/src/test/resources/volumes.json b/sandbox/ibmdev/src/test/resources/volumes.json similarity index 100% rename from ibmdev/src/test/resources/volumes.json rename to sandbox/ibmdev/src/test/resources/volumes.json