Skip to content

Commit

Permalink
Merge pull request Azure#1144 from jianghaolu/master
Browse files Browse the repository at this point in the history
Move Azure from com.microsoft.azure to com.microsoft.azure.management
Martin Sawicki authored Oct 3, 2016
2 parents 351c20b + 99c7d11 commit 669608f
Showing 37 changed files with 46 additions and 37 deletions.
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@
/**
* This package contains the Azure rollup client.
*/
package com.microsoft.azure;
package com.microsoft.azure.management;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;

Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;

Original file line number Diff line number Diff line change
@@ -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;

Original file line number Diff line number Diff line change
@@ -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;

Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 669608f

Please sign in to comment.