From 9d6537dfc20b7e92096ece1fdd62cd002ecfabf8 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sat, 8 Jan 2011 10:46:54 -0800 Subject: [PATCH] Issue 440: extracted cloudservers and cloudfiles into their own api modules, moved rackspace into commons --- allblobstore/pom.xml | 4 +- allcompute/pom.xml | 4 +- {rackspace => apis/cloudfiles}/pom.xml | 127 +++++------- .../cloudfiles/CloudFilesAsyncClient.java | 38 ++-- .../jclouds}/cloudfiles/CloudFilesClient.java | 18 +- .../cloudfiles/CloudFilesContextBuilder.java | 6 +- .../CloudFilesPropertiesBuilder.java | 2 +- .../BindCFObjectMetadataToRequest.java | 6 +- .../blobstore/CloudFilesAsyncBlobStore.java | 28 +-- .../CloudFilesBlobRequestSigner.java | 10 +- .../blobstore/CloudFilesBlobStore.java | 20 +- .../CloudFilesBlobStoreContextModule.java | 12 +- ...ontainerOptionsToListContainerOptions.java | 10 +- .../blobstore/functions/BlobToObject.java | 6 +- .../functions/BlobToObjectGetOptions.java | 4 +- .../functions/ContainerToResourceList.java | 6 +- .../ContainerToResourceMetadata.java | 6 +- .../blobstore/functions/ObjectToBlob.java | 4 +- .../functions/ObjectToBlobMetadata.java | 8 +- .../functions/ResourceToObjectInfo.java | 8 +- .../cloudfiles/config/CFObjectModule.java | 10 +- .../config/CloudFilesRestClientModule.java | 10 +- .../cloudfiles/domain/AccountMetadata.java | 2 +- .../jclouds}/cloudfiles/domain/CFObject.java | 4 +- .../domain/ContainerCDNMetadata.java | 2 +- .../cloudfiles/domain/ContainerMetadata.java | 2 +- .../domain/MutableObjectInfoWithMetadata.java | 6 +- .../cloudfiles/domain/ObjectInfo.java | 4 +- .../domain/internal/CFObjectImpl.java | 6 +- ...legatingMutableObjectInfoWithMetadata.java | 8 +- .../MutableObjectInfoWithMetadataImpl.java | 8 +- .../domain/internal/ObjectInfoImpl.java | 6 +- .../cloudfiles/functions/ObjectName.java | 6 +- ...rseAccountMetadataResponseFromHeaders.java | 8 +- .../functions/ParseCdnUriFromHeaders.java | 8 +- .../ParseContainerCDNMetadataFromHeaders.java | 10 +- .../ParseObjectFromHeadersAndHttpContent.java | 8 +- .../functions/ParseObjectInfoFromHeaders.java | 8 +- .../ParseObjectInfoListFromJsonResponse.java | 10 +- .../functions/ReturnTrueOn404FalseOn409.java | 4 +- .../ParseCloudFilesErrorFromHttpResponse.java | 2 +- .../options/ListCdnContainerOptions.java | 2 +- .../options/ListContainerOptions.java | 2 +- .../org/jclouds}/cloudfiles/package-info.java | 2 +- .../reference/CloudFilesConstants.java | 2 +- .../reference/CloudFilesHeaders.java | 4 +- .../cloudfiles/reference/package-info.java | 2 +- .../cloudfiles/CloudFilesClientLiveTest.java | 20 +- .../BindCFObjectMetadataToRequestTest.java | 8 +- .../CloudFilesBlobRequestSignerTest.java | 10 +- ...ptionsToBlobStoreListContainerOptions.java | 6 +- .../functions/ResourceToObjectList.java | 6 +- .../CloudFilesBlobIntegrationLiveTest.java | 4 +- .../integration/CloudFilesBlobLiveTest.java | 4 +- .../CloudFilesBlobMapIntegrationLiveTest.java | 4 +- .../CloudFilesBlobSignerLiveTest.java | 4 +- ...loudFilesContainerIntegrationLiveTest.java | 4 +- .../CloudFilesContainerLiveTest.java | 4 +- ...ilesInputStreamMapIntegrationLiveTest.java | 4 +- .../CloudFilesServiceIntegrationLiveTest.java | 4 +- .../CloudFilesTestInitializer.java | 4 +- ...rseObjectInfoListFromJsonResponseTest.java | 10 +- ...AuthenticationResponseFromHeadersTest.java | 2 +- ...erCDNMetadataListFromJsonResponseTest.java | 6 +- ...arseContainerListFromJsonResponseTest.java | 4 +- .../ParseObjectInfoFromHeadersTest.java | 4 +- ...seCloudFilesErrorFromHttpResponseTest.java | 4 +- .../internal/StubCloudFilesAsyncClient.java | 32 +-- .../options/ListContainerOptionsTest.java | 12 +- .../cloudfiles}/src/test/resources/log4j.xml | 0 .../src/test/resources}/test_list_cdn.json | 0 .../test/resources}/test_list_container.json | 0 apis/cloudservers/pom.xml | 145 ++++++++++++++ .../cloudservers/CloudServersAsyncClient.java | 42 ++-- .../cloudservers/CloudServersClient.java | 24 +-- .../CloudServersContextBuilder.java | 6 +- .../binders/BindAdminPassToJsonPayload.java | 2 +- .../BindBackupScheduleToJsonPayload.java | 4 +- .../BindConfirmResizeToJsonPayload.java | 2 +- .../binders/BindCreateImageToJsonPayload.java | 2 +- .../binders/BindRebootTypeToJsonPayload.java | 4 +- .../BindResizeFlavorToJsonPayload.java | 2 +- .../BindRevertResizeToJsonPayload.java | 2 +- .../binders/BindServerNameToJsonPayload.java | 2 +- .../BindSharedIpGroupToJsonPayload.java | 2 +- ...udServersBindComputeStrategiesByClass.java | 14 +- ...oudServersBindComputeSuppliersByClass.java | 8 +- ...oudServersComputeServiceContextModule.java | 2 +- ...rversComputeServiceDependenciesModule.java | 24 +-- .../functions/CloudServersImageToImage.java | 12 +- .../CloudServersImageToOperatingSystem.java | 8 +- .../compute/functions/FlavorToHardware.java | 6 +- .../functions/ServerToNodeMetadata.java | 8 +- .../CloudServersAddNodeWithTagStrategy.java | 8 +- .../CloudServersDestroyNodeStrategy.java | 6 +- .../CloudServersGetNodeMetadataStrategy.java | 8 +- .../CloudServersLifeCycleStrategy.java | 8 +- .../CloudServersListNodesStrategy.java | 10 +- .../CloudServersHardwareSupplier.java | 10 +- .../suppliers/CloudServersImageSupplier.java | 12 +- .../config/CloudServersRestClientModule.java | 10 +- .../cloudservers/domain/AbsoluteLimit.java | 2 +- .../jclouds}/cloudservers/domain/Action.java | 2 +- .../cloudservers/domain/Addresses.java | 2 +- .../cloudservers/domain/BackupSchedule.java | 2 +- .../cloudservers/domain/DailyBackup.java | 2 +- .../jclouds}/cloudservers/domain/Flavor.java | 2 +- .../jclouds}/cloudservers/domain/Image.java | 2 +- .../cloudservers/domain/ImageStatus.java | 2 +- .../jclouds}/cloudservers/domain/Limits.java | 2 +- .../cloudservers/domain/RateLimit.java | 2 +- .../cloudservers/domain/RateLimitUnit.java | 2 +- .../cloudservers/domain/RebootType.java | 2 +- .../jclouds}/cloudservers/domain/Server.java | 2 +- .../cloudservers/domain/ServerStatus.java | 2 +- .../jclouds}/cloudservers/domain/ShareIp.java | 2 +- .../cloudservers/domain/SharedIpGroup.java | 2 +- .../jclouds}/cloudservers/domain/Version.java | 4 +- .../cloudservers/domain/VersionStatus.java | 2 +- .../cloudservers/domain/WeeklyBackup.java | 2 +- ...arseCloudServersErrorFromHttpResponse.java | 4 +- .../options/CreateServerOptions.java | 4 +- .../options/CreateSharedIpGroupOptions.java | 2 +- .../cloudservers/options/ListOptions.java | 2 +- .../options/RebuildServerOptions.java | 2 +- .../cloudservers/predicates/ServerActive.java | 8 +- .../predicates/ServerDeleted.java | 8 +- .../CloudServersAsyncClientTest.java | 35 ++-- .../CloudServersClientLiveTest.java | 30 +-- .../BindAdminPassToJsonPayloadTest.java | 2 +- .../BindCreateImageToJsonPayloadTest.java | 2 +- .../BindRebootTypeToJsonPayloadTest.java | 4 +- .../BindServerNameToJsonPayloadTest.java | 2 +- .../CloudServersComputeServiceLiveTest.java | 8 +- .../CloudServersTemplateBuilderLiveTest.java | 4 +- ...erversComputeServiceContextModuleTest.java | 4 +- .../CloudServersImageToImageTest.java | 6 +- .../functions/FlavorToHardwareTest.java | 6 +- .../functions/ServerToNodeMetadataTest.java | 12 +- .../cloudservers/domain/ServerTest.java | 2 +- .../ParseAddressesFromJsonResponseTest.java | 6 +- ...rseBackupScheduleFromJsonResponseTest.java | 10 +- .../ParseFlavorFromJsonResponseTest.java | 6 +- .../ParseFlavorListFromJsonResponseTest.java | 8 +- .../ParseImageFromJsonResponseTest.java | 8 +- .../ParseImageListFromJsonResponseTest.java | 10 +- ...seInetAddressListFromJsonResponseTest.java | 6 +- .../ParseServerFromJsonResponseTest.java | 10 +- .../ParseServerListFromJsonResponseTest.java | 12 +- ...arseSharedIpGroupFromJsonResponseTest.java | 8 +- ...SharedIpGroupListFromJsonResponseTest.java | 8 +- .../options/CreateServerOptionsTest.java | 8 +- .../CreateSharedIpGroupOptionsTest.java | 4 +- .../cloudservers/options/ListOptionsTest.java | 10 +- .../options/RebuildServerOptionsTest.java | 4 +- .../cloudservers/src/test/resources/log4j.xml | 185 ++++++++++++++++++ .../resources}/test_get_flavor_details.json | 0 .../resources}/test_get_image_details.json | 0 .../resources}/test_get_server_detail.json | 0 .../test_get_sharedipgroup_details.json | 0 .../test/resources}/test_list_addresses.json | 0 .../test_list_addresses_private.json | 0 .../test_list_addresses_public.json | 0 .../resources}/test_list_backupschedule.json | 0 .../test/resources}/test_list_flavors.json | 0 .../resources}/test_list_flavors_detail.json | 0 .../src/test/resources}/test_list_images.json | 0 .../resources}/test_list_images_detail.json | 0 .../test/resources}/test_list_servers.json | 0 .../resources}/test_list_servers_detail.json | 0 .../resources}/test_list_sharedipgroups.json | 0 .../test_list_sharedipgroups_detail.json | 0 apis/pom.xml | 2 + common/pom.xml | 1 + {rackspace => common/rackspace}/README.txt | 0 common/rackspace/pom.xml | 50 +++++ .../org/jclouds/rackspace/Authentication.java | 0 .../org/jclouds/rackspace/CloudFiles.java | 0 .../org/jclouds/rackspace/CloudFilesCDN.java | 0 .../org/jclouds/rackspace/CloudServers.java | 0 .../rackspace/RackspaceAuthAsyncClient.java | 0 .../rackspace/RackspacePropertiesBuilder.java | 0 .../RackspaceAuthenticationRestModule.java | 0 .../config/RackspaceLocationsSupplier.java | 0 .../config/RackspaceParserModule.java | 0 .../rackspace/filters/AddTimestampQuery.java | 0 .../filters/AuthenticateRequest.java | 0 ...arseAuthenticationResponseFromHeaders.java | 0 .../rackspace/options/BaseListOptions.java | 0 .../rackspace/reference/RackspaceHeaders.java | 0 .../rackspace/reference/package-info.java | 0 .../RackspaceAuthAsyncClientTest.java | 0 ...ckspaceAuthenticationRestClientModule.java | 4 +- .../filters/AddTimestampQueryTest.java | 0 .../options/BaseListOptionsTest.java | 0 common/rackspace/src/test/resources/log4j.xml | 185 ++++++++++++++++++ core/src/main/resources/rest.properties | 6 +- pom.xml | 1 - .../rackspace/ProvidersInPropertiesTest.java | 58 ------ tools/getpath/pom.xml | 4 +- 200 files changed, 1153 insertions(+), 674 deletions(-) rename {rackspace => apis/cloudfiles}/pom.xml (52%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/CloudFilesAsyncClient.java (86%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/CloudFilesClient.java (89%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/CloudFilesContextBuilder.java (91%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/CloudFilesPropertiesBuilder.java (97%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/binders/BindCFObjectMetadataToRequest.java (93%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/CloudFilesAsyncBlobStore.java (88%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/CloudFilesBlobRequestSigner.java (91%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/CloudFilesBlobStore.java (90%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/config/CloudFilesBlobStoreContextModule.java (87%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/functions/BlobStoreListContainerOptionsToListContainerOptions.java (83%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/functions/BlobToObject.java (93%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/functions/BlobToObjectGetOptions.java (97%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/functions/ContainerToResourceList.java (95%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/functions/ContainerToResourceMetadata.java (93%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/functions/ObjectToBlob.java (93%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/functions/ObjectToBlobMetadata.java (92%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/blobstore/functions/ResourceToObjectInfo.java (90%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/config/CFObjectModule.java (88%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/config/CloudFilesRestClientModule.java (89%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/domain/AccountMetadata.java (97%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/domain/CFObject.java (96%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/domain/ContainerCDNMetadata.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/domain/ContainerMetadata.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/domain/MutableObjectInfoWithMetadata.java (89%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/domain/ObjectInfo.java (95%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/domain/internal/CFObjectImpl.java (94%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/domain/internal/DelegatingMutableObjectInfoWithMetadata.java (93%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/domain/internal/MutableObjectInfoWithMetadataImpl.java (95%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/domain/internal/ObjectInfoImpl.java (96%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/functions/ObjectName.java (90%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/functions/ParseAccountMetadataResponseFromHeaders.java (90%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/functions/ParseCdnUriFromHeaders.java (88%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java (90%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java (92%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/functions/ParseObjectInfoFromHeaders.java (92%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/functions/ParseObjectInfoListFromJsonResponse.java (93%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/functions/ReturnTrueOn404FalseOn409.java (96%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponse.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/options/ListCdnContainerOptions.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/options/ListContainerOptions.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/package-info.java (96%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/reference/CloudFilesConstants.java (96%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/reference/CloudFilesHeaders.java (96%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudfiles/src/main/java/org/jclouds}/cloudfiles/reference/package-info.java (94%) mode change 100755 => 100644 rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/CloudFilesClientLiveTest.java (95%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/binders/BindCFObjectMetadataToRequestTest.java (97%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java (94%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/functions/ListContainerOptionsToBlobStoreListContainerOptions.java (87%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/functions/ResourceToObjectList.java (93%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java (96%) mode change 100755 => 100644 rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java (94%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/integration/CloudFilesBlobMapIntegrationLiveTest.java (94%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java (94%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java (94%) mode change 100755 => 100644 rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java (94%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/integration/CloudFilesInputStreamMapIntegrationLiveTest.java (94%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java (94%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java (96%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/domain/internal/ParseObjectInfoListFromJsonResponseTest.java (89%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/functions/ParseAuthenticationResponseFromHeadersTest.java (98%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java (92%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java (95%) mode change 100755 => 100644 rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/functions/ParseObjectInfoFromHeadersTest.java (95%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponseTest.java (98%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/internal/StubCloudFilesAsyncClient.java (86%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudfiles/src/test/java/org/jclouds}/cloudfiles/options/ListContainerOptionsTest.java (92%) rename {rackspace => apis/cloudfiles}/src/test/resources/log4j.xml (100%) rename {rackspace/src/test/resources/cloudfiles => apis/cloudfiles/src/test/resources}/test_list_cdn.json (100%) rename {rackspace/src/test/resources/cloudfiles => apis/cloudfiles/src/test/resources}/test_list_container.json (100%) create mode 100644 apis/cloudservers/pom.xml rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/CloudServersAsyncClient.java (88%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/CloudServersClient.java (94%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/CloudServersContextBuilder.java (90%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/binders/BindAdminPassToJsonPayload.java (97%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/binders/BindBackupScheduleToJsonPayload.java (93%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/binders/BindConfirmResizeToJsonPayload.java (95%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/binders/BindCreateImageToJsonPayload.java (97%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/binders/BindRebootTypeToJsonPayload.java (93%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/binders/BindResizeFlavorToJsonPayload.java (97%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/binders/BindRevertResizeToJsonPayload.java (95%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/binders/BindServerNameToJsonPayload.java (97%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/binders/BindSharedIpGroupToJsonPayload.java (97%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/config/CloudServersBindComputeStrategiesByClass.java (82%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/config/CloudServersBindComputeSuppliersByClass.java (87%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/config/CloudServersComputeServiceContextModule.java (95%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/config/CloudServersComputeServiceDependenciesModule.java (82%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/functions/CloudServersImageToImage.java (79%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/functions/CloudServersImageToOperatingSystem.java (93%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/functions/FlavorToHardware.java (92%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/functions/ServerToNodeMetadata.java (96%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/strategy/CloudServersAddNodeWithTagStrategy.java (92%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/strategy/CloudServersDestroyNodeStrategy.java (92%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/strategy/CloudServersGetNodeMetadataStrategy.java (90%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/strategy/CloudServersLifeCycleStrategy.java (91%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/strategy/CloudServersListNodesStrategy.java (89%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/suppliers/CloudServersHardwareSupplier.java (88%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/compute/suppliers/CloudServersImageSupplier.java (82%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/config/CloudServersRestClientModule.java (89%) mode change 100755 => 100644 rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/AbsoluteLimit.java (95%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/Action.java (94%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/Addresses.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/BackupSchedule.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/DailyBackup.java (96%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/Flavor.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/Image.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/ImageStatus.java (96%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/Limits.java (96%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/RateLimit.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/RateLimitUnit.java (95%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/RebootType.java (95%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/Server.java (99%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/ServerStatus.java (97%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/ShareIp.java (96%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/SharedIpGroup.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/Version.java (96%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/VersionStatus.java (95%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/domain/WeeklyBackup.java (95%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/handlers/ParseCloudServersErrorFromHttpResponse.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/options/CreateServerOptions.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/options/CreateSharedIpGroupOptions.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/options/ListOptions.java (98%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/options/RebuildServerOptions.java (97%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/predicates/ServerActive.java (88%) rename {rackspace/src/main/java/org/jclouds/rackspace => apis/cloudservers/src/main/java/org/jclouds}/cloudservers/predicates/ServerDeleted.java (88%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/CloudServersAsyncClientTest.java (96%) mode change 100755 => 100644 rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/CloudServersClientLiveTest.java (96%) mode change 100755 => 100644 rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/binders/BindAdminPassToJsonPayloadTest.java (98%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/binders/BindCreateImageToJsonPayloadTest.java (98%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/binders/BindRebootTypeToJsonPayloadTest.java (96%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/binders/BindServerNameToJsonPayloadTest.java (98%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/compute/CloudServersComputeServiceLiveTest.java (95%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/compute/CloudServersTemplateBuilderLiveTest.java (97%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/compute/config/CloudServersComputeServiceContextModuleTest.java (90%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/compute/functions/CloudServersImageToImageTest.java (90%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/compute/functions/FlavorToHardwareTest.java (91%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/compute/functions/ServerToNodeMetadataTest.java (96%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/domain/ServerTest.java (96%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/functions/ParseAddressesFromJsonResponseTest.java (91%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/functions/ParseBackupScheduleFromJsonResponseTest.java (87%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/functions/ParseFlavorFromJsonResponseTest.java (91%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/functions/ParseFlavorListFromJsonResponseTest.java (90%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/functions/ParseImageFromJsonResponseTest.java (91%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/functions/ParseImageListFromJsonResponseTest.java (90%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/functions/ParseInetAddressListFromJsonResponseTest.java (90%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/functions/ParseServerFromJsonResponseTest.java (91%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/functions/ParseServerListFromJsonResponseTest.java (91%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java (90%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java (89%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/options/CreateServerOptionsTest.java (92%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/options/CreateSharedIpGroupOptionsTest.java (94%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/options/ListOptionsTest.java (87%) rename {rackspace/src/test/java/org/jclouds/rackspace => apis/cloudservers/src/test/java/org/jclouds}/cloudservers/options/RebuildServerOptionsTest.java (94%) create mode 100755 apis/cloudservers/src/test/resources/log4j.xml rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_get_flavor_details.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_get_image_details.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_get_server_detail.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_get_sharedipgroup_details.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_addresses.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_addresses_private.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_addresses_public.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_backupschedule.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_flavors.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_flavors_detail.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_images.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_images_detail.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_servers.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_servers_detail.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_sharedipgroups.json (100%) rename {rackspace/src/test/resources/cloudservers => apis/cloudservers/src/test/resources}/test_list_sharedipgroups_detail.json (100%) rename {rackspace => common/rackspace}/README.txt (100%) create mode 100644 common/rackspace/pom.xml rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/Authentication.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/CloudFiles.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/CloudFilesCDN.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/CloudServers.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/RackspaceAuthAsyncClient.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/RackspacePropertiesBuilder.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/config/RackspaceAuthenticationRestModule.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/config/RackspaceLocationsSupplier.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/config/RackspaceParserModule.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/filters/AddTimestampQuery.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/filters/AuthenticateRequest.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/functions/ParseAuthenticationResponseFromHeaders.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/options/BaseListOptions.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/reference/RackspaceHeaders.java (100%) rename {rackspace => common/rackspace}/src/main/java/org/jclouds/rackspace/reference/package-info.java (100%) rename {rackspace => common/rackspace}/src/test/java/org/jclouds/rackspace/RackspaceAuthAsyncClientTest.java (100%) rename {rackspace/src/test/java/org/jclouds/rackspace/cloudservers => common/rackspace/src/test/java/org/jclouds/rackspace}/TestRackspaceAuthenticationRestClientModule.java (97%) rename {rackspace => common/rackspace}/src/test/java/org/jclouds/rackspace/filters/AddTimestampQueryTest.java (100%) rename {rackspace => common/rackspace}/src/test/java/org/jclouds/rackspace/options/BaseListOptionsTest.java (100%) create mode 100755 common/rackspace/src/test/resources/log4j.xml delete mode 100644 rackspace/src/test/java/org/jclouds/rackspace/ProvidersInPropertiesTest.java diff --git a/allblobstore/pom.xml b/allblobstore/pom.xml index a587728f03..13d1b368d9 100644 --- a/allblobstore/pom.xml +++ b/allblobstore/pom.xml @@ -70,8 +70,8 @@ ${project.version} - ${project.groupId} - jclouds-rackspace + org.jclouds.api + cloudfiles ${project.version} diff --git a/allcompute/pom.xml b/allcompute/pom.xml index 1105da6b42..6e9e38dc1c 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -45,8 +45,8 @@ ${project.version} - ${project.groupId} - jclouds-rackspace + org.jclouds.api + cloudservers ${project.version} diff --git a/rackspace/pom.xml b/apis/cloudfiles/pom.xml similarity index 52% rename from rackspace/pom.xml rename to apis/cloudfiles/pom.xml index 2e5dcd08d6..965660d57a 100644 --- a/rackspace/pom.xml +++ b/apis/cloudfiles/pom.xml @@ -1,106 +1,93 @@ - + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ==================================================================== + +--> + 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 1.0-SNAPSHOT - ../project/pom.xml + ../../project/pom.xml - jclouds-rackspace - jclouds rackspace components + org.jclouds.api + cloudfiles + jcloud cloudfiles api + jclouds components to access an implementation of CloudFiles - https://auth.api.rackspacecloud.com - 1.0 - FIXME - FIXME - org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesTestInitializer - - trmkrun-ccc,test.trmk-924 - ${test.rackspace.endpoint} - ${test.rackspace.apiversion} + org.jclouds.cloudfiles.blobstore.integration.CloudFilesTestInitializer + https://auth.api.rackspacecloud.com + 1.0 ${test.rackspace.identity} ${test.rackspace.credential} - ${test.rackspace.endpoint} - ${test.rackspace.apiversion} - ${test.rackspace.identity} - ${test.rackspace.credential} - - ${project.groupId} + org.jclouds.common + rackspace-common + ${project.version} + + + org.jclouds + jclouds-blobstore + ${project.version} + + + org.jclouds jclouds-core ${project.version} test-jar test - ${project.groupId} - jclouds-blobstore + org.jclouds.common + rackspace-common ${project.version} + test-jar + test - ${project.groupId} + org.jclouds jclouds-blobstore ${project.version} test-jar test - ${project.groupId} - jclouds-compute - ${project.version} - - - ${project.groupId} - jclouds-compute - ${project.version} - test-jar - test - - - log4j - log4j - 1.2.14 - test - - - ${project.groupId} + org.jclouds jclouds-log4j ${project.version} test - ${project.groupId} - jclouds-jsch - ${project.version} + log4j + log4j + 1.2.16 test + live @@ -134,26 +121,6 @@ test.cloudfiles.credential ${test.cloudfiles.credential} - - test.cloudservers.endpoint - ${test.cloudservers.endpoint} - - - test.cloudservers.apiversion - ${test.cloudservers.apiversion} - - - test.cloudservers.identity - ${test.cloudservers.identity} - - - test.cloudservers.credential - ${test.cloudservers.credential} - - - jclouds.compute.blacklist-nodes - ${jclouds.compute.blacklist-nodes} - test.initializer ${test.initializer} @@ -176,4 +143,6 @@ + + diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesAsyncClient.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java similarity index 86% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesAsyncClient.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java index 5078a853fb..9a265f5903 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesAsyncClient.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles; +package org.jclouds.cloudfiles; import java.net.URI; import java.util.Map; @@ -45,24 +45,24 @@ import org.jclouds.http.functions.ParseETagHeader; import org.jclouds.http.options.GetOptions; import org.jclouds.rackspace.CloudFiles; import org.jclouds.rackspace.CloudFilesCDN; -import org.jclouds.rackspace.cloudfiles.binders.BindCFObjectMetadataToRequest; -import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; -import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; -import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; -import org.jclouds.rackspace.cloudfiles.functions.ObjectName; -import org.jclouds.rackspace.cloudfiles.functions.ParseAccountMetadataResponseFromHeaders; -import org.jclouds.rackspace.cloudfiles.functions.ParseCdnUriFromHeaders; -import org.jclouds.rackspace.cloudfiles.functions.ParseContainerCDNMetadataFromHeaders; -import org.jclouds.rackspace.cloudfiles.functions.ParseObjectFromHeadersAndHttpContent; -import org.jclouds.rackspace.cloudfiles.functions.ParseObjectInfoFromHeaders; -import org.jclouds.rackspace.cloudfiles.functions.ParseObjectInfoListFromJsonResponse; -import org.jclouds.rackspace.cloudfiles.functions.ReturnTrueOn404FalseOn409; -import org.jclouds.rackspace.cloudfiles.options.ListCdnContainerOptions; -import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; -import org.jclouds.rackspace.cloudfiles.reference.CloudFilesHeaders; +import org.jclouds.cloudfiles.binders.BindCFObjectMetadataToRequest; +import org.jclouds.cloudfiles.domain.AccountMetadata; +import org.jclouds.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.domain.ContainerCDNMetadata; +import org.jclouds.cloudfiles.domain.ContainerMetadata; +import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata; +import org.jclouds.cloudfiles.domain.ObjectInfo; +import org.jclouds.cloudfiles.functions.ObjectName; +import org.jclouds.cloudfiles.functions.ParseAccountMetadataResponseFromHeaders; +import org.jclouds.cloudfiles.functions.ParseCdnUriFromHeaders; +import org.jclouds.cloudfiles.functions.ParseContainerCDNMetadataFromHeaders; +import org.jclouds.cloudfiles.functions.ParseObjectFromHeadersAndHttpContent; +import org.jclouds.cloudfiles.functions.ParseObjectInfoFromHeaders; +import org.jclouds.cloudfiles.functions.ParseObjectInfoListFromJsonResponse; +import org.jclouds.cloudfiles.functions.ReturnTrueOn404FalseOn409; +import org.jclouds.cloudfiles.options.ListCdnContainerOptions; +import org.jclouds.cloudfiles.options.ListContainerOptions; +import org.jclouds.cloudfiles.reference.CloudFilesHeaders; import org.jclouds.rackspace.filters.AuthenticateRequest; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.Endpoint; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesClient.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesClient.java similarity index 89% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesClient.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesClient.java index 7c88ccaa3d..bc2aea5d7b 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesClient.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesClient.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles; +package org.jclouds.cloudfiles; import java.net.URI; import java.util.Map; @@ -29,14 +29,14 @@ import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.concurrent.Timeout; import org.jclouds.http.options.GetOptions; -import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; -import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; -import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; -import org.jclouds.rackspace.cloudfiles.options.ListCdnContainerOptions; -import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; +import org.jclouds.cloudfiles.domain.AccountMetadata; +import org.jclouds.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.domain.ContainerCDNMetadata; +import org.jclouds.cloudfiles.domain.ContainerMetadata; +import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata; +import org.jclouds.cloudfiles.domain.ObjectInfo; +import org.jclouds.cloudfiles.options.ListCdnContainerOptions; +import org.jclouds.cloudfiles.options.ListContainerOptions; import java.util.concurrent.Future; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContextBuilder.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesContextBuilder.java old mode 100755 new mode 100644 similarity index 91% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContextBuilder.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesContextBuilder.java index 297c156c82..502f6f08ea --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContextBuilder.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesContextBuilder.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles; +package org.jclouds.cloudfiles; import java.util.List; import java.util.Properties; @@ -25,8 +25,8 @@ import java.util.Properties; import org.jclouds.blobstore.BlobStoreContextBuilder; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.logging.jdk.config.JDKLoggingModule; -import org.jclouds.rackspace.cloudfiles.blobstore.config.CloudFilesBlobStoreContextModule; -import org.jclouds.rackspace.cloudfiles.config.CloudFilesRestClientModule; +import org.jclouds.cloudfiles.blobstore.config.CloudFilesBlobStoreContextModule; +import org.jclouds.cloudfiles.config.CloudFilesRestClientModule; import com.google.inject.Injector; import com.google.inject.Module; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesPropertiesBuilder.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesPropertiesBuilder.java similarity index 97% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesPropertiesBuilder.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesPropertiesBuilder.java index 1cdc7ea095..bf1484ef77 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesPropertiesBuilder.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesPropertiesBuilder.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles; +package org.jclouds.cloudfiles; import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/binders/BindCFObjectMetadataToRequest.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/binders/BindCFObjectMetadataToRequest.java similarity index 93% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/binders/BindCFObjectMetadataToRequest.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/binders/BindCFObjectMetadataToRequest.java index 96a177e6d7..c25c5ef770 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/binders/BindCFObjectMetadataToRequest.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/binders/BindCFObjectMetadataToRequest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.binders; +package org.jclouds.cloudfiles.binders; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -29,8 +29,8 @@ import javax.ws.rs.core.MediaType; import org.jclouds.blobstore.binders.BindUserMetadataToHeadersWithPrefix; import org.jclouds.http.HttpRequest; import org.jclouds.http.utils.ModifyRequest; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlob; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlob; +import org.jclouds.cloudfiles.domain.CFObject; import org.jclouds.rest.Binder; @Singleton diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesAsyncBlobStore.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesAsyncBlobStore.java similarity index 88% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesAsyncBlobStore.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesAsyncBlobStore.java index 21618464ec..eb13326a92 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesAsyncBlobStore.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesAsyncBlobStore.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore; +package org.jclouds.cloudfiles.blobstore; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.blobstore.util.BlobStoreUtils.createParentIfNeededAsync; @@ -46,18 +46,18 @@ import org.jclouds.collect.Memoized; import org.jclouds.concurrent.Futures; import org.jclouds.domain.Location; import org.jclouds.http.options.GetOptions; -import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; -import org.jclouds.rackspace.cloudfiles.CloudFilesClient; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobStoreListContainerOptionsToListContainerOptions; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobToObject; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ContainerToResourceList; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ContainerToResourceMetadata; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlob; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlobMetadata; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; -import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; -import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; +import org.jclouds.cloudfiles.CloudFilesAsyncClient; +import org.jclouds.cloudfiles.CloudFilesClient; +import org.jclouds.cloudfiles.blobstore.functions.BlobStoreListContainerOptionsToListContainerOptions; +import org.jclouds.cloudfiles.blobstore.functions.BlobToObject; +import org.jclouds.cloudfiles.blobstore.functions.ContainerToResourceList; +import org.jclouds.cloudfiles.blobstore.functions.ContainerToResourceMetadata; +import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlob; +import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlobMetadata; +import org.jclouds.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.domain.ContainerMetadata; +import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata; +import org.jclouds.cloudfiles.domain.ObjectInfo; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -144,7 +144,7 @@ public class CloudFilesAsyncBlobStore extends BaseAsyncBlobStore { */ @Override public ListenableFuture> list(String container, ListContainerOptions options) { - org.jclouds.rackspace.cloudfiles.options.ListContainerOptions httpOptions = container2ContainerListOptions + org.jclouds.cloudfiles.options.ListContainerOptions httpOptions = container2ContainerListOptions .apply(options); ListenableFuture> returnVal = async.listObjects(container, httpOptions); ListenableFuture> list = Futures.compose(returnVal, container2ResourceList, diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSigner.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobRequestSigner.java similarity index 91% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSigner.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobRequestSigner.java index 5dc832649e..eb019c388e 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSigner.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobRequestSigner.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore; +package org.jclouds.cloudfiles.blobstore; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.blobstore.util.BlobStoreUtils.cleanRequest; @@ -31,9 +31,9 @@ import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.domain.Blob; import org.jclouds.http.HttpRequest; import org.jclouds.http.options.GetOptions; -import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobToObject; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.CloudFilesAsyncClient; +import org.jclouds.cloudfiles.blobstore.functions.BlobToObject; +import org.jclouds.cloudfiles.domain.CFObject; import org.jclouds.rest.internal.RestAnnotationProcessor; /** @@ -74,4 +74,4 @@ public class CloudFilesBlobRequestSigner implements BlobRequestSigner { return cleanRequest(processor.createRequest(deleteMethod, container, name)); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobStore.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobStore.java similarity index 90% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobStore.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobStore.java index d25c2bff5d..cc5ab8cc70 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobStore.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobStore.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore; +package org.jclouds.cloudfiles.blobstore; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.blobstore.util.BlobStoreUtils.createParentIfNeededAsync; @@ -42,14 +42,14 @@ import org.jclouds.blobstore.util.BlobUtils; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; import org.jclouds.http.options.GetOptions; -import org.jclouds.rackspace.cloudfiles.CloudFilesClient; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobStoreListContainerOptionsToListContainerOptions; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobToObject; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ContainerToResourceList; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ContainerToResourceMetadata; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlob; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlobMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.jclouds.cloudfiles.CloudFilesClient; +import org.jclouds.cloudfiles.blobstore.functions.BlobStoreListContainerOptionsToListContainerOptions; +import org.jclouds.cloudfiles.blobstore.functions.BlobToObject; +import org.jclouds.cloudfiles.blobstore.functions.ContainerToResourceList; +import org.jclouds.cloudfiles.blobstore.functions.ContainerToResourceMetadata; +import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlob; +import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlobMetadata; +import org.jclouds.cloudfiles.domain.ContainerMetadata; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -135,7 +135,7 @@ public class CloudFilesBlobStore extends BaseBlobStore { */ @Override public PageSet list(String container, ListContainerOptions options) { - org.jclouds.rackspace.cloudfiles.options.ListContainerOptions httpOptions = container2ContainerListOptions + org.jclouds.cloudfiles.options.ListContainerOptions httpOptions = container2ContainerListOptions .apply(options); PageSet list = container2ResourceList.apply(sync.listObjects(container, httpOptions)); return options.isDetailed() ? fetchBlobMetadataProvider.get().setContainerName(container).apply(list) : list; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/config/CloudFilesBlobStoreContextModule.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/config/CloudFilesBlobStoreContextModule.java old mode 100755 new mode 100644 similarity index 87% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/config/CloudFilesBlobStoreContextModule.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/config/CloudFilesBlobStoreContextModule.java index ac8fabd248..da08fc9ac4 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/config/CloudFilesBlobStoreContextModule.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/config/CloudFilesBlobStoreContextModule.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.config; +package org.jclouds.cloudfiles.blobstore.config; import java.util.Set; @@ -32,11 +32,11 @@ import org.jclouds.blobstore.config.BlobStoreMapModule; import org.jclouds.blobstore.internal.BlobStoreContextImpl; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; -import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; -import org.jclouds.rackspace.cloudfiles.CloudFilesClient; -import org.jclouds.rackspace.cloudfiles.blobstore.CloudFilesAsyncBlobStore; -import org.jclouds.rackspace.cloudfiles.blobstore.CloudFilesBlobRequestSigner; -import org.jclouds.rackspace.cloudfiles.blobstore.CloudFilesBlobStore; +import org.jclouds.cloudfiles.CloudFilesAsyncClient; +import org.jclouds.cloudfiles.CloudFilesClient; +import org.jclouds.cloudfiles.blobstore.CloudFilesAsyncBlobStore; +import org.jclouds.cloudfiles.blobstore.CloudFilesBlobRequestSigner; +import org.jclouds.cloudfiles.blobstore.CloudFilesBlobStore; import org.jclouds.rackspace.config.RackspaceLocationsSupplier; import com.google.common.base.Supplier; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobStoreListContainerOptionsToListContainerOptions.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobStoreListContainerOptionsToListContainerOptions.java similarity index 83% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobStoreListContainerOptionsToListContainerOptions.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobStoreListContainerOptionsToListContainerOptions.java index 909d1ddcdc..baac0562e7 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobStoreListContainerOptionsToListContainerOptions.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobStoreListContainerOptionsToListContainerOptions.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.functions; +package org.jclouds.cloudfiles.blobstore.functions; import static com.google.common.base.Preconditions.checkNotNull; @@ -33,11 +33,11 @@ import com.google.common.base.Function; @Singleton public class BlobStoreListContainerOptionsToListContainerOptions implements - Function { - public org.jclouds.rackspace.cloudfiles.options.ListContainerOptions apply( + Function { + public org.jclouds.cloudfiles.options.ListContainerOptions apply( ListContainerOptions from) { checkNotNull(from, "set options to instance NONE instead of passing null"); - org.jclouds.rackspace.cloudfiles.options.ListContainerOptions options = new org.jclouds.rackspace.cloudfiles.options.ListContainerOptions(); + org.jclouds.cloudfiles.options.ListContainerOptions options = new org.jclouds.cloudfiles.options.ListContainerOptions(); if ((from.getDir() == null) && (from.isRecursive())) { options.withPrefix(""); } @@ -60,4 +60,4 @@ public class BlobStoreListContainerOptionsToListContainerOptions return options; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobToObject.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobToObject.java similarity index 93% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobToObject.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobToObject.java index 97fe61d4dd..15573a4ad9 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobToObject.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobToObject.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.functions; +package org.jclouds.cloudfiles.blobstore.functions; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,7 +25,7 @@ import javax.inject.Inject; import javax.inject.Singleton; import org.jclouds.blobstore.domain.Blob; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.domain.CFObject; import com.google.common.base.Function; @@ -51,4 +51,4 @@ public class BlobToObject implements Function { object.setAllHeaders(from.getAllHeaders()); return object; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobToObjectGetOptions.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobToObjectGetOptions.java similarity index 97% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobToObjectGetOptions.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobToObjectGetOptions.java index fbf22dda29..745852dcb1 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobToObjectGetOptions.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobToObjectGetOptions.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.functions; +package org.jclouds.cloudfiles.blobstore.functions; import javax.inject.Singleton; @@ -58,4 +58,4 @@ public class BlobToObjectGetOptions implements } return httpOptions; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ContainerToResourceList.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/ContainerToResourceList.java similarity index 95% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ContainerToResourceList.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/ContainerToResourceList.java index 6a13d231cc..977e5a5332 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ContainerToResourceList.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/ContainerToResourceList.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.functions; +package org.jclouds.cloudfiles.blobstore.functions; import javax.inject.Inject; import javax.inject.Singleton; @@ -28,7 +28,7 @@ import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; import org.jclouds.blobstore.domain.internal.PageSetImpl; import org.jclouds.blobstore.domain.internal.StorageMetadataImpl; -import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; +import org.jclouds.cloudfiles.domain.ObjectInfo; import com.google.common.base.Function; import com.google.common.collect.Iterables; @@ -59,4 +59,4 @@ public class ContainerToResourceList implements Function, Pa }), from.getNextMarker()); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ContainerToResourceMetadata.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/ContainerToResourceMetadata.java similarity index 93% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ContainerToResourceMetadata.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/ContainerToResourceMetadata.java index cf024346f9..a19fc47a54 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ContainerToResourceMetadata.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/ContainerToResourceMetadata.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.functions; +package org.jclouds.cloudfiles.blobstore.functions; import javax.inject.Inject; import javax.inject.Singleton; @@ -27,7 +27,7 @@ import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; import org.jclouds.blobstore.domain.internal.MutableStorageMetadataImpl; import org.jclouds.domain.Location; -import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.jclouds.cloudfiles.domain.ContainerMetadata; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -51,4 +51,4 @@ public class ContainerToResourceMetadata implements Function { Multimap getAllHeaders(); void setAllHeaders(Multimap allHeaders); -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerCDNMetadata.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ContainerCDNMetadata.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerCDNMetadata.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ContainerCDNMetadata.java index 00f094db6d..8a1831267b 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerCDNMetadata.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ContainerCDNMetadata.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.domain; +package org.jclouds.cloudfiles.domain; import java.net.URI; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerMetadata.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ContainerMetadata.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerMetadata.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ContainerMetadata.java index 82b3ebc721..0ed31a67a4 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerMetadata.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ContainerMetadata.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.domain; +package org.jclouds.cloudfiles.domain; /** diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/MutableObjectInfoWithMetadata.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/MutableObjectInfoWithMetadata.java similarity index 89% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/MutableObjectInfoWithMetadata.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/MutableObjectInfoWithMetadata.java index a667d6322e..f9190cf821 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/MutableObjectInfoWithMetadata.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/MutableObjectInfoWithMetadata.java @@ -17,12 +17,12 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.domain; +package org.jclouds.cloudfiles.domain; import java.util.Date; import java.util.Map; -import org.jclouds.rackspace.cloudfiles.domain.internal.MutableObjectInfoWithMetadataImpl; +import org.jclouds.cloudfiles.domain.internal.MutableObjectInfoWithMetadataImpl; import com.google.inject.ImplementedBy; @@ -46,4 +46,4 @@ public interface MutableObjectInfoWithMetadata extends ObjectInfo { Map getMetadata(); -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ObjectInfo.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ObjectInfo.java similarity index 95% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ObjectInfo.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ObjectInfo.java index ecee3543e2..8457c15ca0 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ObjectInfo.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ObjectInfo.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.domain; +package org.jclouds.cloudfiles.domain; import java.util.Date; @@ -38,4 +38,4 @@ public interface ObjectInfo extends Comparable { Date getLastModified(); -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/CFObjectImpl.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/CFObjectImpl.java similarity index 94% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/CFObjectImpl.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/CFObjectImpl.java index 9fc34ce459..18cf7d13bf 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/CFObjectImpl.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/CFObjectImpl.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.domain.internal; +package org.jclouds.cloudfiles.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; @@ -26,8 +26,8 @@ import javax.inject.Inject; import org.jclouds.http.HttpUtils; import org.jclouds.http.internal.PayloadEnclosingImpl; import org.jclouds.io.Payload; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; -import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; +import org.jclouds.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/DelegatingMutableObjectInfoWithMetadata.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/DelegatingMutableObjectInfoWithMetadata.java similarity index 93% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/DelegatingMutableObjectInfoWithMetadata.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/DelegatingMutableObjectInfoWithMetadata.java index f63167c72e..0add97d593 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/DelegatingMutableObjectInfoWithMetadata.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/DelegatingMutableObjectInfoWithMetadata.java @@ -17,14 +17,14 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.domain.internal; +package org.jclouds.cloudfiles.domain.internal; import java.util.Date; import java.util.Map; import org.jclouds.io.payloads.BaseMutableContentMetadata; -import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; +import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata; +import org.jclouds.cloudfiles.domain.ObjectInfo; /** * @@ -129,4 +129,4 @@ public class DelegatingMutableObjectInfoWithMetadata extends BaseMutableContentM public int compareTo(ObjectInfo o) { return delegate.compareTo(o); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/MutableObjectInfoWithMetadataImpl.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/MutableObjectInfoWithMetadataImpl.java similarity index 95% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/MutableObjectInfoWithMetadataImpl.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/MutableObjectInfoWithMetadataImpl.java index 300524318d..2cfa527ba3 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/MutableObjectInfoWithMetadataImpl.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/MutableObjectInfoWithMetadataImpl.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.domain.internal; +package org.jclouds.cloudfiles.domain.internal; import java.util.Arrays; import java.util.Date; @@ -25,8 +25,8 @@ import java.util.Map; import javax.ws.rs.core.MediaType; -import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; +import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata; +import org.jclouds.cloudfiles.domain.ObjectInfo; import com.google.common.collect.Maps; @@ -143,4 +143,4 @@ public class MutableObjectInfoWithMetadataImpl implements MutableObjectInfoWithM this.lastModified = lastModified; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/ObjectInfoImpl.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/ObjectInfoImpl.java similarity index 96% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/ObjectInfoImpl.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/ObjectInfoImpl.java index be9cd30d02..ce7bbe23a5 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/ObjectInfoImpl.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/ObjectInfoImpl.java @@ -17,12 +17,12 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.domain.internal; +package org.jclouds.cloudfiles.domain.internal; import java.util.Arrays; import java.util.Date; -import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; +import org.jclouds.cloudfiles.domain.ObjectInfo; public class ObjectInfoImpl implements ObjectInfo { String name; @@ -115,4 +115,4 @@ public class ObjectInfoImpl implements ObjectInfo { + ", last_modified=" + last_modified.getTime() + ", name=" + name + "]"; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ObjectName.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ObjectName.java similarity index 90% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ObjectName.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ObjectName.java index 5a4a1e7891..a427e288bd 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ObjectName.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ObjectName.java @@ -17,9 +17,9 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.cloudfiles.functions; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.domain.CFObject; import com.google.common.base.Function; @@ -33,4 +33,4 @@ public class ObjectName implements Function { return ((CFObject) from).getInfo().getName(); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseAccountMetadataResponseFromHeaders.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseAccountMetadataResponseFromHeaders.java old mode 100755 new mode 100644 similarity index 90% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseAccountMetadataResponseFromHeaders.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseAccountMetadataResponseFromHeaders.java index 75f8f55b44..72b8990d07 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseAccountMetadataResponseFromHeaders.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseAccountMetadataResponseFromHeaders.java @@ -17,13 +17,13 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.cloudfiles.functions; import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; -import org.jclouds.rackspace.cloudfiles.reference.CloudFilesHeaders; +import org.jclouds.cloudfiles.domain.AccountMetadata; +import org.jclouds.cloudfiles.reference.CloudFilesHeaders; import com.google.common.base.Function; @@ -49,4 +49,4 @@ public class ParseAccountMetadataResponseFromHeaders implements Long.parseLong(containersCountString), Long.parseLong(bytesString)); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseCdnUriFromHeaders.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseCdnUriFromHeaders.java similarity index 88% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseCdnUriFromHeaders.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseCdnUriFromHeaders.java index 238aae0770..c16b71dd41 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseCdnUriFromHeaders.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseCdnUriFromHeaders.java @@ -17,15 +17,15 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.cloudfiles.functions; import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; -import org.jclouds.rackspace.cloudfiles.reference.CloudFilesHeaders; +import org.jclouds.cloudfiles.domain.AccountMetadata; +import org.jclouds.cloudfiles.reference.CloudFilesHeaders; import com.google.common.base.Function; @@ -44,4 +44,4 @@ public class ParseCdnUriFromHeaders implements Function { CloudFilesHeaders.CDN_URI); return URI.create(cdnUri); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java similarity index 90% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java index 04928d0047..80927bd91b 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.cloudfiles.functions; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,9 +25,9 @@ import java.net.URI; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; -import org.jclouds.rackspace.cloudfiles.reference.CloudFilesHeaders; +import org.jclouds.cloudfiles.domain.AccountMetadata; +import org.jclouds.cloudfiles.domain.ContainerCDNMetadata; +import org.jclouds.cloudfiles.reference.CloudFilesHeaders; import org.jclouds.rest.InvocationContext; import com.google.common.base.Function; @@ -66,4 +66,4 @@ public class ParseContainerCDNMetadataFromHeaders implements this.request = request; return this; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java similarity index 92% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java index ccf05ca512..47ed71127e 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java @@ -17,14 +17,14 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.cloudfiles.functions; import javax.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; -import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; +import org.jclouds.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.rest.InvocationContext; import com.google.common.base.Function; @@ -63,4 +63,4 @@ public class ParseObjectFromHeadersAndHttpContent implements Function) request; return this; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn404FalseOn409.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ReturnTrueOn404FalseOn409.java similarity index 96% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn404FalseOn409.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ReturnTrueOn404FalseOn409.java index 91f70f4d37..408117cd03 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn404FalseOn409.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ReturnTrueOn404FalseOn409.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.cloudfiles.functions; import static com.google.common.base.Predicates.in; import static com.google.common.collect.ImmutableSet.of; @@ -36,4 +36,4 @@ public class ReturnTrueOn404FalseOn409 implements Function { Boolean returnVal = returnValueOnCodeOrNull(from, true, in(of(404, 409))); return returnVal != null ? returnVal : Boolean.class.cast(propagateOrNull(from)); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponse.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponse.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponse.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponse.java index 3ecf223c68..8b3bcefb94 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponse.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponse.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.handlers; +package org.jclouds.cloudfiles.handlers; import static org.jclouds.http.HttpUtils.releasePayload; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListCdnContainerOptions.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/options/ListCdnContainerOptions.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListCdnContainerOptions.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/options/ListCdnContainerOptions.java index 17e6d865e8..f223872047 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListCdnContainerOptions.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/options/ListCdnContainerOptions.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.options; +package org.jclouds.cloudfiles.options; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListContainerOptions.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/options/ListContainerOptions.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListContainerOptions.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/options/ListContainerOptions.java index 023fcb973d..9651ec69f7 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListContainerOptions.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/options/ListContainerOptions.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.options; +package org.jclouds.cloudfiles.options; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/package-info.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/package-info.java old mode 100755 new mode 100644 similarity index 96% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/package-info.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/package-info.java index f066c6a6c0..964f1221b3 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/package-info.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/package-info.java @@ -23,4 +23,4 @@ * @see * @author Adrian Cole */ -package org.jclouds.rackspace.cloudfiles; \ No newline at end of file +package org.jclouds.cloudfiles; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesConstants.java old mode 100755 new mode 100644 similarity index 96% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesConstants.java index e06fa822f0..ede9226234 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesConstants.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.reference; +package org.jclouds.cloudfiles.reference; /** diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesHeaders.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesHeaders.java similarity index 96% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesHeaders.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesHeaders.java index 60325c5170..451f55033b 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesHeaders.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesHeaders.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.reference; +package org.jclouds.cloudfiles.reference; /** @@ -39,4 +39,4 @@ public interface CloudFilesHeaders { public static final String CONTAINER_BYTES_USED = "X-Container-Bytes-Used"; public static final String CONTAINER_OBJECT_COUNT = "X-Container-Object-Count"; public static final String USER_METADATA_PREFIX = "X-Object-Meta-"; -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/package-info.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/package-info.java old mode 100755 new mode 100644 similarity index 94% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/package-info.java rename to apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/package-info.java index a80fba6910..d748ce9b29 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/package-info.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/package-info.java @@ -21,4 +21,4 @@ * This package contains properties and reference data used in Rackspace Cloud Files. * @author Adrian Cole */ -package org.jclouds.rackspace.cloudfiles.reference; \ No newline at end of file +package org.jclouds.cloudfiles.reference; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesClientLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/CloudFilesClientLiveTest.java similarity index 95% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesClientLiveTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/CloudFilesClientLiveTest.java index 37fdba714a..28ded3cf96 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesClientLiveTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/CloudFilesClientLiveTest.java @@ -17,9 +17,9 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles; +package org.jclouds.cloudfiles; -import static org.jclouds.rackspace.cloudfiles.options.ListContainerOptions.Builder.underPath; +import static org.jclouds.cloudfiles.options.ListContainerOptions.Builder.underPath; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -39,14 +39,14 @@ import org.jclouds.crypto.CryptoStreams; import org.jclouds.http.HttpResponseException; import org.jclouds.http.options.GetOptions; import org.jclouds.io.Payloads; -import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; -import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; -import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; -import org.jclouds.rackspace.cloudfiles.options.ListCdnContainerOptions; -import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; +import org.jclouds.cloudfiles.domain.AccountMetadata; +import org.jclouds.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.domain.ContainerCDNMetadata; +import org.jclouds.cloudfiles.domain.ContainerMetadata; +import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata; +import org.jclouds.cloudfiles.domain.ObjectInfo; +import org.jclouds.cloudfiles.options.ListCdnContainerOptions; +import org.jclouds.cloudfiles.options.ListContainerOptions; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/binders/BindCFObjectMetadataToRequestTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/binders/BindCFObjectMetadataToRequestTest.java similarity index 97% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/binders/BindCFObjectMetadataToRequestTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/binders/BindCFObjectMetadataToRequestTest.java index dad78e69b4..6dda5d2e10 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/binders/BindCFObjectMetadataToRequestTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/binders/BindCFObjectMetadataToRequestTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.binders; +package org.jclouds.cloudfiles.binders; import static org.testng.Assert.assertEquals; @@ -30,8 +30,8 @@ import javax.ws.rs.HttpMethod; import org.jclouds.http.HttpRequest; import org.jclouds.io.Payload; import org.jclouds.io.Payloads; -import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.CloudFilesAsyncClient; +import org.jclouds.cloudfiles.domain.CFObject; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextSpec; @@ -152,4 +152,4 @@ public class BindCFObjectMetadataToRequestTest extends RestClientTest createContextSpec() { return new RestContextFactory().createContextSpec("cloudfiles", "identity", "credential", new Properties()); } -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java similarity index 94% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java index 978cdb6480..935b45c307 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore; +package org.jclouds.cloudfiles.blobstore; import static org.testng.Assert.assertEquals; @@ -27,10 +27,10 @@ import java.util.Properties; import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.Blob.Factory; +import org.jclouds.cloudfiles.CloudFilesAsyncClient; +import org.jclouds.cloudfiles.config.CloudFilesRestClientModule; import org.jclouds.http.HttpRequest; -import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; -import org.jclouds.rackspace.cloudfiles.config.CloudFilesRestClientModule; -import org.jclouds.rackspace.cloudservers.TestRackspaceAuthenticationRestClientModule; +import org.jclouds.rackspace.TestRackspaceAuthenticationRestClientModule; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextSpec; @@ -120,4 +120,4 @@ public class CloudFilesBlobRequestSignerTest extends RestClientTest { + Function { public ListContainerOptions apply( - org.jclouds.rackspace.cloudfiles.options.ListContainerOptions[] optionsList) { + org.jclouds.cloudfiles.options.ListContainerOptions[] optionsList) { ListContainerOptions options = new ListContainerOptions(); if (optionsList.length != 0) { if (optionsList[0].getPath() != null && !optionsList[0].getPath().equals("")) { diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ResourceToObjectList.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/functions/ResourceToObjectList.java similarity index 93% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ResourceToObjectList.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/functions/ResourceToObjectList.java index ebd0eaf9fa..a042d6372d 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ResourceToObjectList.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/functions/ResourceToObjectList.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.functions; +package org.jclouds.cloudfiles.blobstore.functions; import javax.inject.Inject; import javax.inject.Singleton; @@ -25,7 +25,7 @@ import javax.inject.Singleton; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.internal.PageSetImpl; -import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; +import org.jclouds.cloudfiles.domain.ObjectInfo; import com.google.common.base.Function; import com.google.common.collect.Iterables; @@ -54,4 +54,4 @@ public class ResourceToObjectList implements }), list.getNextMarker()); } -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java old mode 100755 new mode 100644 similarity index 96% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java index d242c43333..0e2b54de86 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.integration; +package org.jclouds.cloudfiles.blobstore.integration; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest; @@ -51,4 +51,4 @@ public class CloudFilesBlobIntegrationLiveTest extends BaseBlobIntegrationTest { assert blob.getMetadata().getContentMetadata().getContentLanguage() == null; } -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java similarity index 94% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java index 9ab2caa2ba..a95162c5c0 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.integration; +package org.jclouds.cloudfiles.blobstore.integration; import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest; import org.testng.annotations.Test; @@ -30,4 +30,4 @@ import org.testng.annotations.Test; @Test(groups = { "live" }) public class CloudFilesBlobLiveTest extends BaseBlobLiveTest { -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobMapIntegrationLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobMapIntegrationLiveTest.java similarity index 94% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobMapIntegrationLiveTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobMapIntegrationLiveTest.java index f6340f3164..e3df266d9e 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobMapIntegrationLiveTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobMapIntegrationLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.integration; +package org.jclouds.cloudfiles.blobstore.integration; import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; import org.testng.annotations.Test; @@ -28,4 +28,4 @@ import org.testng.annotations.Test; @Test(groups = "live") public class CloudFilesBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest { -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java similarity index 94% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java index 0747b4e302..7186575c48 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.integration; +package org.jclouds.cloudfiles.blobstore.integration; import org.jclouds.blobstore.integration.internal.BaseBlobSignerLiveTest; import org.testng.annotations.Test; @@ -29,4 +29,4 @@ import org.testng.annotations.Test; @Test(groups = { "live" }) public class CloudFilesBlobSignerLiveTest extends BaseBlobSignerLiveTest { -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java old mode 100755 new mode 100644 similarity index 94% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java index e869c1145e..cfddc6dba2 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.integration; +package org.jclouds.cloudfiles.blobstore.integration; import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; import org.testng.annotations.Test; @@ -29,4 +29,4 @@ import org.testng.annotations.Test; @Test(groups = "live") public class CloudFilesContainerIntegrationLiveTest extends BaseContainerIntegrationTest { -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java similarity index 94% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java index dd995eded5..fa3d3054b6 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.integration; +package org.jclouds.cloudfiles.blobstore.integration; import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; import org.testng.annotations.Test; @@ -29,4 +29,4 @@ import org.testng.annotations.Test; @Test(groups = { "live" }) public class CloudFilesContainerLiveTest extends BaseContainerLiveTest { -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesInputStreamMapIntegrationLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesInputStreamMapIntegrationLiveTest.java similarity index 94% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesInputStreamMapIntegrationLiveTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesInputStreamMapIntegrationLiveTest.java index fb16c2ad85..3164db1c8a 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesInputStreamMapIntegrationLiveTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesInputStreamMapIntegrationLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.integration; +package org.jclouds.cloudfiles.blobstore.integration; import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; import org.testng.annotations.Test; @@ -28,4 +28,4 @@ import org.testng.annotations.Test; @Test(groups = "live") public class CloudFilesInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest { -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java similarity index 94% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java index c20d2e04c2..9e804eb5b3 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.integration; +package org.jclouds.cloudfiles.blobstore.integration; import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; import org.testng.annotations.Test; @@ -28,4 +28,4 @@ import org.testng.annotations.Test; @Test(groups = "live") public class CloudFilesServiceIntegrationLiveTest extends BaseServiceIntegrationTest { -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java similarity index 96% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java index 29c9c8cf9d..20d51a5cea 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.blobstore.integration; +package org.jclouds.cloudfiles.blobstore.integration; import java.io.IOException; @@ -46,4 +46,4 @@ public class CloudFilesTestInitializer extends TransientBlobStoreTestInitializer new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential)); } -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/domain/internal/ParseObjectInfoListFromJsonResponseTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/domain/internal/ParseObjectInfoListFromJsonResponseTest.java similarity index 89% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/domain/internal/ParseObjectInfoListFromJsonResponseTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/domain/internal/ParseObjectInfoListFromJsonResponseTest.java index e2870921e6..f8bfa4cc14 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/domain/internal/ParseObjectInfoListFromJsonResponseTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/domain/internal/ParseObjectInfoListFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.domain.internal; +package org.jclouds.cloudfiles.domain.internal; import static org.easymock.EasyMock.expect; import static org.easymock.classextension.EasyMock.createMock; @@ -30,9 +30,9 @@ import java.util.Set; import org.jclouds.crypto.CryptoStreams; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; -import org.jclouds.rackspace.cloudfiles.functions.ParseObjectInfoListFromJsonResponse; -import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; +import org.jclouds.cloudfiles.domain.ObjectInfo; +import org.jclouds.cloudfiles.functions.ParseObjectInfoListFromJsonResponse; +import org.jclouds.cloudfiles.options.ListContainerOptions; import org.jclouds.rackspace.config.RackspaceParserModule; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; @@ -53,7 +53,7 @@ public class ParseObjectInfoListFromJsonResponseTest { Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); public void testApplyInputStream() { - InputStream is = getClass().getResourceAsStream("/cloudfiles/test_list_container.json"); + InputStream is = getClass().getResourceAsStream("/test_list_container.json"); Set expects = Sets.newHashSet(); ObjectInfoImpl one = i.getInstance(ObjectInfoImpl.class); one.name = "test_obj_1"; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseAuthenticationResponseFromHeadersTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseAuthenticationResponseFromHeadersTest.java similarity index 98% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseAuthenticationResponseFromHeadersTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseAuthenticationResponseFromHeadersTest.java index 83bb877b97..8ec27cfc12 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseAuthenticationResponseFromHeadersTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseAuthenticationResponseFromHeadersTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.cloudfiles.functions; import static org.testng.Assert.assertEquals; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java similarity index 92% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java index 2059764ac3..c2fd177406 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.cloudfiles.functions; import static org.testng.Assert.assertEquals; @@ -30,7 +30,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; +import org.jclouds.cloudfiles.domain.ContainerCDNMetadata; import org.jclouds.rackspace.config.RackspaceParserModule; import org.testng.annotations.Test; @@ -52,7 +52,7 @@ public class ParseContainerCDNMetadataListFromJsonResponseTest { @Test public void testApplyInputStream() { - InputStream is = getClass().getResourceAsStream("/cloudfiles/test_list_cdn.json"); + InputStream is = getClass().getResourceAsStream("/test_list_cdn.json"); Set expects = ImmutableSortedSet.of( new ContainerCDNMetadata("adriancole-blobstore.testCDNOperationsContainerWithCDN", false, 3600, URI diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java old mode 100755 new mode 100644 similarity index 95% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java index 581519277e..cec7416e3f --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.cloudfiles.functions; import static org.testng.Assert.assertEquals; @@ -28,7 +28,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; +import org.jclouds.cloudfiles.domain.ContainerMetadata; import org.jclouds.rackspace.config.RackspaceParserModule; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectInfoFromHeadersTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseObjectInfoFromHeadersTest.java similarity index 95% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectInfoFromHeadersTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseObjectInfoFromHeadersTest.java index 11ff4d842e..d970371611 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectInfoFromHeadersTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseObjectInfoFromHeadersTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.functions; +package org.jclouds.cloudfiles.functions; import static org.easymock.EasyMock.expect; import static org.easymock.classextension.EasyMock.createMock; @@ -30,7 +30,7 @@ import org.jclouds.Constants; import org.jclouds.blobstore.reference.BlobStoreConstants; import org.jclouds.http.HttpResponse; import org.jclouds.io.Payloads; -import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; +import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponseTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponseTest.java similarity index 98% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponseTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponseTest.java index f35347702a..d4fff3592c 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponseTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponseTest.java @@ -1,4 +1,4 @@ -package org.jclouds.rackspace.cloudfiles.handlers; +package org.jclouds.cloudfiles.handlers; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.reportMatcher; @@ -98,4 +98,4 @@ public class ParseCloudFilesErrorFromHttpResponseTest { return null; } -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/internal/StubCloudFilesAsyncClient.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/internal/StubCloudFilesAsyncClient.java similarity index 86% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/internal/StubCloudFilesAsyncClient.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/internal/StubCloudFilesAsyncClient.java index 792241bb7b..9241924990 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/internal/StubCloudFilesAsyncClient.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/internal/StubCloudFilesAsyncClient.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.internal; +package org.jclouds.cloudfiles.internal; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.util.concurrent.Futures.immediateFuture; @@ -41,19 +41,19 @@ import org.jclouds.blobstore.functions.HttpGetOptionsListToGetOptions; import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.concurrent.Futures; import org.jclouds.http.options.GetOptions; -import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobToObject; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ListContainerOptionsToBlobStoreListContainerOptions; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlob; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ResourceToObjectInfo; -import org.jclouds.rackspace.cloudfiles.blobstore.functions.ResourceToObjectList; -import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; -import org.jclouds.rackspace.cloudfiles.domain.CFObject; -import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; -import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; -import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; -import org.jclouds.rackspace.cloudfiles.options.ListCdnContainerOptions; +import org.jclouds.cloudfiles.CloudFilesAsyncClient; +import org.jclouds.cloudfiles.blobstore.functions.BlobToObject; +import org.jclouds.cloudfiles.blobstore.functions.ListContainerOptionsToBlobStoreListContainerOptions; +import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlob; +import org.jclouds.cloudfiles.blobstore.functions.ResourceToObjectInfo; +import org.jclouds.cloudfiles.blobstore.functions.ResourceToObjectList; +import org.jclouds.cloudfiles.domain.AccountMetadata; +import org.jclouds.cloudfiles.domain.CFObject; +import org.jclouds.cloudfiles.domain.ContainerCDNMetadata; +import org.jclouds.cloudfiles.domain.ContainerMetadata; +import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata; +import org.jclouds.cloudfiles.domain.ObjectInfo; +import org.jclouds.cloudfiles.options.ListCdnContainerOptions; import com.google.common.base.Function; import com.google.common.collect.Iterables; @@ -153,7 +153,7 @@ public class StubCloudFilesAsyncClient implements CloudFilesAsyncClient { } public ListenableFuture> listContainers( - org.jclouds.rackspace.cloudfiles.options.ListContainerOptions... options) { + org.jclouds.cloudfiles.options.ListContainerOptions... options) { return immediateFuture(Sets.newHashSet(Iterables.transform(blobStore.getContainerToBlobs().keySet(), new Function() { public ContainerMetadata apply(String name) { @@ -163,7 +163,7 @@ public class StubCloudFilesAsyncClient implements CloudFilesAsyncClient { } public ListenableFuture> listObjects(String container, - org.jclouds.rackspace.cloudfiles.options.ListContainerOptions... optionsList) { + org.jclouds.cloudfiles.options.ListContainerOptions... optionsList) { ListContainerOptions options = container2ContainerListOptions.apply(optionsList); return Futures.compose(blobStore.list(container, options), resource2ObjectList, service); } diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/options/ListContainerOptionsTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/options/ListContainerOptionsTest.java similarity index 92% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/options/ListContainerOptionsTest.java rename to apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/options/ListContainerOptionsTest.java index 9e67a599d7..8d1a65634c 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/options/ListContainerOptionsTest.java +++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/options/ListContainerOptionsTest.java @@ -17,18 +17,18 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudfiles.options; +package org.jclouds.cloudfiles.options; -import static org.jclouds.rackspace.cloudfiles.options.ListContainerOptions.Builder.afterMarker; -import static org.jclouds.rackspace.cloudfiles.options.ListContainerOptions.Builder.underPath; -import static org.jclouds.rackspace.cloudfiles.options.ListContainerOptions.Builder.maxResults; -import static org.jclouds.rackspace.cloudfiles.options.ListContainerOptions.Builder.withPrefix; +import static org.jclouds.cloudfiles.options.ListContainerOptions.Builder.afterMarker; +import static org.jclouds.cloudfiles.options.ListContainerOptions.Builder.underPath; +import static org.jclouds.cloudfiles.options.ListContainerOptions.Builder.maxResults; +import static org.jclouds.cloudfiles.options.ListContainerOptions.Builder.withPrefix; import static org.testng.Assert.assertEquals; import java.io.UnsupportedEncodingException; import java.util.Collections; -import org.jclouds.rackspace.cloudfiles.reference.CloudFilesConstants; +import org.jclouds.cloudfiles.reference.CloudFilesConstants; import org.jclouds.http.options.HttpRequestOptions; import org.testng.annotations.Test; diff --git a/rackspace/src/test/resources/log4j.xml b/apis/cloudfiles/src/test/resources/log4j.xml similarity index 100% rename from rackspace/src/test/resources/log4j.xml rename to apis/cloudfiles/src/test/resources/log4j.xml diff --git a/rackspace/src/test/resources/cloudfiles/test_list_cdn.json b/apis/cloudfiles/src/test/resources/test_list_cdn.json similarity index 100% rename from rackspace/src/test/resources/cloudfiles/test_list_cdn.json rename to apis/cloudfiles/src/test/resources/test_list_cdn.json diff --git a/rackspace/src/test/resources/cloudfiles/test_list_container.json b/apis/cloudfiles/src/test/resources/test_list_container.json similarity index 100% rename from rackspace/src/test/resources/cloudfiles/test_list_container.json rename to apis/cloudfiles/src/test/resources/test_list_container.json diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml new file mode 100644 index 0000000000..6e23ac2d58 --- /dev/null +++ b/apis/cloudservers/pom.xml @@ -0,0 +1,145 @@ + + + + + 4.0.0 + + org.jclouds + jclouds-project + 1.0-SNAPSHOT + ../../project/pom.xml + + org.jclouds.api + cloudservers + jcloud cloudservers api + jclouds components to access an implementation of CloudServers + + + https://auth.api.rackspacecloud.com + 1.0 + ${test.rackspace.identity} + ${test.rackspace.credential} + + + + + org.jclouds.common + rackspace-common + ${project.version} + + + org.jclouds + jclouds-compute + ${project.version} + + + org.jclouds + jclouds-core + ${project.version} + test-jar + test + + + org.jclouds.common + rackspace-common + ${project.version} + test-jar + test + + + org.jclouds + jclouds-compute + ${project.version} + test-jar + test + + + org.jclouds + jclouds-jsch + ${project.version} + test + + + org.jclouds + jclouds-log4j + ${project.version} + test + + + log4j + log4j + 1.2.16 + test + + + + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + + test.cloudservers.endpoint + ${test.cloudservers.endpoint} + + + test.cloudservers.apiversion + ${test.cloudservers.apiversion} + + + test.cloudservers.identity + ${test.cloudservers.identity} + + + test.cloudservers.credential + ${test.cloudservers.credential} + + + test.initializer + ${test.initializer} + + + + + + + + + + + + + + diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersAsyncClient.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersAsyncClient.java old mode 100755 new mode 100644 similarity index 88% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersAsyncClient.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersAsyncClient.java index 3bfc636a4e..a8bada5d3b --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersAsyncClient.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersAsyncClient.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers; +package org.jclouds.cloudservers; import java.util.Set; import java.util.concurrent.ExecutionException; @@ -34,26 +34,26 @@ import javax.ws.rs.core.MediaType; import org.jclouds.http.functions.ReturnFalseOn404; import org.jclouds.rackspace.CloudServers; -import org.jclouds.rackspace.cloudservers.binders.BindAdminPassToJsonPayload; -import org.jclouds.rackspace.cloudservers.binders.BindBackupScheduleToJsonPayload; -import org.jclouds.rackspace.cloudservers.binders.BindConfirmResizeToJsonPayload; -import org.jclouds.rackspace.cloudservers.binders.BindCreateImageToJsonPayload; -import org.jclouds.rackspace.cloudservers.binders.BindRebootTypeToJsonPayload; -import org.jclouds.rackspace.cloudservers.binders.BindResizeFlavorToJsonPayload; -import org.jclouds.rackspace.cloudservers.binders.BindRevertResizeToJsonPayload; -import org.jclouds.rackspace.cloudservers.binders.BindServerNameToJsonPayload; -import org.jclouds.rackspace.cloudservers.binders.BindSharedIpGroupToJsonPayload; -import org.jclouds.rackspace.cloudservers.domain.Addresses; -import org.jclouds.rackspace.cloudservers.domain.BackupSchedule; -import org.jclouds.rackspace.cloudservers.domain.Flavor; -import org.jclouds.rackspace.cloudservers.domain.Image; -import org.jclouds.rackspace.cloudservers.domain.RebootType; -import org.jclouds.rackspace.cloudservers.domain.Server; -import org.jclouds.rackspace.cloudservers.domain.SharedIpGroup; -import org.jclouds.rackspace.cloudservers.options.CreateServerOptions; -import org.jclouds.rackspace.cloudservers.options.CreateSharedIpGroupOptions; -import org.jclouds.rackspace.cloudservers.options.ListOptions; -import org.jclouds.rackspace.cloudservers.options.RebuildServerOptions; +import org.jclouds.cloudservers.binders.BindAdminPassToJsonPayload; +import org.jclouds.cloudservers.binders.BindBackupScheduleToJsonPayload; +import org.jclouds.cloudservers.binders.BindConfirmResizeToJsonPayload; +import org.jclouds.cloudservers.binders.BindCreateImageToJsonPayload; +import org.jclouds.cloudservers.binders.BindRebootTypeToJsonPayload; +import org.jclouds.cloudservers.binders.BindResizeFlavorToJsonPayload; +import org.jclouds.cloudservers.binders.BindRevertResizeToJsonPayload; +import org.jclouds.cloudservers.binders.BindServerNameToJsonPayload; +import org.jclouds.cloudservers.binders.BindSharedIpGroupToJsonPayload; +import org.jclouds.cloudservers.domain.Addresses; +import org.jclouds.cloudservers.domain.BackupSchedule; +import org.jclouds.cloudservers.domain.Flavor; +import org.jclouds.cloudservers.domain.Image; +import org.jclouds.cloudservers.domain.RebootType; +import org.jclouds.cloudservers.domain.Server; +import org.jclouds.cloudservers.domain.SharedIpGroup; +import org.jclouds.cloudservers.options.CreateServerOptions; +import org.jclouds.cloudservers.options.CreateSharedIpGroupOptions; +import org.jclouds.cloudservers.options.ListOptions; +import org.jclouds.cloudservers.options.RebuildServerOptions; import org.jclouds.rackspace.filters.AddTimestampQuery; import org.jclouds.rackspace.filters.AuthenticateRequest; import org.jclouds.rest.annotations.BinderParam; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersClient.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersClient.java old mode 100755 new mode 100644 similarity index 94% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersClient.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersClient.java index bf82a059fe..47239a3564 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersClient.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersClient.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers; +package org.jclouds.cloudservers; import java.util.Set; import java.util.concurrent.ExecutionException; @@ -26,17 +26,17 @@ import java.util.concurrent.TimeUnit; import javax.ws.rs.PathParam; import org.jclouds.concurrent.Timeout; -import org.jclouds.rackspace.cloudservers.domain.Addresses; -import org.jclouds.rackspace.cloudservers.domain.BackupSchedule; -import org.jclouds.rackspace.cloudservers.domain.Flavor; -import org.jclouds.rackspace.cloudservers.domain.Image; -import org.jclouds.rackspace.cloudservers.domain.RebootType; -import org.jclouds.rackspace.cloudservers.domain.Server; -import org.jclouds.rackspace.cloudservers.domain.SharedIpGroup; -import org.jclouds.rackspace.cloudservers.options.CreateServerOptions; -import org.jclouds.rackspace.cloudservers.options.CreateSharedIpGroupOptions; -import org.jclouds.rackspace.cloudservers.options.ListOptions; -import org.jclouds.rackspace.cloudservers.options.RebuildServerOptions; +import org.jclouds.cloudservers.domain.Addresses; +import org.jclouds.cloudservers.domain.BackupSchedule; +import org.jclouds.cloudservers.domain.Flavor; +import org.jclouds.cloudservers.domain.Image; +import org.jclouds.cloudservers.domain.RebootType; +import org.jclouds.cloudservers.domain.Server; +import org.jclouds.cloudservers.domain.SharedIpGroup; +import org.jclouds.cloudservers.options.CreateServerOptions; +import org.jclouds.cloudservers.options.CreateSharedIpGroupOptions; +import org.jclouds.cloudservers.options.ListOptions; +import org.jclouds.cloudservers.options.RebuildServerOptions; import org.jclouds.rest.ResourceNotFoundException; import java.util.concurrent.Future; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersContextBuilder.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersContextBuilder.java old mode 100755 new mode 100644 similarity index 90% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersContextBuilder.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersContextBuilder.java index 1b49ba0b13..c321ad27ba --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersContextBuilder.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersContextBuilder.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers; +package org.jclouds.cloudservers; import java.util.List; import java.util.Properties; @@ -25,8 +25,8 @@ import java.util.Properties; import org.jclouds.compute.ComputeServiceContextBuilder; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.logging.jdk.config.JDKLoggingModule; -import org.jclouds.rackspace.cloudservers.compute.config.CloudServersComputeServiceContextModule; -import org.jclouds.rackspace.cloudservers.config.CloudServersRestClientModule; +import org.jclouds.cloudservers.compute.config.CloudServersComputeServiceContextModule; +import org.jclouds.cloudservers.config.CloudServersRestClientModule; import com.google.inject.Injector; import com.google.inject.Module; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindAdminPassToJsonPayload.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindAdminPassToJsonPayload.java similarity index 97% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindAdminPassToJsonPayload.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindAdminPassToJsonPayload.java index 87c6b8e8af..06d148b0fa 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindAdminPassToJsonPayload.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindAdminPassToJsonPayload.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindBackupScheduleToJsonPayload.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindBackupScheduleToJsonPayload.java similarity index 93% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindBackupScheduleToJsonPayload.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindBackupScheduleToJsonPayload.java index 0e81998403..f12cfde2cf 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindBackupScheduleToJsonPayload.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindBackupScheduleToJsonPayload.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import static com.google.common.base.Preconditions.checkArgument; @@ -26,7 +26,7 @@ import java.util.Map; import javax.inject.Singleton; import org.jclouds.http.HttpRequest; -import org.jclouds.rackspace.cloudservers.domain.BackupSchedule; +import org.jclouds.cloudservers.domain.BackupSchedule; import org.jclouds.rest.binders.BindToJsonPayload; import com.google.common.collect.ImmutableMap; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindConfirmResizeToJsonPayload.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindConfirmResizeToJsonPayload.java similarity index 95% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindConfirmResizeToJsonPayload.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindConfirmResizeToJsonPayload.java index 0e7f70b52d..9b3b22c86e 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindConfirmResizeToJsonPayload.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindConfirmResizeToJsonPayload.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import javax.inject.Singleton; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindCreateImageToJsonPayload.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindCreateImageToJsonPayload.java similarity index 97% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindCreateImageToJsonPayload.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindCreateImageToJsonPayload.java index 3cd5af4159..bb5e038c2b 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindCreateImageToJsonPayload.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindCreateImageToJsonPayload.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindRebootTypeToJsonPayload.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindRebootTypeToJsonPayload.java similarity index 93% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindRebootTypeToJsonPayload.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindRebootTypeToJsonPayload.java index 7b28bc8b26..98902075cc 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindRebootTypeToJsonPayload.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindRebootTypeToJsonPayload.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -27,7 +27,7 @@ import java.util.Map; import javax.inject.Singleton; import org.jclouds.http.HttpRequest; -import org.jclouds.rackspace.cloudservers.domain.RebootType; +import org.jclouds.cloudservers.domain.RebootType; import org.jclouds.rest.binders.BindToJsonPayload; import com.google.common.collect.ImmutableMap; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindResizeFlavorToJsonPayload.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindResizeFlavorToJsonPayload.java similarity index 97% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindResizeFlavorToJsonPayload.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindResizeFlavorToJsonPayload.java index 213694114c..053383552a 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindResizeFlavorToJsonPayload.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindResizeFlavorToJsonPayload.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindRevertResizeToJsonPayload.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindRevertResizeToJsonPayload.java similarity index 95% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindRevertResizeToJsonPayload.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindRevertResizeToJsonPayload.java index 08ad3fec25..86dd21172e 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindRevertResizeToJsonPayload.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindRevertResizeToJsonPayload.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import javax.inject.Singleton; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindServerNameToJsonPayload.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindServerNameToJsonPayload.java similarity index 97% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindServerNameToJsonPayload.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindServerNameToJsonPayload.java index ec64d7733f..0519e131b5 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindServerNameToJsonPayload.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindServerNameToJsonPayload.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindSharedIpGroupToJsonPayload.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindSharedIpGroupToJsonPayload.java similarity index 97% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindSharedIpGroupToJsonPayload.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindSharedIpGroupToJsonPayload.java index b7f4ab79e3..332d667e96 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindSharedIpGroupToJsonPayload.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindSharedIpGroupToJsonPayload.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersBindComputeStrategiesByClass.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersBindComputeStrategiesByClass.java similarity index 82% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersBindComputeStrategiesByClass.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersBindComputeStrategiesByClass.java index ac7835a81b..99923bde57 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersBindComputeStrategiesByClass.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersBindComputeStrategiesByClass.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.config; +package org.jclouds.cloudservers.compute.config; import org.jclouds.compute.config.BindComputeStrategiesByClass; import org.jclouds.compute.strategy.AddNodeWithTagStrategy; @@ -27,11 +27,11 @@ import org.jclouds.compute.strategy.ListNodesStrategy; import org.jclouds.compute.strategy.RebootNodeStrategy; import org.jclouds.compute.strategy.ResumeNodeStrategy; import org.jclouds.compute.strategy.SuspendNodeStrategy; -import org.jclouds.rackspace.cloudservers.compute.strategy.CloudServersAddNodeWithTagStrategy; -import org.jclouds.rackspace.cloudservers.compute.strategy.CloudServersDestroyNodeStrategy; -import org.jclouds.rackspace.cloudservers.compute.strategy.CloudServersGetNodeMetadataStrategy; -import org.jclouds.rackspace.cloudservers.compute.strategy.CloudServersListNodesStrategy; -import org.jclouds.rackspace.cloudservers.compute.strategy.CloudServersLifeCycleStrategy; +import org.jclouds.cloudservers.compute.strategy.CloudServersAddNodeWithTagStrategy; +import org.jclouds.cloudservers.compute.strategy.CloudServersDestroyNodeStrategy; +import org.jclouds.cloudservers.compute.strategy.CloudServersGetNodeMetadataStrategy; +import org.jclouds.cloudservers.compute.strategy.CloudServersListNodesStrategy; +import org.jclouds.cloudservers.compute.strategy.CloudServersLifeCycleStrategy; /** * @@ -74,4 +74,4 @@ public class CloudServersBindComputeStrategiesByClass extends BindComputeStrateg protected Class defineStopNodeStrategy() { return CloudServersLifeCycleStrategy.class; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersBindComputeSuppliersByClass.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersBindComputeSuppliersByClass.java similarity index 87% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersBindComputeSuppliersByClass.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersBindComputeSuppliersByClass.java index be44ec71fd..68e1cfdf33 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersBindComputeSuppliersByClass.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersBindComputeSuppliersByClass.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.config; +package org.jclouds.cloudservers.compute.config; import java.util.Set; @@ -25,8 +25,8 @@ import org.jclouds.compute.config.BindComputeSuppliersByClass; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.Image; import org.jclouds.domain.Location; -import org.jclouds.rackspace.cloudservers.compute.suppliers.CloudServersHardwareSupplier; -import org.jclouds.rackspace.cloudservers.compute.suppliers.CloudServersImageSupplier; +import org.jclouds.cloudservers.compute.suppliers.CloudServersHardwareSupplier; +import org.jclouds.cloudservers.compute.suppliers.CloudServersImageSupplier; import org.jclouds.rackspace.config.RackspaceLocationsSupplier; import com.google.common.base.Supplier; @@ -51,4 +51,4 @@ public class CloudServersBindComputeSuppliersByClass extends BindComputeSupplier protected Class>> defineLocationSupplier() { return RackspaceLocationsSupplier.class; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModule.java old mode 100755 new mode 100644 similarity index 95% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModule.java index 91be884115..5120f25837 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModule.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.config; +package org.jclouds.cloudservers.compute.config; import org.jclouds.compute.config.BaseComputeServiceContextModule; import org.jclouds.compute.internal.BaseComputeService; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceDependenciesModule.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceDependenciesModule.java similarity index 82% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceDependenciesModule.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceDependenciesModule.java index 9f71b4ac50..f99223d13c 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceDependenciesModule.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceDependenciesModule.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.config; +package org.jclouds.cloudservers.compute.config; import java.util.Map; @@ -31,15 +31,15 @@ import org.jclouds.compute.domain.NodeState; import org.jclouds.compute.domain.OperatingSystem; import org.jclouds.compute.internal.BaseComputeService; import org.jclouds.compute.internal.ComputeServiceContextImpl; -import org.jclouds.rackspace.cloudservers.CloudServersAsyncClient; -import org.jclouds.rackspace.cloudservers.CloudServersClient; -import org.jclouds.rackspace.cloudservers.compute.functions.CloudServersImageToImage; -import org.jclouds.rackspace.cloudservers.compute.functions.CloudServersImageToOperatingSystem; -import org.jclouds.rackspace.cloudservers.compute.functions.FlavorToHardware; -import org.jclouds.rackspace.cloudservers.compute.functions.ServerToNodeMetadata; -import org.jclouds.rackspace.cloudservers.domain.Flavor; -import org.jclouds.rackspace.cloudservers.domain.Server; -import org.jclouds.rackspace.cloudservers.domain.ServerStatus; +import org.jclouds.cloudservers.CloudServersAsyncClient; +import org.jclouds.cloudservers.CloudServersClient; +import org.jclouds.cloudservers.compute.functions.CloudServersImageToImage; +import org.jclouds.cloudservers.compute.functions.CloudServersImageToOperatingSystem; +import org.jclouds.cloudservers.compute.functions.FlavorToHardware; +import org.jclouds.cloudservers.compute.functions.ServerToNodeMetadata; +import org.jclouds.cloudservers.domain.Flavor; +import org.jclouds.cloudservers.domain.Server; +import org.jclouds.cloudservers.domain.ServerStatus; import org.jclouds.rest.RestContext; import org.jclouds.rest.internal.RestContextImpl; @@ -64,10 +64,10 @@ public class CloudServersComputeServiceDependenciesModule extends AbstractModule bind(new TypeLiteral>() { }).to(ServerToNodeMetadata.class); - bind(new TypeLiteral>() { + bind(new TypeLiteral>() { }).to(CloudServersImageToImage.class); - bind(new TypeLiteral>() { + bind(new TypeLiteral>() { }).to(CloudServersImageToOperatingSystem.class); bind(new TypeLiteral>() { diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToImage.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/CloudServersImageToImage.java similarity index 79% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToImage.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/CloudServersImageToImage.java index 9d5575a573..49974cc005 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToImage.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/CloudServersImageToImage.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.functions; +package org.jclouds.cloudservers.compute.functions; import javax.inject.Inject; import javax.inject.Singleton; @@ -34,15 +34,15 @@ import com.google.common.base.Function; * @author Adrian Cole */ @Singleton -public class CloudServersImageToImage implements Function { - private final Function imageToOs; +public class CloudServersImageToImage implements Function { + private final Function imageToOs; @Inject - CloudServersImageToImage(Function imageToOs) { + CloudServersImageToImage(Function imageToOs) { this.imageToOs = imageToOs; } - public Image apply(org.jclouds.rackspace.cloudservers.domain.Image from) { + public Image apply(org.jclouds.cloudservers.domain.Image from) { ImageBuilder builder = new ImageBuilder(); builder.ids(from.getId() + ""); builder.name(from.getName()); @@ -53,4 +53,4 @@ public class CloudServersImageToImage implements Function { + Function { public static final Pattern DEFAULT_PATTERN = Pattern.compile("(([^ ]*) ([0-9.]+) ?.*)"); // Windows Server 2008 R2 x64 public static final Pattern WINDOWS_PATTERN = Pattern.compile("Windows (.*) (x[86][64])"); @@ -58,7 +58,7 @@ public class CloudServersImageToOperatingSystem implements this.osVersionMap = osVersionMap; } - public OperatingSystem apply(final org.jclouds.rackspace.cloudservers.domain.Image from) { + public OperatingSystem apply(final org.jclouds.cloudservers.domain.Image from) { OsFamily osFamily = null; String osName = null; String osArch = null; @@ -89,4 +89,4 @@ public class CloudServersImageToOperatingSystem implements } return new OperatingSystem(osFamily, osName, osVersion, osArch, osDescription, is64Bit); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/FlavorToHardware.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/FlavorToHardware.java similarity index 92% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/FlavorToHardware.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/FlavorToHardware.java index dcefae5d63..a2e37949d0 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/FlavorToHardware.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/FlavorToHardware.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.functions; +package org.jclouds.cloudservers.compute.functions; import javax.inject.Singleton; @@ -26,7 +26,7 @@ import org.jclouds.compute.domain.HardwareBuilder; import org.jclouds.compute.domain.Processor; import org.jclouds.compute.domain.Volume; import org.jclouds.compute.domain.internal.VolumeImpl; -import org.jclouds.rackspace.cloudservers.domain.Flavor; +import org.jclouds.cloudservers.domain.Flavor; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; @@ -41,4 +41,4 @@ public class FlavorToHardware implements Function { .processors(ImmutableList.of(new Processor(from.getDisk() / 10.0, 1.0))).ram(from.getRam()) .volumes(ImmutableList. of(new VolumeImpl((float) from.getDisk(), true, true))).build(); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/ServerToNodeMetadata.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/ServerToNodeMetadata.java similarity index 96% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/ServerToNodeMetadata.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/ServerToNodeMetadata.java index b157f8fa31..d30a2c6747 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/ServerToNodeMetadata.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/ServerToNodeMetadata.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.functions; +package org.jclouds.cloudservers.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.compute.util.ComputeServiceUtils.parseTagFromName; @@ -42,8 +42,8 @@ import org.jclouds.domain.Location; import org.jclouds.domain.LocationScope; import org.jclouds.domain.internal.LocationImpl; import org.jclouds.logging.Logger; -import org.jclouds.rackspace.cloudservers.domain.Server; -import org.jclouds.rackspace.cloudservers.domain.ServerStatus; +import org.jclouds.cloudservers.domain.Server; +import org.jclouds.cloudservers.domain.ServerStatus; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -136,4 +136,4 @@ public class ServerToNodeMetadata implements Function { } return null; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersAddNodeWithTagStrategy.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersAddNodeWithTagStrategy.java similarity index 92% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersAddNodeWithTagStrategy.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersAddNodeWithTagStrategy.java index c8ee543bb4..781155ede1 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersAddNodeWithTagStrategy.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersAddNodeWithTagStrategy.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.strategy; +package org.jclouds.cloudservers.compute.strategy; import static com.google.common.base.Preconditions.checkNotNull; @@ -30,8 +30,8 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.Template; import org.jclouds.compute.strategy.AddNodeWithTagStrategy; import org.jclouds.domain.Credentials; -import org.jclouds.rackspace.cloudservers.CloudServersClient; -import org.jclouds.rackspace.cloudservers.domain.Server; +import org.jclouds.cloudservers.CloudServersClient; +import org.jclouds.cloudservers.domain.Server; import com.google.common.base.Function; @@ -60,4 +60,4 @@ public class CloudServersAddNodeWithTagStrategy implements AddNodeWithTagStrateg return serverToNodeMetadata.apply(from); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersDestroyNodeStrategy.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersDestroyNodeStrategy.java similarity index 92% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersDestroyNodeStrategy.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersDestroyNodeStrategy.java index 3d32e5fbf2..898343f292 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersDestroyNodeStrategy.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersDestroyNodeStrategy.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.strategy; +package org.jclouds.cloudservers.compute.strategy; import javax.inject.Inject; import javax.inject.Singleton; @@ -25,7 +25,7 @@ import javax.inject.Singleton; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.strategy.DestroyNodeStrategy; import org.jclouds.compute.strategy.GetNodeMetadataStrategy; -import org.jclouds.rackspace.cloudservers.CloudServersClient; +import org.jclouds.cloudservers.CloudServersClient; /** * @author Adrian Cole @@ -49,4 +49,4 @@ public class CloudServersDestroyNodeStrategy implements DestroyNodeStrategy { return getNode.getNode(id); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersGetNodeMetadataStrategy.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersGetNodeMetadataStrategy.java similarity index 90% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersGetNodeMetadataStrategy.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersGetNodeMetadataStrategy.java index 7424db360b..7807b1aa8e 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersGetNodeMetadataStrategy.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersGetNodeMetadataStrategy.java @@ -17,15 +17,15 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.strategy; +package org.jclouds.cloudservers.compute.strategy; import javax.inject.Inject; import javax.inject.Singleton; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.strategy.GetNodeMetadataStrategy; -import org.jclouds.rackspace.cloudservers.CloudServersClient; -import org.jclouds.rackspace.cloudservers.domain.Server; +import org.jclouds.cloudservers.CloudServersClient; +import org.jclouds.cloudservers.domain.Server; import com.google.common.base.Function; @@ -51,4 +51,4 @@ public class CloudServersGetNodeMetadataStrategy implements GetNodeMetadataStrat Server server = client.getServer(serverId); return server == null ? null : serverToNodeMetadata.apply(server); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersLifeCycleStrategy.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersLifeCycleStrategy.java similarity index 91% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersLifeCycleStrategy.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersLifeCycleStrategy.java index d115508e2a..94d159fee6 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersLifeCycleStrategy.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersLifeCycleStrategy.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.strategy; +package org.jclouds.cloudservers.compute.strategy; import javax.inject.Inject; import javax.inject.Singleton; @@ -27,8 +27,8 @@ import org.jclouds.compute.strategy.GetNodeMetadataStrategy; import org.jclouds.compute.strategy.RebootNodeStrategy; import org.jclouds.compute.strategy.ResumeNodeStrategy; import org.jclouds.compute.strategy.SuspendNodeStrategy; -import org.jclouds.rackspace.cloudservers.CloudServersClient; -import org.jclouds.rackspace.cloudservers.domain.RebootType; +import org.jclouds.cloudservers.CloudServersClient; +import org.jclouds.cloudservers.domain.RebootType; /** * @author Adrian Cole @@ -62,4 +62,4 @@ public class CloudServersLifeCycleStrategy implements RebootNodeStrategy, Suspen throw new UnsupportedOperationException("resume not supported"); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersListNodesStrategy.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersListNodesStrategy.java similarity index 89% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersListNodesStrategy.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersListNodesStrategy.java index 1c41ea6834..d7546ca87d 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersListNodesStrategy.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersListNodesStrategy.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.strategy; +package org.jclouds.cloudservers.compute.strategy; import javax.inject.Inject; import javax.inject.Singleton; @@ -26,9 +26,9 @@ import org.jclouds.compute.domain.ComputeMetadata; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.predicates.NodePredicates; import org.jclouds.compute.strategy.ListNodesStrategy; -import org.jclouds.rackspace.cloudservers.CloudServersClient; -import org.jclouds.rackspace.cloudservers.domain.Server; -import org.jclouds.rackspace.cloudservers.options.ListOptions; +import org.jclouds.cloudservers.CloudServersClient; +import org.jclouds.cloudservers.domain.Server; +import org.jclouds.cloudservers.options.ListOptions; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -59,4 +59,4 @@ public class CloudServersListNodesStrategy implements ListNodesStrategy { return Iterables.filter(Iterables.transform(client.listServers(ListOptions.Builder.withDetails()), serverToNodeMetadata), filter); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/suppliers/CloudServersHardwareSupplier.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/suppliers/CloudServersHardwareSupplier.java similarity index 88% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/suppliers/CloudServersHardwareSupplier.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/suppliers/CloudServersHardwareSupplier.java index 9440e9c214..1df22d4267 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/suppliers/CloudServersHardwareSupplier.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/suppliers/CloudServersHardwareSupplier.java @@ -17,9 +17,9 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.suppliers; +package org.jclouds.cloudservers.compute.suppliers; -import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.withDetails; +import static org.jclouds.cloudservers.options.ListOptions.Builder.withDetails; import java.util.Set; @@ -31,8 +31,8 @@ import javax.inject.Singleton; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.logging.Logger; -import org.jclouds.rackspace.cloudservers.CloudServersClient; -import org.jclouds.rackspace.cloudservers.domain.Flavor; +import org.jclouds.cloudservers.CloudServersClient; +import org.jclouds.cloudservers.domain.Flavor; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -65,4 +65,4 @@ public class CloudServersHardwareSupplier implements Supplier> protected Logger logger = Logger.NULL; protected final CloudServersClient sync; - protected final Function cloudServersImageToImage; + protected final Function cloudServersImageToImage; @Inject CloudServersImageSupplier(CloudServersClient sync, - Function cloudServersImageToImage) { + Function cloudServersImageToImage) { this.sync = sync; this.cloudServersImageToImage = cloudServersImageToImage; } @@ -68,4 +68,4 @@ public class CloudServersImageSupplier implements Supplier> logger.debug("<< images(%d)", images.size()); return images; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/config/CloudServersRestClientModule.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/config/CloudServersRestClientModule.java old mode 100755 new mode 100644 similarity index 89% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/config/CloudServersRestClientModule.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/config/CloudServersRestClientModule.java index ef0884f492..469eaa3bb7 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/config/CloudServersRestClientModule.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/config/CloudServersRestClientModule.java @@ -17,16 +17,16 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.config; +package org.jclouds.cloudservers.config; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.RequiresHttp; import org.jclouds.http.annotation.ClientError; import org.jclouds.http.annotation.Redirection; import org.jclouds.http.annotation.ServerError; -import org.jclouds.rackspace.cloudservers.CloudServersAsyncClient; -import org.jclouds.rackspace.cloudservers.CloudServersClient; -import org.jclouds.rackspace.cloudservers.handlers.ParseCloudServersErrorFromHttpResponse; +import org.jclouds.cloudservers.CloudServersAsyncClient; +import org.jclouds.cloudservers.CloudServersClient; +import org.jclouds.cloudservers.handlers.ParseCloudServersErrorFromHttpResponse; import org.jclouds.rackspace.config.RackspaceAuthenticationRestModule; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.config.RestClientModule; @@ -69,4 +69,4 @@ public class CloudServersRestClientModule extends ParseCloudServersErrorFromHttpResponse.class); } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/AbsoluteLimit.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java similarity index 95% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/AbsoluteLimit.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java index 11e312db6d..cc8d7edbd2 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/AbsoluteLimit.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; /** diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Action.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Action.java similarity index 94% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Action.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Action.java index b64a9cb9c9..5d858b1000 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Action.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Action.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; /** * diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Addresses.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Addresses.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java index 37dc807641..dcd6d62be1 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Addresses.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; import java.util.Set; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/BackupSchedule.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/BackupSchedule.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java index e7b56206e6..e8d8df6af2 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/BackupSchedule.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; /** * A backup schedule can be defined to create server images at regular intervals (daily and weekly). diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/DailyBackup.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/DailyBackup.java similarity index 96% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/DailyBackup.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/DailyBackup.java index af1695863f..93a8d9b5d5 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/DailyBackup.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/DailyBackup.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; public enum DailyBackup { diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Flavor.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Flavor.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java index 07019105d4..b577175738 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Flavor.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; /** * diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Image.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Image.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java index 1ab8679eb3..19090c88d8 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Image.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; import java.util.Date; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/ImageStatus.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ImageStatus.java similarity index 96% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/ImageStatus.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ImageStatus.java index c043209d86..bcf6e9dccf 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/ImageStatus.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ImageStatus.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; /** * In-flight images will have the status attribute set to SAVING and the conditional progress diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Limits.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java similarity index 96% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Limits.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java index 040a230af3..ce28dd3d04 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Limits.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; import java.util.List; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RateLimit.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RateLimit.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java index 095dd82f4f..ad1bc5a142 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RateLimit.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; import javax.ws.rs.HttpMethod; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RateLimitUnit.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimitUnit.java similarity index 95% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RateLimitUnit.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimitUnit.java index 21c097007a..88655258c4 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RateLimitUnit.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimitUnit.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; public enum RateLimitUnit { diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RebootType.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RebootType.java similarity index 95% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RebootType.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RebootType.java index cf85d5afa6..583db31a58 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RebootType.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RebootType.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; /** * diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Server.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java similarity index 99% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Server.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java index 79d7eb2d09..c04aa7470d 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Server.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; import java.util.Map; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/ServerStatus.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ServerStatus.java similarity index 97% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/ServerStatus.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ServerStatus.java index bcfc859ef7..fc8885b214 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/ServerStatus.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ServerStatus.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; /** * diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/ShareIp.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java similarity index 96% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/ShareIp.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java index 8a81e2fc85..fbe9217eca 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/ShareIp.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; public class ShareIp { diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/SharedIpGroup.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/SharedIpGroup.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java index 101a4270c9..a3c343462d 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/SharedIpGroup.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; import java.util.List; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Version.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java similarity index 96% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Version.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java index f0979f2507..8241ff9859 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/Version.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; public class Version { @@ -57,4 +57,4 @@ public class Version { public String getWadl() { return wadl; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/VersionStatus.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/VersionStatus.java similarity index 95% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/VersionStatus.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/VersionStatus.java index 74eb5704b3..927b84856a 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/VersionStatus.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/VersionStatus.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; public enum VersionStatus { diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/WeeklyBackup.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/WeeklyBackup.java similarity index 95% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/WeeklyBackup.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/WeeklyBackup.java index cdec0e43ed..8a64ed51f8 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/WeeklyBackup.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/WeeklyBackup.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; public enum WeeklyBackup { diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/handlers/ParseCloudServersErrorFromHttpResponse.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/handlers/ParseCloudServersErrorFromHttpResponse.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/handlers/ParseCloudServersErrorFromHttpResponse.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/handlers/ParseCloudServersErrorFromHttpResponse.java index 354d7923c8..c50023116c 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/handlers/ParseCloudServersErrorFromHttpResponse.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/handlers/ParseCloudServersErrorFromHttpResponse.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.handlers; +package org.jclouds.cloudservers.handlers; import static org.jclouds.http.HttpUtils.releasePayload; @@ -93,4 +93,4 @@ public class ParseCloudServersErrorFromHttpResponse implements HttpErrorHandler } return null; } -} \ No newline at end of file +} diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/CreateServerOptions.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/CreateServerOptions.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/CreateServerOptions.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/CreateServerOptions.java index c3a80656b2..fbc4cc1ce8 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/CreateServerOptions.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/CreateServerOptions.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.options; +package org.jclouds.cloudservers.options; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -29,7 +29,7 @@ import java.util.Map.Entry; import org.jclouds.encryption.internal.Base64; import org.jclouds.http.HttpRequest; -import org.jclouds.rackspace.cloudservers.domain.Addresses; +import org.jclouds.cloudservers.domain.Addresses; import org.jclouds.rest.binders.BindToJsonPayload; import com.google.common.collect.ImmutableMap; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptions.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptions.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptions.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptions.java index a3d7f6ba19..639dfc16d7 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptions.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptions.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.options; +package org.jclouds.cloudservers.options; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/ListOptions.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/ListOptions.java similarity index 98% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/ListOptions.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/ListOptions.java index 90dccd5544..3eafe9c58a 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/ListOptions.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/ListOptions.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.options; +package org.jclouds.cloudservers.options; import java.util.Date; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/RebuildServerOptions.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/RebuildServerOptions.java similarity index 97% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/RebuildServerOptions.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/RebuildServerOptions.java index 8b89f4b108..ba037d6af0 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/RebuildServerOptions.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/RebuildServerOptions.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.options; +package org.jclouds.cloudservers.options; import static com.google.common.base.Preconditions.checkArgument; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/predicates/ServerActive.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerActive.java similarity index 88% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/predicates/ServerActive.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerActive.java index 40ebe9f70d..2c98602e7d 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/predicates/ServerActive.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerActive.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.predicates; +package org.jclouds.cloudservers.predicates; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,9 +25,9 @@ import javax.annotation.Resource; import javax.inject.Singleton; import org.jclouds.logging.Logger; -import org.jclouds.rackspace.cloudservers.CloudServersClient; -import org.jclouds.rackspace.cloudservers.domain.Server; -import org.jclouds.rackspace.cloudservers.domain.ServerStatus; +import org.jclouds.cloudservers.CloudServersClient; +import org.jclouds.cloudservers.domain.Server; +import org.jclouds.cloudservers.domain.ServerStatus; import com.google.common.base.Predicate; import com.google.inject.Inject; diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/predicates/ServerDeleted.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerDeleted.java similarity index 88% rename from rackspace/src/main/java/org/jclouds/rackspace/cloudservers/predicates/ServerDeleted.java rename to apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerDeleted.java index 19a63bf5ea..a875fab29d 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/predicates/ServerDeleted.java +++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerDeleted.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.predicates; +package org.jclouds.cloudservers.predicates; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,9 +25,9 @@ import javax.annotation.Resource; import javax.inject.Singleton; import org.jclouds.logging.Logger; -import org.jclouds.rackspace.cloudservers.CloudServersClient; -import org.jclouds.rackspace.cloudservers.domain.Server; -import org.jclouds.rackspace.cloudservers.domain.ServerStatus; +import org.jclouds.cloudservers.CloudServersClient; +import org.jclouds.cloudservers.domain.Server; +import org.jclouds.cloudservers.domain.ServerStatus; import com.google.common.base.Predicate; import com.google.inject.Inject; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersAsyncClientTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersAsyncClientTest.java old mode 100755 new mode 100644 similarity index 96% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersAsyncClientTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersAsyncClientTest.java index dddbe22e11..bcbb9d89fe --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersAsyncClientTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersAsyncClientTest.java @@ -17,15 +17,15 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers; +package org.jclouds.cloudservers; -import static org.jclouds.rackspace.cloudservers.options.CreateServerOptions.Builder.withFile; -import static org.jclouds.rackspace.cloudservers.options.CreateServerOptions.Builder.withMetadata; -import static org.jclouds.rackspace.cloudservers.options.CreateServerOptions.Builder.withSharedIpGroup; -import static org.jclouds.rackspace.cloudservers.options.CreateSharedIpGroupOptions.Builder.withServer; -import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.changesSince; -import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.withDetails; -import static org.jclouds.rackspace.cloudservers.options.RebuildServerOptions.Builder.withImage; +import static org.jclouds.cloudservers.options.CreateServerOptions.Builder.withFile; +import static org.jclouds.cloudservers.options.CreateServerOptions.Builder.withMetadata; +import static org.jclouds.cloudservers.options.CreateServerOptions.Builder.withSharedIpGroup; +import static org.jclouds.cloudservers.options.CreateSharedIpGroupOptions.Builder.withServer; +import static org.jclouds.cloudservers.options.ListOptions.Builder.changesSince; +import static org.jclouds.cloudservers.options.ListOptions.Builder.withDetails; +import static org.jclouds.cloudservers.options.RebuildServerOptions.Builder.withImage; import static org.testng.Assert.assertEquals; import java.io.IOException; @@ -41,15 +41,16 @@ import org.jclouds.http.functions.ReleasePayloadAndReturn; import org.jclouds.http.functions.ReturnFalseOn404; import org.jclouds.http.functions.ReturnTrueIf2xx; import org.jclouds.http.functions.UnwrapOnlyJsonValue; -import org.jclouds.rackspace.cloudservers.config.CloudServersRestClientModule; -import org.jclouds.rackspace.cloudservers.domain.BackupSchedule; -import org.jclouds.rackspace.cloudservers.domain.DailyBackup; -import org.jclouds.rackspace.cloudservers.domain.RebootType; -import org.jclouds.rackspace.cloudservers.domain.WeeklyBackup; -import org.jclouds.rackspace.cloudservers.options.CreateServerOptions; -import org.jclouds.rackspace.cloudservers.options.CreateSharedIpGroupOptions; -import org.jclouds.rackspace.cloudservers.options.ListOptions; -import org.jclouds.rackspace.cloudservers.options.RebuildServerOptions; +import org.jclouds.cloudservers.config.CloudServersRestClientModule; +import org.jclouds.cloudservers.domain.BackupSchedule; +import org.jclouds.cloudservers.domain.DailyBackup; +import org.jclouds.cloudservers.domain.RebootType; +import org.jclouds.cloudservers.domain.WeeklyBackup; +import org.jclouds.cloudservers.options.CreateServerOptions; +import org.jclouds.cloudservers.options.CreateSharedIpGroupOptions; +import org.jclouds.cloudservers.options.ListOptions; +import org.jclouds.cloudservers.options.RebuildServerOptions; +import org.jclouds.rackspace.TestRackspaceAuthenticationRestClientModule; import org.jclouds.rackspace.filters.AddTimestampQuery; import org.jclouds.rackspace.filters.AuthenticateRequest; import org.jclouds.rest.RestClientTest; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersClientLiveTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientLiveTest.java old mode 100755 new mode 100644 similarity index 96% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersClientLiveTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientLiveTest.java index b1ee1b4572..8067c9c2fd --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersClientLiveTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientLiveTest.java @@ -17,12 +17,12 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers; +package org.jclouds.cloudservers; import static com.google.common.base.Preconditions.checkNotNull; -import static org.jclouds.rackspace.cloudservers.options.CreateServerOptions.Builder.withFile; -import static org.jclouds.rackspace.cloudservers.options.CreateSharedIpGroupOptions.Builder.withServer; -import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.withDetails; +import static org.jclouds.cloudservers.options.CreateServerOptions.Builder.withFile; +import static org.jclouds.cloudservers.options.CreateSharedIpGroupOptions.Builder.withServer; +import static org.jclouds.cloudservers.options.ListOptions.Builder.withDetails; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -43,17 +43,17 @@ import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.jclouds.net.IPSocket; import org.jclouds.predicates.RetryablePredicate; import org.jclouds.predicates.SocketOpen; -import org.jclouds.rackspace.cloudservers.domain.BackupSchedule; -import org.jclouds.rackspace.cloudservers.domain.DailyBackup; -import org.jclouds.rackspace.cloudservers.domain.Flavor; -import org.jclouds.rackspace.cloudservers.domain.Image; -import org.jclouds.rackspace.cloudservers.domain.ImageStatus; -import org.jclouds.rackspace.cloudservers.domain.RebootType; -import org.jclouds.rackspace.cloudservers.domain.Server; -import org.jclouds.rackspace.cloudservers.domain.ServerStatus; -import org.jclouds.rackspace.cloudservers.domain.SharedIpGroup; -import org.jclouds.rackspace.cloudservers.domain.WeeklyBackup; -import org.jclouds.rackspace.cloudservers.options.RebuildServerOptions; +import org.jclouds.cloudservers.domain.BackupSchedule; +import org.jclouds.cloudservers.domain.DailyBackup; +import org.jclouds.cloudservers.domain.Flavor; +import org.jclouds.cloudservers.domain.Image; +import org.jclouds.cloudservers.domain.ImageStatus; +import org.jclouds.cloudservers.domain.RebootType; +import org.jclouds.cloudservers.domain.Server; +import org.jclouds.cloudservers.domain.ServerStatus; +import org.jclouds.cloudservers.domain.SharedIpGroup; +import org.jclouds.cloudservers.domain.WeeklyBackup; +import org.jclouds.cloudservers.options.RebuildServerOptions; import org.jclouds.rest.RestContextFactory; import org.jclouds.ssh.ExecResponse; import org.jclouds.ssh.SshClient; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindAdminPassToJsonPayloadTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindAdminPassToJsonPayloadTest.java similarity index 98% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindAdminPassToJsonPayloadTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindAdminPassToJsonPayloadTest.java index 24d5788c97..1a2e8b4013 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindAdminPassToJsonPayloadTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindAdminPassToJsonPayloadTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import static org.testng.Assert.assertEquals; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindCreateImageToJsonPayloadTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindCreateImageToJsonPayloadTest.java similarity index 98% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindCreateImageToJsonPayloadTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindCreateImageToJsonPayloadTest.java index f8406d6b3f..e2244b0d90 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindCreateImageToJsonPayloadTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindCreateImageToJsonPayloadTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import static org.testng.Assert.assertEquals; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindRebootTypeToJsonPayloadTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindRebootTypeToJsonPayloadTest.java similarity index 96% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindRebootTypeToJsonPayloadTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindRebootTypeToJsonPayloadTest.java index a21a12ae25..29d845f8d2 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindRebootTypeToJsonPayloadTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindRebootTypeToJsonPayloadTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import static org.testng.Assert.assertEquals; @@ -28,7 +28,7 @@ import javax.ws.rs.HttpMethod; import org.jclouds.http.HttpRequest; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.domain.RebootType; +import org.jclouds.cloudservers.domain.RebootType; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindServerNameToJsonPayloadTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindServerNameToJsonPayloadTest.java similarity index 98% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindServerNameToJsonPayloadTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindServerNameToJsonPayloadTest.java index 82a7dbd281..26b897e940 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/binders/BindServerNameToJsonPayloadTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/binders/BindServerNameToJsonPayloadTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.binders; +package org.jclouds.cloudservers.binders; import static org.testng.Assert.assertEquals; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/CloudServersComputeServiceLiveTest.java similarity index 95% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/CloudServersComputeServiceLiveTest.java index dabd03c862..c9c61b1bcb 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/CloudServersComputeServiceLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute; +package org.jclouds.cloudservers.compute; import static org.jclouds.compute.util.ComputeServiceUtils.getCores; import static org.testng.Assert.assertEquals; @@ -30,8 +30,8 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.OsFamily; import org.jclouds.compute.domain.Template; import org.jclouds.domain.LocationScope; -import org.jclouds.rackspace.cloudservers.CloudServersAsyncClient; -import org.jclouds.rackspace.cloudservers.CloudServersClient; +import org.jclouds.cloudservers.CloudServersAsyncClient; +import org.jclouds.cloudservers.CloudServersClient; import org.jclouds.rest.RestContext; import org.jclouds.ssh.jsch.config.JschSshClientModule; import org.testng.annotations.Test; @@ -99,4 +99,4 @@ public class CloudServersComputeServiceLiveTest extends BaseComputeServiceLiveTe public void testDestroyNodes() { super.testDestroyNodes(); } -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersTemplateBuilderLiveTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/CloudServersTemplateBuilderLiveTest.java similarity index 97% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersTemplateBuilderLiveTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/CloudServersTemplateBuilderLiveTest.java index bfa07c5d5c..6ef10ca2b4 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersTemplateBuilderLiveTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/CloudServersTemplateBuilderLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute; +package org.jclouds.cloudservers.compute; import org.jclouds.compute.BaseTemplateBuilderLiveTest; import org.jclouds.compute.domain.OsFamily; @@ -54,4 +54,4 @@ public class CloudServersTemplateBuilderLiveTest extends BaseTemplateBuilderLive }; } -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModuleTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModuleTest.java similarity index 90% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModuleTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModuleTest.java index fd1c9015ec..8c48b7784b 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModuleTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModuleTest.java @@ -17,9 +17,9 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.config; +package org.jclouds.cloudservers.compute.config; -import org.jclouds.rackspace.cloudservers.domain.ServerStatus; +import org.jclouds.cloudservers.domain.ServerStatus; import org.testng.annotations.Test; /** diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToImageTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/functions/CloudServersImageToImageTest.java similarity index 90% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToImageTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/functions/CloudServersImageToImageTest.java index 960a34b73a..527a41bc86 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToImageTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/functions/CloudServersImageToImageTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.functions; +package org.jclouds.cloudservers.compute.functions; import static org.testng.Assert.assertEquals; @@ -32,7 +32,7 @@ import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.domain.Credentials; import org.jclouds.json.Json; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.functions.ParseImageFromJsonResponseTest; +import org.jclouds.cloudservers.functions.ParseImageFromJsonResponseTest; import org.testng.annotations.Test; import com.google.inject.Guice; @@ -56,7 +56,7 @@ public class CloudServersImageToImageTest { } public static Image convertImage() { - org.jclouds.rackspace.cloudservers.domain.Image image = ParseImageFromJsonResponseTest.parseImage(); + org.jclouds.cloudservers.domain.Image image = ParseImageFromJsonResponseTest.parseImage(); CloudServersImageToImage parser = new CloudServersImageToImage(new CloudServersImageToOperatingSystem(new BaseComputeServiceContextModule() { }.provideOsVersionMap(new ComputeServiceConstants.ReferenceData(), Guice.createInjector(new GsonModule()) diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/FlavorToHardwareTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/functions/FlavorToHardwareTest.java similarity index 91% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/FlavorToHardwareTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/functions/FlavorToHardwareTest.java index 71ca2e0af6..729be37094 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/FlavorToHardwareTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/functions/FlavorToHardwareTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.functions; +package org.jclouds.cloudservers.compute.functions; import static org.testng.Assert.assertEquals; @@ -31,8 +31,8 @@ import org.jclouds.compute.domain.VolumeBuilder; import org.jclouds.domain.Location; import org.jclouds.domain.LocationScope; import org.jclouds.domain.internal.LocationImpl; -import org.jclouds.rackspace.cloudservers.domain.Flavor; -import org.jclouds.rackspace.cloudservers.functions.ParseFlavorFromJsonResponseTest; +import org.jclouds.cloudservers.domain.Flavor; +import org.jclouds.cloudservers.functions.ParseFlavorFromJsonResponseTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/ServerToNodeMetadataTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/functions/ServerToNodeMetadataTest.java similarity index 96% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/ServerToNodeMetadataTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/functions/ServerToNodeMetadataTest.java index f963e6c654..cc5871d7b2 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/ServerToNodeMetadataTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/functions/ServerToNodeMetadataTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.compute.functions; +package org.jclouds.cloudservers.compute.functions; import static org.testng.Assert.assertEquals; @@ -40,10 +40,10 @@ import org.jclouds.domain.Credentials; import org.jclouds.domain.Location; import org.jclouds.domain.LocationScope; import org.jclouds.domain.internal.LocationImpl; -import org.jclouds.rackspace.cloudservers.compute.config.CloudServersComputeServiceDependenciesModule; -import org.jclouds.rackspace.cloudservers.domain.Server; -import org.jclouds.rackspace.cloudservers.domain.ServerStatus; -import org.jclouds.rackspace.cloudservers.functions.ParseServerFromJsonResponseTest; +import org.jclouds.cloudservers.compute.config.CloudServersComputeServiceDependenciesModule; +import org.jclouds.cloudservers.domain.Server; +import org.jclouds.cloudservers.domain.ServerStatus; +import org.jclouds.cloudservers.functions.ParseServerFromJsonResponseTest; import org.testng.annotations.Test; import com.google.common.base.Suppliers; @@ -159,4 +159,4 @@ public class ServerToNodeMetadataTest { "description", null))).userMetadata( ImmutableMap.of("Server Label", "Web Head 1", "Image Version", "2.1")).build()); } -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/domain/ServerTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/domain/ServerTest.java similarity index 96% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/domain/ServerTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/domain/ServerTest.java index 7be1362aac..2c2688e107 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/domain/ServerTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/domain/ServerTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.domain; +package org.jclouds.cloudservers.domain; import static org.testng.Assert.assertEquals; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseAddressesFromJsonResponseTest.java similarity index 91% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromJsonResponseTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseAddressesFromJsonResponseTest.java index c1c6f8ddc4..0cebf0a7c4 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseAddressesFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseAddressesFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.functions; +package org.jclouds.cloudservers.functions; import static org.testng.Assert.assertEquals; @@ -29,7 +29,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.domain.Addresses; +import org.jclouds.cloudservers.domain.Addresses; import org.jclouds.rackspace.config.RackspaceParserModule; import org.testng.annotations.Test; @@ -49,7 +49,7 @@ public class ParseAddressesFromJsonResponseTest { Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); public void testApplyInputStreamDetails() throws UnknownHostException { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_addresses.json"); + InputStream is = getClass().getResourceAsStream("/test_list_addresses.json"); UnwrapOnlyJsonValue parser = i.getInstance(Key.get(new TypeLiteral>() { })); diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseBackupScheduleFromJsonResponseTest.java similarity index 87% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromJsonResponseTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseBackupScheduleFromJsonResponseTest.java index 4789c5c21a..c18cb89f1c 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseBackupScheduleFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseBackupScheduleFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.functions; +package org.jclouds.cloudservers.functions; import static org.testng.Assert.assertEquals; @@ -28,9 +28,9 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.domain.BackupSchedule; -import org.jclouds.rackspace.cloudservers.domain.DailyBackup; -import org.jclouds.rackspace.cloudservers.domain.WeeklyBackup; +import org.jclouds.cloudservers.domain.BackupSchedule; +import org.jclouds.cloudservers.domain.DailyBackup; +import org.jclouds.cloudservers.domain.WeeklyBackup; import org.jclouds.rackspace.config.RackspaceParserModule; import org.testng.annotations.Test; @@ -49,7 +49,7 @@ public class ParseBackupScheduleFromJsonResponseTest { Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); public void testApplyInputStreamDetails() throws UnknownHostException { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_backupschedule.json"); + InputStream is = getClass().getResourceAsStream("/test_list_backupschedule.json"); UnwrapOnlyJsonValue parser = i.getInstance(Key .get(new TypeLiteral>() { diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseFlavorFromJsonResponseTest.java similarity index 91% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromJsonResponseTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseFlavorFromJsonResponseTest.java index cc86b85f9d..2969217288 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseFlavorFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.functions; +package org.jclouds.cloudservers.functions; import static org.testng.Assert.assertEquals; @@ -27,7 +27,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.domain.Flavor; +import org.jclouds.cloudservers.domain.Flavor; import org.jclouds.rackspace.config.RackspaceParserModule; import org.testng.annotations.Test; @@ -56,7 +56,7 @@ public class ParseFlavorFromJsonResponseTest { Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); InputStream is = ParseFlavorFromJsonResponseTest.class - .getResourceAsStream("/cloudservers/test_get_flavor_details.json"); + .getResourceAsStream("/test_get_flavor_details.json"); UnwrapOnlyJsonValue parser = i.getInstance(Key.get(new TypeLiteral>() { })); diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseFlavorListFromJsonResponseTest.java similarity index 90% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromJsonResponseTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseFlavorListFromJsonResponseTest.java index 1c68567b6f..a3c94af867 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseFlavorListFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseFlavorListFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.functions; +package org.jclouds.cloudservers.functions; import static org.testng.Assert.assertEquals; @@ -29,7 +29,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.domain.Flavor; +import org.jclouds.cloudservers.domain.Flavor; import org.jclouds.rackspace.config.RackspaceParserModule; import org.testng.annotations.Test; @@ -50,7 +50,7 @@ public class ParseFlavorListFromJsonResponseTest { Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); public void testApplyInputStream() { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_flavors.json"); + InputStream is = getClass().getResourceAsStream("/test_list_flavors.json"); List expects = ImmutableList.of(new Flavor(1, "256 MB Server"), new Flavor(2, "512 MB Server")); @@ -62,7 +62,7 @@ public class ParseFlavorListFromJsonResponseTest { } public void testApplyInputStreamDetails() throws UnknownHostException { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_flavors_detail.json"); + InputStream is = getClass().getResourceAsStream("/test_list_flavors_detail.json"); UnwrapOnlyJsonValue> parser = i.getInstance(Key .get(new TypeLiteral>>() { diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageFromJsonResponseTest.java similarity index 91% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromJsonResponseTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageFromJsonResponseTest.java index 3bf39c67f5..63d022bbd2 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.functions; +package org.jclouds.cloudservers.functions; import static org.testng.Assert.assertEquals; @@ -29,8 +29,8 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.domain.Image; -import org.jclouds.rackspace.cloudservers.domain.ImageStatus; +import org.jclouds.cloudservers.domain.Image; +import org.jclouds.cloudservers.domain.ImageStatus; import org.jclouds.rackspace.config.RackspaceParserModule; import org.testng.annotations.Test; @@ -67,7 +67,7 @@ public class ParseImageFromJsonResponseTest { Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); InputStream is = ParseImageFromJsonResponseTest.class - .getResourceAsStream("/cloudservers/test_get_image_details.json"); + .getResourceAsStream("/test_get_image_details.json"); UnwrapOnlyJsonValue parser = i.getInstance(Key.get(new TypeLiteral>() { })); diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java similarity index 90% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromJsonResponseTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java index 6f4b0dabfd..4f92b59de8 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.functions; +package org.jclouds.cloudservers.functions; import static org.testng.Assert.assertEquals; @@ -30,8 +30,8 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.domain.Image; -import org.jclouds.rackspace.cloudservers.domain.ImageStatus; +import org.jclouds.cloudservers.domain.Image; +import org.jclouds.cloudservers.domain.ImageStatus; import org.jclouds.rackspace.config.RackspaceParserModule; import org.testng.annotations.Test; @@ -52,7 +52,7 @@ public class ParseImageListFromJsonResponseTest { DateService dateService = i.getInstance(DateService.class); public void testApplyInputStream() { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_images.json"); + InputStream is = getClass().getResourceAsStream("/test_list_images.json"); List expects = ImmutableList.of(new Image(2, "CentOS 5.2"), new Image(743, "My Server Backup")); @@ -65,7 +65,7 @@ public class ParseImageListFromJsonResponseTest { } public void testApplyInputStreamDetails() throws UnknownHostException { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_images_detail.json"); + InputStream is = getClass().getResourceAsStream("/test_list_images_detail.json"); UnwrapOnlyJsonValue> parser = i.getInstance(Key .get(new TypeLiteral>>() { diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseInetAddressListFromJsonResponseTest.java similarity index 90% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromJsonResponseTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseInetAddressListFromJsonResponseTest.java index f0182c4cae..4325b10c18 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseInetAddressListFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseInetAddressListFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.functions; +package org.jclouds.cloudservers.functions; import static org.testng.Assert.assertEquals; @@ -49,7 +49,7 @@ public class ParseInetAddressListFromJsonResponseTest { Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); public void testPublic() throws UnknownHostException { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_addresses_public.json"); + InputStream is = getClass().getResourceAsStream("/test_list_addresses_public.json"); UnwrapOnlyJsonValue> parser = i.getInstance(Key .get(new TypeLiteral>>() { @@ -60,7 +60,7 @@ public class ParseInetAddressListFromJsonResponseTest { } public void testPrivate() throws UnknownHostException { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_addresses_private.json"); + InputStream is = getClass().getResourceAsStream("/test_list_addresses_private.json"); UnwrapOnlyJsonValue> parser = i.getInstance(Key .get(new TypeLiteral>>() { diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseServerFromJsonResponseTest.java similarity index 91% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromJsonResponseTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseServerFromJsonResponseTest.java index 05493d5f94..b7352a073c 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseServerFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.functions; +package org.jclouds.cloudservers.functions; import static org.testng.Assert.assertEquals; @@ -29,9 +29,9 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.domain.Addresses; -import org.jclouds.rackspace.cloudservers.domain.Server; -import org.jclouds.rackspace.cloudservers.domain.ServerStatus; +import org.jclouds.cloudservers.domain.Addresses; +import org.jclouds.cloudservers.domain.Server; +import org.jclouds.cloudservers.domain.ServerStatus; import org.jclouds.rackspace.config.RackspaceParserModule; import org.testng.annotations.Test; @@ -73,7 +73,7 @@ public class ParseServerFromJsonResponseTest { public static Server parseServer() { Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); - InputStream is = ParseServerFromJsonResponseTest.class.getResourceAsStream("/cloudservers/test_get_server_detail.json"); + InputStream is = ParseServerFromJsonResponseTest.class.getResourceAsStream("/test_get_server_detail.json"); UnwrapOnlyJsonValue parser = i.getInstance(Key.get(new TypeLiteral>() { })); diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseServerListFromJsonResponseTest.java similarity index 91% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromJsonResponseTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseServerListFromJsonResponseTest.java index 27eb40355b..c183d4a522 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseServerListFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseServerListFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.functions; +package org.jclouds.cloudservers.functions; import static org.testng.Assert.assertEquals; @@ -29,9 +29,9 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.domain.Addresses; -import org.jclouds.rackspace.cloudservers.domain.Server; -import org.jclouds.rackspace.cloudservers.domain.ServerStatus; +import org.jclouds.cloudservers.domain.Addresses; +import org.jclouds.cloudservers.domain.Server; +import org.jclouds.cloudservers.domain.ServerStatus; import org.jclouds.rackspace.config.RackspaceParserModule; import org.testng.annotations.Test; @@ -54,7 +54,7 @@ public class ParseServerListFromJsonResponseTest { Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); public void testApplyInputStream() { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_servers.json"); + InputStream is = getClass().getResourceAsStream("/test_list_servers.json"); List expects = ImmutableList.of(new Server(1234, "sample-server"), new Server(5678, "sample-server2")); @@ -67,7 +67,7 @@ public class ParseServerListFromJsonResponseTest { } public void testApplyInputStreamDetails() throws UnknownHostException { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_servers_detail.json"); + InputStream is = getClass().getResourceAsStream("/test_list_servers_detail.json"); UnwrapOnlyJsonValue> parser = i.getInstance(Key .get(new TypeLiteral>>() { diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java similarity index 90% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java index 5ebb0ae136..d60305dd1a 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.functions; +package org.jclouds.cloudservers.functions; import static org.testng.Assert.assertEquals; @@ -28,7 +28,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.domain.SharedIpGroup; +import org.jclouds.cloudservers.domain.SharedIpGroup; import org.jclouds.rackspace.config.RackspaceParserModule; import org.testng.annotations.Test; @@ -49,7 +49,7 @@ public class ParseSharedIpGroupFromJsonResponseTest { Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); public void testApplyInputStreamDetails() throws UnknownHostException { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_get_sharedipgroup_details.json"); + InputStream is = getClass().getResourceAsStream("/test_get_sharedipgroup_details.json"); UnwrapOnlyJsonValue parser = i.getInstance(Key .get(new TypeLiteral>() { @@ -60,4 +60,4 @@ public class ParseSharedIpGroupFromJsonResponseTest { assertEquals(response.getName(), "Shared IP Group 1"); assertEquals(response.getServers(), ImmutableList.of(422)); } -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java similarity index 89% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java index 69c7a75923..15f3779b24 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseSharedIpGroupListFromJsonResponseTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.functions; +package org.jclouds.cloudservers.functions; import static org.testng.Assert.assertEquals; @@ -29,7 +29,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; import org.jclouds.json.config.GsonModule; -import org.jclouds.rackspace.cloudservers.domain.SharedIpGroup; +import org.jclouds.cloudservers.domain.SharedIpGroup; import org.jclouds.rackspace.config.RackspaceParserModule; import org.testng.annotations.Test; @@ -50,7 +50,7 @@ public class ParseSharedIpGroupListFromJsonResponseTest { Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); public void testApplyInputStream() { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_sharedipgroups.json"); + InputStream is = getClass().getResourceAsStream("/test_list_sharedipgroups.json"); List expects = ImmutableList.of(new SharedIpGroup(1234, "Shared IP Group 1"), new SharedIpGroup( 5678, "Shared IP Group 2")); @@ -65,7 +65,7 @@ public class ParseSharedIpGroupListFromJsonResponseTest { } public void testApplyInputStreamDetails() throws UnknownHostException { - InputStream is = getClass().getResourceAsStream("/cloudservers/test_list_sharedipgroups_detail.json"); + InputStream is = getClass().getResourceAsStream("/test_list_sharedipgroups_detail.json"); UnwrapOnlyJsonValue> parser = i.getInstance(Key .get(new TypeLiteral>>() { diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateServerOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateServerOptionsTest.java similarity index 92% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateServerOptionsTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateServerOptionsTest.java index 7c35953a5a..f8026220e5 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateServerOptionsTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateServerOptionsTest.java @@ -17,11 +17,11 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.options; +package org.jclouds.cloudservers.options; -import static org.jclouds.rackspace.cloudservers.options.CreateServerOptions.Builder.withFile; -import static org.jclouds.rackspace.cloudservers.options.CreateServerOptions.Builder.withSharedIp; -import static org.jclouds.rackspace.cloudservers.options.CreateServerOptions.Builder.withSharedIpGroup; +import static org.jclouds.cloudservers.options.CreateServerOptions.Builder.withFile; +import static org.jclouds.cloudservers.options.CreateServerOptions.Builder.withSharedIp; +import static org.jclouds.cloudservers.options.CreateServerOptions.Builder.withSharedIpGroup; import static org.testng.Assert.assertEquals; import java.net.URI; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java similarity index 94% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptionsTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java index 95d6ecadc5..2cf12a8e78 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptionsTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java @@ -17,9 +17,9 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.options; +package org.jclouds.cloudservers.options; -import static org.jclouds.rackspace.cloudservers.options.CreateSharedIpGroupOptions.Builder.withServer; +import static org.jclouds.cloudservers.options.CreateSharedIpGroupOptions.Builder.withServer; import static org.testng.Assert.assertEquals; import java.net.URI; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/ListOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/ListOptionsTest.java similarity index 87% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/ListOptionsTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/ListOptionsTest.java index 94c1b73b9a..b65b364b64 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/ListOptionsTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/ListOptionsTest.java @@ -17,12 +17,12 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.options; +package org.jclouds.cloudservers.options; -import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.changesSince; -import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.maxResults; -import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.startAt; -import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.withDetails; +import static org.jclouds.cloudservers.options.ListOptions.Builder.changesSince; +import static org.jclouds.cloudservers.options.ListOptions.Builder.maxResults; +import static org.jclouds.cloudservers.options.ListOptions.Builder.startAt; +import static org.jclouds.cloudservers.options.ListOptions.Builder.withDetails; import static org.testng.Assert.assertEquals; import java.util.Date; diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/RebuildServerOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/RebuildServerOptionsTest.java similarity index 94% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/RebuildServerOptionsTest.java rename to apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/RebuildServerOptionsTest.java index 174d9d153b..ab7b2e36a7 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/options/RebuildServerOptionsTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/RebuildServerOptionsTest.java @@ -17,9 +17,9 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers.options; +package org.jclouds.cloudservers.options; -import static org.jclouds.rackspace.cloudservers.options.RebuildServerOptions.Builder.withImage; +import static org.jclouds.cloudservers.options.RebuildServerOptions.Builder.withImage; import static org.testng.Assert.assertEquals; import java.net.URI; diff --git a/apis/cloudservers/src/test/resources/log4j.xml b/apis/cloudservers/src/test/resources/log4j.xml new file mode 100755 index 0000000000..5b548a0f48 --- /dev/null +++ b/apis/cloudservers/src/test/resources/log4j.xml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/rackspace/src/test/resources/cloudservers/test_get_flavor_details.json b/apis/cloudservers/src/test/resources/test_get_flavor_details.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_get_flavor_details.json rename to apis/cloudservers/src/test/resources/test_get_flavor_details.json diff --git a/rackspace/src/test/resources/cloudservers/test_get_image_details.json b/apis/cloudservers/src/test/resources/test_get_image_details.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_get_image_details.json rename to apis/cloudservers/src/test/resources/test_get_image_details.json diff --git a/rackspace/src/test/resources/cloudservers/test_get_server_detail.json b/apis/cloudservers/src/test/resources/test_get_server_detail.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_get_server_detail.json rename to apis/cloudservers/src/test/resources/test_get_server_detail.json diff --git a/rackspace/src/test/resources/cloudservers/test_get_sharedipgroup_details.json b/apis/cloudservers/src/test/resources/test_get_sharedipgroup_details.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_get_sharedipgroup_details.json rename to apis/cloudservers/src/test/resources/test_get_sharedipgroup_details.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_addresses.json b/apis/cloudservers/src/test/resources/test_list_addresses.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_addresses.json rename to apis/cloudservers/src/test/resources/test_list_addresses.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_addresses_private.json b/apis/cloudservers/src/test/resources/test_list_addresses_private.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_addresses_private.json rename to apis/cloudservers/src/test/resources/test_list_addresses_private.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_addresses_public.json b/apis/cloudservers/src/test/resources/test_list_addresses_public.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_addresses_public.json rename to apis/cloudservers/src/test/resources/test_list_addresses_public.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_backupschedule.json b/apis/cloudservers/src/test/resources/test_list_backupschedule.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_backupschedule.json rename to apis/cloudservers/src/test/resources/test_list_backupschedule.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_flavors.json b/apis/cloudservers/src/test/resources/test_list_flavors.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_flavors.json rename to apis/cloudservers/src/test/resources/test_list_flavors.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_flavors_detail.json b/apis/cloudservers/src/test/resources/test_list_flavors_detail.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_flavors_detail.json rename to apis/cloudservers/src/test/resources/test_list_flavors_detail.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_images.json b/apis/cloudservers/src/test/resources/test_list_images.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_images.json rename to apis/cloudservers/src/test/resources/test_list_images.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_images_detail.json b/apis/cloudservers/src/test/resources/test_list_images_detail.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_images_detail.json rename to apis/cloudservers/src/test/resources/test_list_images_detail.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_servers.json b/apis/cloudservers/src/test/resources/test_list_servers.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_servers.json rename to apis/cloudservers/src/test/resources/test_list_servers.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_servers_detail.json b/apis/cloudservers/src/test/resources/test_list_servers_detail.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_servers_detail.json rename to apis/cloudservers/src/test/resources/test_list_servers_detail.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_sharedipgroups.json b/apis/cloudservers/src/test/resources/test_list_sharedipgroups.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_sharedipgroups.json rename to apis/cloudservers/src/test/resources/test_list_sharedipgroups.json diff --git a/rackspace/src/test/resources/cloudservers/test_list_sharedipgroups_detail.json b/apis/cloudservers/src/test/resources/test_list_sharedipgroups_detail.json similarity index 100% rename from rackspace/src/test/resources/cloudservers/test_list_sharedipgroups_detail.json rename to apis/cloudservers/src/test/resources/test_list_sharedipgroups_detail.json diff --git a/apis/pom.xml b/apis/pom.xml index b42d0c9cd5..e931d1adc8 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -39,5 +39,7 @@ elb walrus eucalyptus + cloudfiles + cloudservers diff --git a/common/pom.xml b/common/pom.xml index 0b7e0fe1c6..a78344b51d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -34,5 +34,6 @@ jclouds commons project aws + rackspace diff --git a/rackspace/README.txt b/common/rackspace/README.txt similarity index 100% rename from rackspace/README.txt rename to common/rackspace/README.txt diff --git a/common/rackspace/pom.xml b/common/rackspace/pom.xml new file mode 100644 index 0000000000..e362d24b44 --- /dev/null +++ b/common/rackspace/pom.xml @@ -0,0 +1,50 @@ + + + + + 4.0.0 + + org.jclouds + jclouds-project + 1.0-SNAPSHOT + ../../project/pom.xml + + org.jclouds.common + rackspace-common + jclouds Rackspace Components Core + jclouds Core components to access Rackspace apis + + + org.jclouds + jclouds-core + ${project.version} + + + org.jclouds + jclouds-core + ${project.version} + test-jar + test + + + + diff --git a/rackspace/src/main/java/org/jclouds/rackspace/Authentication.java b/common/rackspace/src/main/java/org/jclouds/rackspace/Authentication.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/Authentication.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/Authentication.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/CloudFiles.java b/common/rackspace/src/main/java/org/jclouds/rackspace/CloudFiles.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/CloudFiles.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/CloudFiles.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/CloudFilesCDN.java b/common/rackspace/src/main/java/org/jclouds/rackspace/CloudFilesCDN.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/CloudFilesCDN.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/CloudFilesCDN.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/CloudServers.java b/common/rackspace/src/main/java/org/jclouds/rackspace/CloudServers.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/CloudServers.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/CloudServers.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/RackspaceAuthAsyncClient.java b/common/rackspace/src/main/java/org/jclouds/rackspace/RackspaceAuthAsyncClient.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/RackspaceAuthAsyncClient.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/RackspaceAuthAsyncClient.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/RackspacePropertiesBuilder.java b/common/rackspace/src/main/java/org/jclouds/rackspace/RackspacePropertiesBuilder.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/RackspacePropertiesBuilder.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/RackspacePropertiesBuilder.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceAuthenticationRestModule.java b/common/rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceAuthenticationRestModule.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceAuthenticationRestModule.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceAuthenticationRestModule.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceLocationsSupplier.java b/common/rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceLocationsSupplier.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceLocationsSupplier.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceLocationsSupplier.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceParserModule.java b/common/rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceParserModule.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceParserModule.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/config/RackspaceParserModule.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/filters/AddTimestampQuery.java b/common/rackspace/src/main/java/org/jclouds/rackspace/filters/AddTimestampQuery.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/filters/AddTimestampQuery.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/filters/AddTimestampQuery.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/filters/AuthenticateRequest.java b/common/rackspace/src/main/java/org/jclouds/rackspace/filters/AuthenticateRequest.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/filters/AuthenticateRequest.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/filters/AuthenticateRequest.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/functions/ParseAuthenticationResponseFromHeaders.java b/common/rackspace/src/main/java/org/jclouds/rackspace/functions/ParseAuthenticationResponseFromHeaders.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/functions/ParseAuthenticationResponseFromHeaders.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/functions/ParseAuthenticationResponseFromHeaders.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/options/BaseListOptions.java b/common/rackspace/src/main/java/org/jclouds/rackspace/options/BaseListOptions.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/options/BaseListOptions.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/options/BaseListOptions.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/reference/RackspaceHeaders.java b/common/rackspace/src/main/java/org/jclouds/rackspace/reference/RackspaceHeaders.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/reference/RackspaceHeaders.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/reference/RackspaceHeaders.java diff --git a/rackspace/src/main/java/org/jclouds/rackspace/reference/package-info.java b/common/rackspace/src/main/java/org/jclouds/rackspace/reference/package-info.java similarity index 100% rename from rackspace/src/main/java/org/jclouds/rackspace/reference/package-info.java rename to common/rackspace/src/main/java/org/jclouds/rackspace/reference/package-info.java diff --git a/rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthAsyncClientTest.java b/common/rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthAsyncClientTest.java similarity index 100% rename from rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthAsyncClientTest.java rename to common/rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthAsyncClientTest.java diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/TestRackspaceAuthenticationRestClientModule.java b/common/rackspace/src/test/java/org/jclouds/rackspace/TestRackspaceAuthenticationRestClientModule.java similarity index 97% rename from rackspace/src/test/java/org/jclouds/rackspace/cloudservers/TestRackspaceAuthenticationRestClientModule.java rename to common/rackspace/src/test/java/org/jclouds/rackspace/TestRackspaceAuthenticationRestClientModule.java index 4f5e49b283..7c70ab5d50 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/TestRackspaceAuthenticationRestClientModule.java +++ b/common/rackspace/src/test/java/org/jclouds/rackspace/TestRackspaceAuthenticationRestClientModule.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.rackspace.cloudservers; +package org.jclouds.rackspace; import java.net.URI; import java.util.Date; @@ -62,4 +62,4 @@ public class TestRackspaceAuthenticationRestClientModule extends RackspaceAuthen }; } -} \ No newline at end of file +} diff --git a/rackspace/src/test/java/org/jclouds/rackspace/filters/AddTimestampQueryTest.java b/common/rackspace/src/test/java/org/jclouds/rackspace/filters/AddTimestampQueryTest.java similarity index 100% rename from rackspace/src/test/java/org/jclouds/rackspace/filters/AddTimestampQueryTest.java rename to common/rackspace/src/test/java/org/jclouds/rackspace/filters/AddTimestampQueryTest.java diff --git a/rackspace/src/test/java/org/jclouds/rackspace/options/BaseListOptionsTest.java b/common/rackspace/src/test/java/org/jclouds/rackspace/options/BaseListOptionsTest.java similarity index 100% rename from rackspace/src/test/java/org/jclouds/rackspace/options/BaseListOptionsTest.java rename to common/rackspace/src/test/java/org/jclouds/rackspace/options/BaseListOptionsTest.java diff --git a/common/rackspace/src/test/resources/log4j.xml b/common/rackspace/src/test/resources/log4j.xml new file mode 100755 index 0000000000..5b548a0f48 --- /dev/null +++ b/common/rackspace/src/test/resources/log4j.xml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties index b6e69e30a6..1e5f577eee 100644 --- a/core/src/main/resources/rest.properties +++ b/core/src/main/resources/rest.properties @@ -98,7 +98,7 @@ ecc-ec2.propertiesbuilder=org.jclouds.ecc.ECCEucalyptusPropertiesBuilder nova-ec2.contextbuilder=org.jclouds.ec2.EC2ContextBuilder nova-ec2.propertiesbuilder=org.jclouds.nova.ec2.NovaEC2PropertiesBuilder -cloudservers.contextbuilder=org.jclouds.rackspace.cloudservers.CloudServersContextBuilder +cloudservers.contextbuilder=org.jclouds.cloudservers.CloudServersContextBuilder cloudservers.propertiesbuilder=org.jclouds.rackspace.RackspacePropertiesBuilder bluelock-vcdirector.contextbuilder=org.jclouds.vcloud.bluelock.BlueLockVCloudDirectorContextBuilder @@ -153,8 +153,8 @@ peer1-storage.apiversion=1.3.0 # TODO hostedsolutions use atmos -cloudfiles.contextbuilder=org.jclouds.rackspace.cloudfiles.CloudFilesContextBuilder -cloudfiles.propertiesbuilder=org.jclouds.rackspace.cloudfiles.CloudFilesPropertiesBuilder +cloudfiles.contextbuilder=org.jclouds.cloudfiles.CloudFilesContextBuilder +cloudfiles.propertiesbuilder=org.jclouds.cloudfiles.CloudFilesPropertiesBuilder walrus.contextbuilder=org.jclouds.s3.S3ContextBuilder walrus.propertiesbuilder=org.jclouds.walrus.WalrusPropertiesBuilder diff --git a/pom.xml b/pom.xml index ce129ed861..0a9d1d4fb7 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,6 @@ scriptbuilder azure atmos - rackspace vcloud elasticstack allcompute diff --git a/rackspace/src/test/java/org/jclouds/rackspace/ProvidersInPropertiesTest.java b/rackspace/src/test/java/org/jclouds/rackspace/ProvidersInPropertiesTest.java deleted file mode 100644 index 7a95b0f14f..0000000000 --- a/rackspace/src/test/java/org/jclouds/rackspace/ProvidersInPropertiesTest.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.rackspace; - -import org.jclouds.blobstore.util.BlobStoreUtils; -import org.jclouds.compute.util.ComputeServiceUtils; -import org.jclouds.rest.Providers; -import org.testng.annotations.Test; - -import com.google.common.collect.Iterables; - -/** - * - * @author Adrian Cole - * - */ -@Test(groups = "unit") -public class ProvidersInPropertiesTest { - - @Test - public void testSupportedComputeServiceProviders() { - Iterable providers = ComputeServiceUtils.getSupportedProviders(); - assert !Iterables.contains(providers, "cloudfiles") : providers; - assert Iterables.contains(providers, "cloudservers") : providers; - } - - @Test - public void testSupportedProviders() { - Iterable providers = Providers.getSupportedProviders(); - assert Iterables.contains(providers, "cloudfiles") : providers; - assert Iterables.contains(providers, "cloudservers") : providers; - } - - @Test - public void testSupportedBlobStoreProviders() { - Iterable providers = BlobStoreUtils.getSupportedProviders(); - assert Iterables.contains(providers, "cloudfiles") : providers; - assert !Iterables.contains(providers, "cloudservers") : providers; - } - -} diff --git a/tools/getpath/pom.xml b/tools/getpath/pom.xml index e2f2364be0..a392558374 100644 --- a/tools/getpath/pom.xml +++ b/tools/getpath/pom.xml @@ -54,8 +54,8 @@ ${project.version} - ${project.groupId} - jclouds-rackspace + org.jclouds.api + cloudfiles ${project.version}