From 99c7d1103086c57acd2a61b88fe04c98d7f15b93 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Fri, 30 Sep 2016 16:56:54 -0700 Subject: [PATCH] Move Azure from com.microsoft.azure to com.microsoft.azure.management --- .../azure/management/batch/samples/ManageBatchAccount.java | 2 +- .../compute/samples/ListVirtualMachineExtensionImages.java | 2 +- .../compute/samples/ListVirtualMachineImages.java | 2 +- .../management/compute/samples/ManageAvailabilitySet.java | 2 +- .../management/compute/samples/ManageVirtualMachine.java | 2 +- .../compute/samples/ManageVirtualMachineExtension.java | 2 +- .../compute/samples/ManageVirtualMachineScaleSet.java | 2 +- .../compute/samples/ManageVirtualMachinesInParallel.java | 2 +- .../azure/management/keyvault/samples/ManageKeyVault.java | 2 +- .../azure/management/network/samples/ManageIPAddress.java | 2 +- .../network/samples/ManageInternalLoadBalancer.java | 2 +- .../network/samples/ManageInternetFacingLoadBalancer.java | 2 +- .../management/network/samples/ManageNetworkInterface.java | 2 +- .../network/samples/ManageNetworkSecurityGroup.java | 2 +- .../samples/ManageVirtualMachinesInParallelWithNetwork.java | 2 +- .../management/network/samples/ManageVirtualNetwork.java | 2 +- .../resources/samples/DeployUsingARMTemplate.java | 2 +- .../azure/management/resources/samples/ManageResource.java | 2 +- .../management/resources/samples/ManageResourceGroup.java | 2 +- .../management/storage/samples/ManageStorageAccount.java | 2 +- .../java/com/microsoft/azure/{ => management}/Azure.java | 6 +++++- .../com/microsoft/azure/{ => management}/package-info.java | 2 +- .../com/microsoft/azure/{ => management}/AzureTests.java | 5 ++++- .../azure/{ => management}/TestAvailabilitySet.java | 2 +- .../com/microsoft/azure/{ => management}/TestBatch.java | 2 +- .../microsoft/azure/{ => management}/TestLoadBalancer.java | 2 +- .../java/com/microsoft/azure/{ => management}/TestNSG.java | 2 +- .../com/microsoft/azure/{ => management}/TestNetwork.java | 2 +- .../azure/{ => management}/TestNetworkInterface.java | 2 +- .../azure/{ => management}/TestPublicIpAddress.java | 2 +- .../com/microsoft/azure/{ => management}/TestTemplate.java | 4 +++- .../com/microsoft/azure/{ => management}/TestUtils.java | 2 +- .../azure/{ => management}/TestVirtualMachine.java | 2 +- .../azure/{ => management}/TestVirtualMachineDataDisk.java | 2 +- .../azure/{ => management}/TestVirtualMachineNics.java | 2 +- .../azure/{ => management}/TestVirtualMachineSizes.java | 2 +- .../azure/{ => management}/TestVirtualMachineSsh.java | 2 +- 37 files changed, 46 insertions(+), 37 deletions(-) rename azure/src/main/java/com/microsoft/azure/{ => management}/Azure.java (98%) rename azure/src/main/java/com/microsoft/azure/{ => management}/package-info.java (84%) rename azure/src/test/java/com/microsoft/azure/{ => management}/AzureTests.java (98%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestAvailabilitySet.java (98%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestBatch.java (98%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestLoadBalancer.java (99%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestNSG.java (99%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestNetwork.java (99%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestNetworkInterface.java (99%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestPublicIpAddress.java (99%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestTemplate.java (97%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestUtils.java (99%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestVirtualMachine.java (98%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestVirtualMachineDataDisk.java (98%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestVirtualMachineNics.java (99%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestVirtualMachineSizes.java (98%) rename azure/src/test/java/com/microsoft/azure/{ => management}/TestVirtualMachineSsh.java (98%) diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java b/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java index dee57568f6828..8bd8762de896b 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.batch.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.batch.AccountKeyType; import com.microsoft.azure.management.batch.Application; import com.microsoft.azure.management.batch.ApplicationPackage; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineExtensionImages.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineExtensionImages.java index e4d8f80ab79af..2a502aee37d34 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineExtensionImages.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineExtensionImages.java @@ -1,6 +1,6 @@ package com.microsoft.azure.management.compute.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.VirtualMachineExtensionImage; import com.microsoft.azure.management.compute.VirtualMachineExtensionImageType; import com.microsoft.azure.management.compute.VirtualMachineExtensionImageVersion; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineImages.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineImages.java index ec4dace685cd9..b6f6b3421f06b 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineImages.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ListVirtualMachineImages.java @@ -6,7 +6,7 @@ package com.microsoft.azure.management.compute.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.VirtualMachineOffer; import com.microsoft.azure.management.compute.VirtualMachinePublisher; import com.microsoft.azure.management.compute.VirtualMachineImage; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java index 5e1203852c151..da7fe3d342970 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.compute.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.AvailabilitySet; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java index c7e5d6bdd2c39..0ca85430b028d 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.compute.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.CachingTypes; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java index 424a98d698217..e10afd26fa34c 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java @@ -1,6 +1,6 @@ package com.microsoft.azure.management.compute.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java index bd8d3e24633a7..8304ef66863ea 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.compute.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.PublicIpAddress; import com.microsoft.azure.management.network.LoadBalancer; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java index 924d7772653f6..60629e054b742 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.compute.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java b/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java index b03a16ed7af11..c5c6a0dc725d3 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.keyvault.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.credentials.ApplicationTokenCredentials; import com.microsoft.azure.management.keyvault.KeyPermissions; import com.microsoft.azure.management.keyvault.SecretPermissions; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java index 50b94a4da3fb4..978aec33b57f0 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.network.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java index 4f4f8cb70f654..721d8011aeeb4 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.network.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.AvailabilitySet; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java index 73e7e113231a9..55859b3c06f79 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.network.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.AvailabilitySet; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java index e88613cca4425..03359f1dd791a 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.network.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.PagedList; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java index 701a614f0466a..aa3fa968a603f 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.network.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java index 71b0aa2e9f571..0d1175729fbb5 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.network.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java index d2b36434da907..1e8494509a928 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.network.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java index 5e3bfdd40e50a..a157b7993b5d2 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.resources.DeploymentMode; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java index d8b0ff1072a64..3927d853f435c 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java @@ -9,7 +9,7 @@ import java.io.File; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; import com.microsoft.azure.management.storage.SkuName; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java index cf8113b041001..83ecb77dec5b1 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java @@ -9,7 +9,7 @@ import java.io.File; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.resources.ResourceGroup; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java b/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java index cd69e4cb27592..563ba67104adc 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java @@ -7,7 +7,7 @@ package com.microsoft.azure.management.storage.samples; -import com.microsoft.azure.Azure; +import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.samples.Utils; import com.microsoft.azure.management.storage.StorageAccount; diff --git a/azure/src/main/java/com/microsoft/azure/Azure.java b/azure/src/main/java/com/microsoft/azure/management/Azure.java similarity index 98% rename from azure/src/main/java/com/microsoft/azure/Azure.java rename to azure/src/main/java/com/microsoft/azure/management/Azure.java index 0c7c6c9ac7ce1..962ebdf519bfe 100644 --- a/azure/src/main/java/com/microsoft/azure/Azure.java +++ b/azure/src/main/java/com/microsoft/azure/management/Azure.java @@ -4,8 +4,12 @@ * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; +import com.microsoft.azure.AzureEnvironment; +import com.microsoft.azure.CloudException; +import com.microsoft.azure.PagedList; +import com.microsoft.azure.RestClient; import com.microsoft.azure.credentials.ApplicationTokenCredentials; import com.microsoft.azure.credentials.AzureTokenCredentials; import com.microsoft.azure.management.batch.BatchAccounts; diff --git a/azure/src/main/java/com/microsoft/azure/package-info.java b/azure/src/main/java/com/microsoft/azure/management/package-info.java similarity index 84% rename from azure/src/main/java/com/microsoft/azure/package-info.java rename to azure/src/main/java/com/microsoft/azure/management/package-info.java index a5405761ba205..47108b7069db7 100644 --- a/azure/src/main/java/com/microsoft/azure/package-info.java +++ b/azure/src/main/java/com/microsoft/azure/management/package-info.java @@ -5,4 +5,4 @@ /** * This package contains the Azure rollup client. */ -package com.microsoft.azure; +package com.microsoft.azure.management; diff --git a/azure/src/test/java/com/microsoft/azure/AzureTests.java b/azure/src/test/java/com/microsoft/azure/management/AzureTests.java similarity index 98% rename from azure/src/test/java/com/microsoft/azure/AzureTests.java rename to azure/src/test/java/com/microsoft/azure/management/AzureTests.java index 0366e4a2e8b01..69e7cf875aab2 100644 --- a/azure/src/test/java/com/microsoft/azure/AzureTests.java +++ b/azure/src/test/java/com/microsoft/azure/management/AzureTests.java @@ -3,8 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; +import com.microsoft.azure.AzureEnvironment; +import com.microsoft.azure.CloudException; +import com.microsoft.azure.PagedList; import com.microsoft.azure.credentials.ApplicationTokenCredentials; import com.microsoft.azure.management.compute.VirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachineOffer; diff --git a/azure/src/test/java/com/microsoft/azure/TestAvailabilitySet.java b/azure/src/test/java/com/microsoft/azure/management/TestAvailabilitySet.java similarity index 98% rename from azure/src/test/java/com/microsoft/azure/TestAvailabilitySet.java rename to azure/src/test/java/com/microsoft/azure/management/TestAvailabilitySet.java index 30b630ca8532f..1df713489641f 100644 --- a/azure/src/test/java/com/microsoft/azure/TestAvailabilitySet.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestAvailabilitySet.java @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import org.junit.Assert; diff --git a/azure/src/test/java/com/microsoft/azure/TestBatch.java b/azure/src/test/java/com/microsoft/azure/management/TestBatch.java similarity index 98% rename from azure/src/test/java/com/microsoft/azure/TestBatch.java rename to azure/src/test/java/com/microsoft/azure/management/TestBatch.java index b0b15920c1469..a19c4480090e1 100644 --- a/azure/src/test/java/com/microsoft/azure/TestBatch.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestBatch.java @@ -4,7 +4,7 @@ * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import com.google.common.util.concurrent.SettableFuture; import com.microsoft.azure.management.batch.BatchAccount; diff --git a/azure/src/test/java/com/microsoft/azure/TestLoadBalancer.java b/azure/src/test/java/com/microsoft/azure/management/TestLoadBalancer.java similarity index 99% rename from azure/src/test/java/com/microsoft/azure/TestLoadBalancer.java rename to azure/src/test/java/com/microsoft/azure/management/TestLoadBalancer.java index 1e75cba90fc0d..0bbfc1b7e2271 100644 --- a/azure/src/test/java/com/microsoft/azure/TestLoadBalancer.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestLoadBalancer.java @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import java.util.ArrayList; import java.util.List; diff --git a/azure/src/test/java/com/microsoft/azure/TestNSG.java b/azure/src/test/java/com/microsoft/azure/management/TestNSG.java similarity index 99% rename from azure/src/test/java/com/microsoft/azure/TestNSG.java rename to azure/src/test/java/com/microsoft/azure/management/TestNSG.java index 427f53434c812..8a63cc07c6d32 100644 --- a/azure/src/test/java/com/microsoft/azure/TestNSG.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestNSG.java @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import com.google.common.util.concurrent.SettableFuture; import com.microsoft.azure.credentials.ApplicationTokenCredentials; diff --git a/azure/src/test/java/com/microsoft/azure/TestNetwork.java b/azure/src/test/java/com/microsoft/azure/management/TestNetwork.java similarity index 99% rename from azure/src/test/java/com/microsoft/azure/TestNetwork.java rename to azure/src/test/java/com/microsoft/azure/management/TestNetwork.java index dbdad0aca5e41..4df39534db845 100644 --- a/azure/src/test/java/com/microsoft/azure/TestNetwork.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestNetwork.java @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import java.util.List; diff --git a/azure/src/test/java/com/microsoft/azure/TestNetworkInterface.java b/azure/src/test/java/com/microsoft/azure/management/TestNetworkInterface.java similarity index 99% rename from azure/src/test/java/com/microsoft/azure/TestNetworkInterface.java rename to azure/src/test/java/com/microsoft/azure/management/TestNetworkInterface.java index 0ce86403e4e59..7a21ec7020192 100644 --- a/azure/src/test/java/com/microsoft/azure/TestNetworkInterface.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestNetworkInterface.java @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import java.util.List; diff --git a/azure/src/test/java/com/microsoft/azure/TestPublicIpAddress.java b/azure/src/test/java/com/microsoft/azure/management/TestPublicIpAddress.java similarity index 99% rename from azure/src/test/java/com/microsoft/azure/TestPublicIpAddress.java rename to azure/src/test/java/com/microsoft/azure/management/TestPublicIpAddress.java index bd14edd3a4718..8f4f262bcb199 100644 --- a/azure/src/test/java/com/microsoft/azure/TestPublicIpAddress.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestPublicIpAddress.java @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import org.junit.Assert; diff --git a/azure/src/test/java/com/microsoft/azure/TestTemplate.java b/azure/src/test/java/com/microsoft/azure/management/TestTemplate.java similarity index 97% rename from azure/src/test/java/com/microsoft/azure/TestTemplate.java rename to azure/src/test/java/com/microsoft/azure/management/TestTemplate.java index 43803a309050f..08d05e1c237c2 100644 --- a/azure/src/test/java/com/microsoft/azure/TestTemplate.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestTemplate.java @@ -3,8 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; +import com.microsoft.azure.CloudException; +import com.microsoft.azure.PagedList; import com.microsoft.azure.management.resources.ResourceGroups; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; diff --git a/azure/src/test/java/com/microsoft/azure/TestUtils.java b/azure/src/test/java/com/microsoft/azure/management/TestUtils.java similarity index 99% rename from azure/src/test/java/com/microsoft/azure/TestUtils.java rename to azure/src/test/java/com/microsoft/azure/management/TestUtils.java index 1bab7f6d6052e..f3c639013583d 100644 --- a/azure/src/test/java/com/microsoft/azure/TestUtils.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestUtils.java @@ -4,7 +4,7 @@ * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.DataDisk; diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java b/azure/src/test/java/com/microsoft/azure/management/TestVirtualMachine.java similarity index 98% rename from azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java rename to azure/src/test/java/com/microsoft/azure/management/TestVirtualMachine.java index a4ef4e2cc0353..595532e02ccac 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestVirtualMachine.java @@ -4,7 +4,7 @@ * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import com.google.common.util.concurrent.SettableFuture; import com.microsoft.azure.credentials.ApplicationTokenCredentials; diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java b/azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineDataDisk.java similarity index 98% rename from azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java rename to azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineDataDisk.java index 35f582ad358f8..6985f0d64e131 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineDataDisk.java @@ -4,7 +4,7 @@ * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import com.microsoft.azure.management.compute.VirtualMachineDataDisk; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java b/azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineNics.java similarity index 99% rename from azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java rename to azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineNics.java index 6664e1c69daef..4639981e1dc50 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineNics.java @@ -4,7 +4,7 @@ * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSizes.java b/azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineSizes.java similarity index 98% rename from azure/src/test/java/com/microsoft/azure/TestVirtualMachineSizes.java rename to azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineSizes.java index 8494f7129568e..7b054f0c143f7 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSizes.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineSizes.java @@ -4,7 +4,7 @@ * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSsh.java b/azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineSsh.java similarity index 98% rename from azure/src/test/java/com/microsoft/azure/TestVirtualMachineSsh.java rename to azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineSsh.java index 135bfb98aef27..5721469e684eb 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSsh.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestVirtualMachineSsh.java @@ -4,7 +4,7 @@ * license information. */ -package com.microsoft.azure; +package com.microsoft.azure.management; import com.jcraft.jsch.JSch; import com.jcraft.jsch.Session;