From 1882128ec97a8d19cc9b12ba661d1d614418d04c Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sun, 2 Jan 2011 11:45:07 +0100 Subject: [PATCH] added slicehost into the providers group --- allcompute/pom.xml | 4 ++-- pom.xml | 1 - providers/pom.xml | 1 + {slicehost => providers/slicehost}/pom.xml | 21 ++++++++++--------- .../slicehost/SlicehostAsyncClient.java | 0 .../jclouds/slicehost/SlicehostClient.java | 0 .../slicehost/SlicehostContextBuilder.java | 0 .../slicehost/SlicehostPropertiesBuilder.java | 0 .../binders/BindCreateBackupToXmlPayload.java | 0 .../binders/BindCreateSliceToXmlPayload.java | 0 ...SlicehostBindComputeStrategiesByClass.java | 0 .../SlicehostBindComputeSuppliersByClass.java | 0 .../SlicehostComputeServiceContextModule.java | 0 ...ehostComputeServiceDependenciesModule.java | 0 .../compute/functions/FlavorToHardware.java | 0 .../functions/SliceToNodeMetadata.java | 0 .../functions/SlicehostImageToImage.java | 0 .../SlicehostImageToOperatingSystem.java | 0 .../SlicehostAddNodeWithTagStrategy.java | 0 .../SlicehostDestroyNodeStrategy.java | 0 .../SlicehostGetNodeMetadataStrategy.java | 0 .../strategy/SlicehostLifeCycleStrategy.java | 0 .../strategy/SlicehostListNodesStrategy.java | 0 .../suppliers/SlicehostHardwareSupplier.java | 0 .../suppliers/SlicehostImageSupplier.java | 0 .../config/SlicehostRestClientModule.java | 0 .../org/jclouds/slicehost/domain/Backup.java | 0 .../org/jclouds/slicehost/domain/Flavor.java | 0 .../org/jclouds/slicehost/domain/Image.java | 0 .../org/jclouds/slicehost/domain/Slice.java | 0 .../slicehost/filters/SlicehostBasic.java | 0 .../ParseSlicehostErrorFromHttpResponse.java | 0 .../slicehost/predicates/SliceActive.java | 0 .../slicehost/predicates/SliceTerminated.java | 0 .../jclouds/slicehost/xml/BackupHandler.java | 0 .../jclouds/slicehost/xml/BackupsHandler.java | 0 .../jclouds/slicehost/xml/ErrorHandler.java | 0 .../jclouds/slicehost/xml/FlavorHandler.java | 0 .../jclouds/slicehost/xml/FlavorsHandler.java | 0 .../jclouds/slicehost/xml/ImageHandler.java | 0 .../jclouds/slicehost/xml/ImagesHandler.java | 0 .../jclouds/slicehost/xml/SliceHandler.java | 0 .../jclouds/slicehost/xml/SlicesHandler.java | 0 .../slicehost/ProvidersInPropertiesTest.java | 0 .../slicehost/SlicehostAsyncClientTest.java | 0 .../slicehost/SlicehostClientLiveTest.java | 0 .../SlicehostComputeServiceLiveTest.java | 0 .../SlicehostTemplateBuilderLiveTest.java | 0 ...cehostComputeServiceContextModuleTest.java | 0 .../functions/FlavorToHardwareTest.java | 0 .../functions/SliceToNodeMetadataTest.java | 0 .../functions/SlicehostImageToImageTest.java | 0 .../slicehost/xml/FlavorHandlerTest.java | 0 .../slicehost/xml/FlavorsHandlerTest.java | 0 .../slicehost/xml/ImageHandlerTest.java | 0 .../slicehost/xml/ImagesHandlerTest.java | 0 .../slicehost/xml/SliceHandlerTest.java | 0 .../slicehost/xml/SlicesHandlerTest.java | 0 .../slicehost}/src/test/resources/log4j.xml | 0 .../src/test/resources/test_errors.xml | 0 .../src/test/resources/test_get_flavor.xml | 0 .../src/test/resources/test_get_image.xml | 0 .../src/test/resources/test_get_image32.xml | 0 .../src/test/resources/test_get_slice.xml | 0 .../src/test/resources/test_list_flavors.xml | 0 .../src/test/resources/test_list_images.xml | 0 .../src/test/resources/test_list_slices.xml | 0 .../src/test/resources/test_new_slice.xml | 0 68 files changed, 14 insertions(+), 13 deletions(-) rename {slicehost => providers/slicehost}/pom.xml (90%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/SlicehostAsyncClient.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/SlicehostClient.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/SlicehostContextBuilder.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/SlicehostPropertiesBuilder.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/binders/BindCreateBackupToXmlPayload.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/binders/BindCreateSliceToXmlPayload.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeStrategiesByClass.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeSuppliersByClass.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceDependenciesModule.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/functions/FlavorToHardware.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadata.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImage.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostAddNodeWithTagStrategy.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostDestroyNodeStrategy.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostGetNodeMetadataStrategy.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostLifeCycleStrategy.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostListNodesStrategy.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostHardwareSupplier.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostImageSupplier.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/config/SlicehostRestClientModule.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/domain/Backup.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/domain/Flavor.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/domain/Image.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/domain/Slice.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/filters/SlicehostBasic.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/handlers/ParseSlicehostErrorFromHttpResponse.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/predicates/SliceActive.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/predicates/SliceTerminated.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/xml/BackupHandler.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/xml/BackupsHandler.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/xml/ErrorHandler.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/xml/FlavorHandler.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/xml/FlavorsHandler.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/xml/ImageHandler.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/xml/ImagesHandler.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java (100%) rename {slicehost => providers/slicehost}/src/main/java/org/jclouds/slicehost/xml/SlicesHandler.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/ProvidersInPropertiesTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModuleTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/compute/functions/FlavorToHardwareTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadataTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/xml/FlavorHandlerTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/xml/FlavorsHandlerTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/xml/ImageHandlerTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/xml/ImagesHandlerTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/xml/SliceHandlerTest.java (100%) rename {slicehost => providers/slicehost}/src/test/java/org/jclouds/slicehost/xml/SlicesHandlerTest.java (100%) rename {slicehost => providers/slicehost}/src/test/resources/log4j.xml (100%) rename {slicehost => providers/slicehost}/src/test/resources/test_errors.xml (100%) rename {slicehost => providers/slicehost}/src/test/resources/test_get_flavor.xml (100%) rename {slicehost => providers/slicehost}/src/test/resources/test_get_image.xml (100%) rename {slicehost => providers/slicehost}/src/test/resources/test_get_image32.xml (100%) rename {slicehost => providers/slicehost}/src/test/resources/test_get_slice.xml (100%) rename {slicehost => providers/slicehost}/src/test/resources/test_list_flavors.xml (100%) rename {slicehost => providers/slicehost}/src/test/resources/test_list_images.xml (100%) rename {slicehost => providers/slicehost}/src/test/resources/test_list_slices.xml (100%) rename {slicehost => providers/slicehost}/src/test/resources/test_new_slice.xml (100%) diff --git a/allcompute/pom.xml b/allcompute/pom.xml index c85d39c49e..ef067ac0a3 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -60,8 +60,8 @@ ${project.version} - ${project.groupId} - jclouds-slicehost + org.jclouds.provider + slicehost ${project.version} diff --git a/pom.xml b/pom.xml index 8b7f6ed5e2..c6677e69e4 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,6 @@ azure atmos rackspace - slicehost vcloud elasticstack allcompute diff --git a/providers/pom.xml b/providers/pom.xml index 6fe1af655a..af8b61dd27 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -34,6 +34,7 @@ jclouds providers project gogrid + slicehost cloudsigma diff --git a/slicehost/pom.xml b/providers/slicehost/pom.xml similarity index 90% rename from slicehost/pom.xml rename to providers/slicehost/pom.xml index b048dd7c46..bf945b657d 100644 --- a/slicehost/pom.xml +++ b/providers/slicehost/pom.xml @@ -23,13 +23,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jclouds - jclouds-project + org.jclouds.provider + jclouds-providers-project 1.0-SNAPSHOT - ../project/pom.xml + ../pom.xml - jclouds-slicehost - jclouds slicehost components + slicehost + jclouds Slicehost provider + ComputeService implementation of Slicehost datacenters trmkrun-ccc,test.trmk-924 @@ -39,19 +40,19 @@ - ${project.groupId} + org.jclouds jclouds-core ${project.version} test-jar test - ${project.groupId} + org.jclouds jclouds-compute ${project.version} - ${project.groupId} + org.jclouds jclouds-compute ${project.version} test-jar @@ -64,13 +65,13 @@ test - ${project.groupId} + org.jclouds jclouds-log4j ${project.version} test - ${project.groupId} + org.jclouds jclouds-jsch ${project.version} test diff --git a/slicehost/src/main/java/org/jclouds/slicehost/SlicehostAsyncClient.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostAsyncClient.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/SlicehostAsyncClient.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostAsyncClient.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/SlicehostClient.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostClient.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/SlicehostClient.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostClient.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/SlicehostContextBuilder.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostContextBuilder.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/SlicehostContextBuilder.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostContextBuilder.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/SlicehostPropertiesBuilder.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostPropertiesBuilder.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/SlicehostPropertiesBuilder.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostPropertiesBuilder.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateBackupToXmlPayload.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateBackupToXmlPayload.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateBackupToXmlPayload.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateBackupToXmlPayload.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateSliceToXmlPayload.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateSliceToXmlPayload.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateSliceToXmlPayload.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateSliceToXmlPayload.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeStrategiesByClass.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeStrategiesByClass.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeStrategiesByClass.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeStrategiesByClass.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeSuppliersByClass.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeSuppliersByClass.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeSuppliersByClass.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeSuppliersByClass.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceDependenciesModule.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceDependenciesModule.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceDependenciesModule.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceDependenciesModule.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/FlavorToHardware.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/FlavorToHardware.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/functions/FlavorToHardware.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/FlavorToHardware.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadata.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadata.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadata.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadata.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImage.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImage.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImage.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImage.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostAddNodeWithTagStrategy.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostAddNodeWithTagStrategy.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostAddNodeWithTagStrategy.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostAddNodeWithTagStrategy.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostDestroyNodeStrategy.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostDestroyNodeStrategy.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostDestroyNodeStrategy.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostDestroyNodeStrategy.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostGetNodeMetadataStrategy.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostGetNodeMetadataStrategy.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostGetNodeMetadataStrategy.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostGetNodeMetadataStrategy.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostLifeCycleStrategy.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostLifeCycleStrategy.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostLifeCycleStrategy.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostLifeCycleStrategy.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostListNodesStrategy.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostListNodesStrategy.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostListNodesStrategy.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostListNodesStrategy.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostHardwareSupplier.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostHardwareSupplier.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostHardwareSupplier.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostHardwareSupplier.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostImageSupplier.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostImageSupplier.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostImageSupplier.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostImageSupplier.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/config/SlicehostRestClientModule.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/config/SlicehostRestClientModule.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/config/SlicehostRestClientModule.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/config/SlicehostRestClientModule.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/domain/Backup.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Backup.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/domain/Backup.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Backup.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/domain/Flavor.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Flavor.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/domain/Flavor.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Flavor.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/domain/Image.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Image.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/domain/Image.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Image.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/filters/SlicehostBasic.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/filters/SlicehostBasic.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/filters/SlicehostBasic.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/filters/SlicehostBasic.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/handlers/ParseSlicehostErrorFromHttpResponse.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/handlers/ParseSlicehostErrorFromHttpResponse.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/handlers/ParseSlicehostErrorFromHttpResponse.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/handlers/ParseSlicehostErrorFromHttpResponse.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceActive.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceActive.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceActive.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceActive.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceTerminated.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceTerminated.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceTerminated.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceTerminated.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupHandler.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/xml/BackupHandler.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupHandler.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupsHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupsHandler.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/xml/BackupsHandler.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupsHandler.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/ErrorHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ErrorHandler.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/xml/ErrorHandler.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ErrorHandler.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorHandler.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorHandler.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorHandler.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorsHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorsHandler.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorsHandler.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorsHandler.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/ImageHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ImageHandler.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/xml/ImageHandler.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ImageHandler.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/ImagesHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ImagesHandler.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/xml/ImagesHandler.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ImagesHandler.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/SlicesHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SlicesHandler.java similarity index 100% rename from slicehost/src/main/java/org/jclouds/slicehost/xml/SlicesHandler.java rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SlicesHandler.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/ProvidersInPropertiesTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/ProvidersInPropertiesTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/ProvidersInPropertiesTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/ProvidersInPropertiesTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModuleTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModuleTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModuleTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModuleTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/FlavorToHardwareTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/FlavorToHardwareTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/compute/functions/FlavorToHardwareTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/FlavorToHardwareTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadataTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadataTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadataTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadataTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorHandlerTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorHandlerTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorHandlerTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorsHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorsHandlerTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorsHandlerTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorsHandlerTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/ImageHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/ImageHandlerTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/xml/ImageHandlerTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/ImageHandlerTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/ImagesHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/ImagesHandlerTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/xml/ImagesHandlerTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/ImagesHandlerTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/SliceHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/SliceHandlerTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/xml/SliceHandlerTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/SliceHandlerTest.java diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/SlicesHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/SlicesHandlerTest.java similarity index 100% rename from slicehost/src/test/java/org/jclouds/slicehost/xml/SlicesHandlerTest.java rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/SlicesHandlerTest.java diff --git a/slicehost/src/test/resources/log4j.xml b/providers/slicehost/src/test/resources/log4j.xml similarity index 100% rename from slicehost/src/test/resources/log4j.xml rename to providers/slicehost/src/test/resources/log4j.xml diff --git a/slicehost/src/test/resources/test_errors.xml b/providers/slicehost/src/test/resources/test_errors.xml similarity index 100% rename from slicehost/src/test/resources/test_errors.xml rename to providers/slicehost/src/test/resources/test_errors.xml diff --git a/slicehost/src/test/resources/test_get_flavor.xml b/providers/slicehost/src/test/resources/test_get_flavor.xml similarity index 100% rename from slicehost/src/test/resources/test_get_flavor.xml rename to providers/slicehost/src/test/resources/test_get_flavor.xml diff --git a/slicehost/src/test/resources/test_get_image.xml b/providers/slicehost/src/test/resources/test_get_image.xml similarity index 100% rename from slicehost/src/test/resources/test_get_image.xml rename to providers/slicehost/src/test/resources/test_get_image.xml diff --git a/slicehost/src/test/resources/test_get_image32.xml b/providers/slicehost/src/test/resources/test_get_image32.xml similarity index 100% rename from slicehost/src/test/resources/test_get_image32.xml rename to providers/slicehost/src/test/resources/test_get_image32.xml diff --git a/slicehost/src/test/resources/test_get_slice.xml b/providers/slicehost/src/test/resources/test_get_slice.xml similarity index 100% rename from slicehost/src/test/resources/test_get_slice.xml rename to providers/slicehost/src/test/resources/test_get_slice.xml diff --git a/slicehost/src/test/resources/test_list_flavors.xml b/providers/slicehost/src/test/resources/test_list_flavors.xml similarity index 100% rename from slicehost/src/test/resources/test_list_flavors.xml rename to providers/slicehost/src/test/resources/test_list_flavors.xml diff --git a/slicehost/src/test/resources/test_list_images.xml b/providers/slicehost/src/test/resources/test_list_images.xml similarity index 100% rename from slicehost/src/test/resources/test_list_images.xml rename to providers/slicehost/src/test/resources/test_list_images.xml diff --git a/slicehost/src/test/resources/test_list_slices.xml b/providers/slicehost/src/test/resources/test_list_slices.xml similarity index 100% rename from slicehost/src/test/resources/test_list_slices.xml rename to providers/slicehost/src/test/resources/test_list_slices.xml diff --git a/slicehost/src/test/resources/test_new_slice.xml b/providers/slicehost/src/test/resources/test_new_slice.xml similarity index 100% rename from slicehost/src/test/resources/test_new_slice.xml rename to providers/slicehost/src/test/resources/test_new_slice.xml