http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/CreateDeployment.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/CreateDeployment.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/CreateDeployment.java
deleted file mode 100644
index 90e13a2..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/CreateDeployment.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.hostedservice;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "CreateDeployment")
-public class CreateDeployment {
-
-   /**
-    * The name for the deployment. The deployment name must be unique among 
other deployments for
-    * the hosted service.
-    */
-   @XmlElement(required = true, name = "Name")
-   private String name;
-
-   /**
-    * A URL that refers to the location of the service package in the Blob 
service. The service
-    * package can be located either in a storage account beneath the same 
subscription or a Shared
-    * Access Signature (SAS) URI from any storage account.
-    */
-   @XmlElement(required = true, name = "PackageUrl")
-   private String packageUrl;
-
-   /**
-    * The base-64 encoded service configuration file for the deployment.
-    */
-   @XmlElement(required = true, name = "Configuration")
-   private String configuration;
-
-   /**
-    * A name for the hosted service that is base-64 encoded. The name can be 
up to 100 characters in
-    * length.
-    * 
-    * It is recommended that the label be unique within the subscription. The 
name can be used
-    * identify the hosted service for your tracking purposes.
-    */
-   @XmlElement(required = true, name = "Label")
-   private String label;
-
-   /**
-    * 
-    * Indicates whether to start the deployment immediately after it is 
created. The default value
-    * is false.
-    * 
-    * If false, the service model is still deployed to the virtual machines 
but the code is not run
-    * immediately. Instead, the service is Suspended until you call Update 
Deployment Status and set
-    * the status to Running, at which time the service will be started. A 
deployed service still
-    * incurs charges, even if it is suspended.
-    */
-   @XmlElement(name = "StartDeployment")
-   private Boolean startDeployment;
-
-   /**
-    * 
-    * Optional. Indicates whether to treat package validation warnings as 
errors. The default value
-    * is false. If set to true, the Created Deployment operation fails if 
there are validation
-    * warnings on the service package.
-    */
-   @XmlElement(name = "TreatWarningsAsError")
-   private Boolean treatWarningsAsError;
-
-   @XmlElementWrapper(name = "ExtendedProperties")
-   @XmlElement(required = true, name = "ExtendedProperty")
-   private List<ExtendedProperty> extendedProperties = Lists.newArrayList();
-
-   public CreateDeployment() {
-   }
-
-   public String getName() {
-      return name;
-   }
-
-   public void setName(String name) {
-      this.name = name;
-   }
-
-   public String getPackageUrl() {
-      return packageUrl;
-   }
-
-   public void setPackageUrl(String packageUrl) {
-      this.packageUrl = packageUrl;
-   }
-
-   public String getConfiguration() {
-      return configuration;
-   }
-
-   public void setConfiguration(String configuration) {
-      this.configuration = configuration;
-   }
-
-   public String getLabel() {
-      return label;
-   }
-
-   public void setLabel(String label) {
-      this.label = label;
-   }
-
-   public Boolean getStartDeployment() {
-      return startDeployment;
-   }
-
-   public void setStartDeployment(Boolean startDeployment) {
-      this.startDeployment = startDeployment;
-   }
-
-   public Boolean getTreatWarningsAsError() {
-      return treatWarningsAsError;
-   }
-
-   public void setTreatWarningsAsError(Boolean treatWarningsAsError) {
-      this.treatWarningsAsError = treatWarningsAsError;
-   }
-
-   public List<ExtendedProperty> getExtendedProperties() {
-      return extendedProperties;
-   }
-
-   public void setExtendedProperties(List<ExtendedProperty> 
extendedProperties) {
-      this.extendedProperties = extendedProperties;
-   }
-
-   @Override
-   public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((configuration == null) ? 0 : 
configuration.hashCode());
-      result = prime * result + ((extendedProperties == null) ? 0 : 
extendedProperties.hashCode());
-      result = prime * result + ((label == null) ? 0 : label.hashCode());
-      result = prime * result + ((name == null) ? 0 : name.hashCode());
-      result = prime * result + ((packageUrl == null) ? 0 : 
packageUrl.hashCode());
-      result = prime * result + ((startDeployment == null) ? 0 : 
startDeployment.hashCode());
-      result = prime * result + ((treatWarningsAsError == null) ? 0 : 
treatWarningsAsError.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      CreateDeployment other = (CreateDeployment) obj;
-      if (configuration == null) {
-         if (other.configuration != null)
-            return false;
-      } else if (!configuration.equals(other.configuration))
-         return false;
-      if (extendedProperties == null) {
-         if (other.extendedProperties != null)
-            return false;
-      } else if (!extendedProperties.equals(other.extendedProperties))
-         return false;
-      if (label == null) {
-         if (other.label != null)
-            return false;
-      } else if (!label.equals(other.label))
-         return false;
-      if (name == null) {
-         if (other.name != null)
-            return false;
-      } else if (!name.equals(other.name))
-         return false;
-      if (packageUrl == null) {
-         if (other.packageUrl != null)
-            return false;
-      } else if (!packageUrl.equals(other.packageUrl))
-         return false;
-      if (startDeployment == null) {
-         if (other.startDeployment != null)
-            return false;
-      } else if (!startDeployment.equals(other.startDeployment))
-         return false;
-      if (treatWarningsAsError == null) {
-         if (other.treatWarningsAsError != null)
-            return false;
-      } else if (!treatWarningsAsError.equals(other.treatWarningsAsError))
-         return false;
-      return true;
-   }
-
-   @Override
-   public String toString() {
-      return "CreateDeployment [name=" + name + ", packageUrl=" + packageUrl + 
", configuration=" + configuration
-               + ", label=" + label + ", startDeployment=" + startDeployment + 
", treatWarningsAsError="
-               + treatWarningsAsError + ", extendedProperties=" + 
extendedProperties + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/ExtendedProperty.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/ExtendedProperty.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/ExtendedProperty.java
deleted file mode 100644
index 9f50be0..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/ExtendedProperty.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.hostedservice;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "ExtendedProperty")
-public class ExtendedProperty {
-
-   /**
-    * Represents the name of an extended hosted service property. Each 
extended property must have
-    * both a defined name and value. You can have a maximum of 50 extended 
property name/value
-    * pairs.
-    * 
-    * The maximum length of the Name element is 64 characters, only 
alphanumeric characters and
-    * underscores are valid in the Name, and the name must start with a 
letter. Attempting to use
-    * other characters, starting the Name with a non-letter character, or 
entering a name that is
-    * identical to that of another extended property owned by the same hosted 
service, will result
-    * in a status code 400 (Bad Request) error.
-    */
-   @XmlElement(name = "Name")
-   private String name;
-
-   /**
-    * Represents the value of an extended hosted service property. Each 
extended property must have
-    * both a defined name and value. You can have a maximum of 50 extended 
property name/value
-    * pairs, and each extended property value has a maximum length of 255 
characters.
-    */
-   @XmlElement(name = "Value")
-   private String value;
-
-   public ExtendedProperty() {
-   }
-
-   public String getName() {
-      return name;
-   }
-
-   public void setName(String name) {
-      this.name = name;
-   }
-
-   public String getValue() {
-      return value;
-   }
-
-   public void setValue(String value) {
-      this.value = value;
-   }
-
-   @Override
-   public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((name == null) ? 0 : name.hashCode());
-      result = prime * result + ((value == null) ? 0 : value.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      ExtendedProperty other = (ExtendedProperty) obj;
-      if (name == null) {
-         if (other.name != null)
-            return false;
-      } else if (!name.equals(other.name))
-         return false;
-      if (value == null) {
-         if (other.value != null)
-            return false;
-      } else if (!value.equals(other.value))
-         return false;
-      return true;
-   }
-
-   @Override
-   public String toString() {
-      return "ExtendedProperty [name=" + name + ", value=" + value + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/package-info.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/package-info.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/package-info.java
deleted file mode 100644
index 38bafea..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/hostedservice/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-@XmlSchema(namespace = "http://schemas.microsoft.com/windowsazure";, 
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.azure.management.domain.hostedservice;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSchema;
-

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/AbstractRole.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/AbstractRole.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/AbstractRole.java
deleted file mode 100644
index c58df75..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/AbstractRole.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-
-import com.google.common.collect.Lists;
-
-import org.jclouds.azure.management.domain.role.conf.ConfigurationSet;
-
-//@XmlRootElement(name = "PersistentVMRole")
-public abstract class AbstractRole {
-
-   /**
-    * Specifies the name for the virtual machine. The name must be unique 
within Windows Azure.
-    */
-   @XmlElement(required = true, name = "RoleName")
-   private String roleName;
-
-   /**
-    * The type of the role for the virtual machine. The only supported value 
is PersistentVMRole.
-    */
-   @XmlElement(required = true, name = "RoleType")
-   private String roleType;
-
-   /**
-    * Required. You must specify either a WindowsProvisioningConfigurationSet 
or
-    * LinuxProvisioningConfigurationSet configuration set.
-    * 
-    * Optional. You can specify a NetworkConfigurationSet which contains the 
metadata required to
-    * create the virtual network configuration for a virtual machine.
-    */
-   @XmlElementWrapper(name = "ConfigurationSets")
-   @XmlElement(name = "ConfigurationSet")
-   private List<ConfigurationSet> configurationSets = 
Lists.newArrayListWithCapacity(0);
-   
-   /**
-    * Specifies the name of an availability set to which to add the virtual 
machine. This value
-    * controls the virtual machine allocation in the Windows Azure 
environment. Virtual machines
-    * specified in the same availability set are allocated to different nodes 
to maximize
-    * availability.
-    */
-   @XmlElement(name = "AvailabilitySetName")
-   private String availabilitySetName;
-
-   @XmlElementWrapper(name = "DataVirtualHardDisks")
-   @XmlElement(name = "DataVirtualHardDisk")
-   private List<DataVirtualHardDisk> dataVirtualHardDisks = 
Lists.newArrayListWithCapacity(0);
-   
-   @XmlElement(name = "OSVirtualHardDisk")
-   private OSVirtualHardDisk osVirtualHardDisk;
-   
-   /**
-    * The size of the virtual machine to allocate. The default value is Small.
-    */
-   @XmlElement(name = "RoleSize")
-   private RoleSize roleSize;
-
-   public AbstractRole() {
-      super();
-   }
-
-   public String getRoleName() {
-      return roleName;
-   }
-
-   public String getRoleType() {
-      return roleType;
-   }
-
-   public String getAvailabilitySetName() {
-      return availabilitySetName;
-   }
-
-   public RoleSize getRoleSize() {
-      return roleSize;
-   }
-
-   public void setRoleName(String roleName) {
-      this.roleName = roleName;
-   }
-
-   public void setRoleType(String roleType) {
-      this.roleType = roleType;
-   }
-
-   public void setAvailabilitySetName(String availabilitySetName) {
-      this.availabilitySetName = availabilitySetName;
-   }
-
-   public void setRoleSize(RoleSize roleSize) {
-      this.roleSize = roleSize;
-   }
-
-   public void setOsVirtualHardDisk(OSVirtualHardDisk osVirtualHardDisk) {
-      this.osVirtualHardDisk = osVirtualHardDisk;
-   }
-
-   public OSVirtualHardDisk getOsVirtualHardDisk() {
-      return osVirtualHardDisk;
-   }
-
-   public List<? extends ConfigurationSet> getConfigurationSets() {
-      return configurationSets;
-   }
-
-   public void setConfigurationSets(List<ConfigurationSet> configurationSets) {
-      this.configurationSets = configurationSets;
-   }
-
-   public List<DataVirtualHardDisk> getDataVirtualHardDisks() {
-      return dataVirtualHardDisks;
-   }
-
-   public void setDataVirtualHardDisks(List<DataVirtualHardDisk> 
dataVirtualHardDisks) {
-      this.dataVirtualHardDisks = dataVirtualHardDisks;
-   }
-
-   @Override
-   public String toString() {
-      return "Role [roleName=" + roleName + ", roleType=" + roleType + ", 
availabilitySetName=" + availabilitySetName
-               + ", roleSize=" + roleSize + ", osVirtualHardDisk=" + 
osVirtualHardDisk + ", configurationSets="
-               + configurationSets + ", dataVirtualHardDisks=" + 
dataVirtualHardDisks + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DNS.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DNS.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DNS.java
deleted file mode 100644
index 0955b52..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DNS.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "Dns")
-public class DNS {
-   /**
-    * Contains the parameters specifying the DNS servers to use for the 
virtual machine.
-    */
-   @XmlElementWrapper(required = true, name = "DnsServers")
-   @XmlElement(name = "DnsServer")
-   private List<DNSServer> dnsServers = Lists.newArrayList();
-
-   public DNS() {
-      super();
-   }
-
-   public List<DNSServer> getDnsServers() {
-      return dnsServers;
-   }
-
-   public void setDnsServers(List<DNSServer> dnsServers) {
-      this.dnsServers = dnsServers;
-   }
-
-   @Override
-   public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((dnsServers == null) ? 0 : 
dnsServers.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      DNS other = (DNS) obj;
-      if (dnsServers == null) {
-         if (other.dnsServers != null)
-            return false;
-      } else if (!dnsServers.equals(other.dnsServers))
-         return false;
-      return true;
-   }
-
-   @Override
-   public String toString() {
-      return "DNS [dnsServers=" + dnsServers + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DNSServer.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DNSServer.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DNSServer.java
deleted file mode 100644
index 2d63fad..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DNSServer.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "DnsServer")
-public class DNSServer {
-
-   /**
-    * Specifies the name of the DNS server.
-    */
-   @XmlElement(required = true, name = "Name")
-   private String name;
-
-   /**
-    * Specifies the IP address of the DNS server.
-    */
-   @XmlElement(required = true, name = "Address")
-   private String address;
-
-   public DNSServer() {
-      super();
-   }
-
-   public String getName() {
-      return name;
-   }
-
-   public void setName(String name) {
-      this.name = name;
-   }
-
-   public String getAddress() {
-      return address;
-   }
-
-   public void setAddress(String address) {
-      this.address = address;
-   }
-
-   @Override
-   public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((address == null) ? 0 : address.hashCode());
-      result = prime * result + ((name == null) ? 0 : name.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      DNSServer other = (DNSServer) obj;
-      if (address == null) {
-         if (other.address != null)
-            return false;
-      } else if (!address.equals(other.address))
-         return false;
-      if (name == null) {
-         if (other.name != null)
-            return false;
-      } else if (!name.equals(other.name))
-         return false;
-      return true;
-   }
-
-   @Override
-   public String toString() {
-      return "DNSServer [name=" + name + ", address=" + address + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DataVirtualHardDisk.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DataVirtualHardDisk.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DataVirtualHardDisk.java
deleted file mode 100644
index a7ca035..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/DataVirtualHardDisk.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "DataVirtualHardDisk")
-public class DataVirtualHardDisk extends VirtualHardDisk {
-
-   @XmlElement(name = "Lun")
-   private Integer lun;
-
-   @XmlElement(name = "LogicalDiskSizeInGB")
-   private Integer logicalDiskSizeInGB;
-
-   public DataVirtualHardDisk() {
-
-   }
-
-   public Integer getLun() {
-      return lun;
-   }
-
-   public void setLun(Integer lun) {
-      this.lun = lun;
-   }
-
-   public Integer getLogicalDiskSizeInGB() {
-      return logicalDiskSizeInGB;
-   }
-
-   public void setLogicalDiskSizeInGB(Integer logicalDiskSizeInGB) {
-      this.logicalDiskSizeInGB = logicalDiskSizeInGB;
-   }
-
-   @Override
-   public String toString() {
-      return "DataVirtualHardDisk [lun=" + lun + ", logicalDiskSizeInGB=" + 
logicalDiskSizeInGB + ", hostCaching="
-               + hostCaching + ", diskLabel=" + diskLabel + ", diskName=" + 
diskName + ", mediaLink=" + mediaLink + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Deployment.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Deployment.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Deployment.java
deleted file mode 100644
index e58264f..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Deployment.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "Deployment")
-public class Deployment {
-
-   /**
-    * A name for the deployment. The deployment name must be unique among 
other deployments for the
-    * hosted service.
-    */
-   @XmlElement(required = true, name = "Name")
-   private String name;
-
-   /**
-    * Specifies the environment in which to deploy the virtual machine.
-    * 
-    * Possible values are: Staging Production
-    */
-   @XmlElement(required = true, name = "DeploymentSlot")
-   private String deploymentSlot;
-
-   /**
-    * A name for the hosted service that is base-64 encoded. The name can be 
up to 100 characters in
-    * length.
-    * 
-    * It is recommended that the label be unique within the subscription. The 
name can be used
-    * identify the hosted service for tracking purposes.
-    */
-   @XmlElement(required = true, name = "Label")
-   private String label;
-
-   @XmlElementWrapper(required = true, name = "RoleList")
-   @XmlElement(required = true, name = "Role")
-   private List<Role> roleList = Lists.newArrayList();
-
-   /**
-    * Specifies the name of an existing virtual network to which the 
deployment will belong.
-    * 
-    * Virtual networks are created by calling the Set Network Configuration 
operation.
-    */
-   @XmlElement(required = true, name = "VirtualNetworkName")
-   private String virtualNetworkName;
-
-   /**
-    * Contains a list of DNS servers to associate with the machine.
-    */
-   @XmlElement(required = true, name = "Dns")
-   private DNS dns;
-
-   public Deployment() {
-   }
-
-   public String getName() {
-      return name;
-   }
-
-   public void setName(String name) {
-      this.name = name;
-   }
-
-   public String getDeploymentSlot() {
-      return deploymentSlot;
-   }
-
-   public void setDeploymentSlot(String deploymentSlot) {
-      this.deploymentSlot = deploymentSlot;
-   }
-
-   public String getLabel() {
-      return label;
-   }
-
-   public void setLabel(String label) {
-      this.label = label;
-   }
-
-   public List<Role> getRoleList() {
-      return roleList;
-   }
-
-   public void setRoleList(List<Role> roleList) {
-      this.roleList = roleList;
-   }
-
-   public String getVirtualNetworkName() {
-      return virtualNetworkName;
-   }
-
-   public void setVirtualNetworkName(String virtualNetworkName) {
-      this.virtualNetworkName = virtualNetworkName;
-   }
-
-   public DNS getDns() {
-      return dns;
-   }
-
-   public void setDns(DNS dns) {
-      this.dns = dns;
-   }
-
-   @Override
-   public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((deploymentSlot == null) ? 0 : 
deploymentSlot.hashCode());
-      result = prime * result + ((dns == null) ? 0 : dns.hashCode());
-      result = prime * result + ((label == null) ? 0 : label.hashCode());
-      result = prime * result + ((name == null) ? 0 : name.hashCode());
-      result = prime * result + ((roleList == null) ? 0 : roleList.hashCode());
-      result = prime * result + ((virtualNetworkName == null) ? 0 : 
virtualNetworkName.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      Deployment other = (Deployment) obj;
-      if (deploymentSlot == null) {
-         if (other.deploymentSlot != null)
-            return false;
-      } else if (!deploymentSlot.equals(other.deploymentSlot))
-         return false;
-      if (dns == null) {
-         if (other.dns != null)
-            return false;
-      } else if (!dns.equals(other.dns))
-         return false;
-      if (label == null) {
-         if (other.label != null)
-            return false;
-      } else if (!label.equals(other.label))
-         return false;
-      if (name == null) {
-         if (other.name != null)
-            return false;
-      } else if (!name.equals(other.name))
-         return false;
-      if (roleList == null) {
-         if (other.roleList != null)
-            return false;
-      } else if (!roleList.equals(other.roleList))
-         return false;
-      if (virtualNetworkName == null) {
-         if (other.virtualNetworkName != null)
-            return false;
-      } else if (!virtualNetworkName.equals(other.virtualNetworkName))
-         return false;
-      return true;
-   }
-
-   @Override
-   public String toString() {
-      return "Deployment [name=" + name + ", deploymentSlot=" + deploymentSlot 
+ ", label=" + label + ", roleList="
-               + roleList + ", virtualNetworkName=" + virtualNetworkName + ", 
dns=" + dns + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/HostCaching.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/HostCaching.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/HostCaching.java
deleted file mode 100644
index df78bc6..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/HostCaching.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlType(name = "HostCaching")
-@XmlEnum
-public enum HostCaching {
-   @XmlEnumValue("ReadOnly")
-   ReadOnly, @XmlEnumValue("ReadWrite")
-   ReadWrite;
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/OSVirtualHardDisk.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/OSVirtualHardDisk.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/OSVirtualHardDisk.java
deleted file mode 100644
index 91e03cc..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/OSVirtualHardDisk.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Contains the parameters Windows Azure uses to create the operating system
- * disk for the virtual machine.
- */
-@XmlRootElement(name = "OSVirtualHardDisk")
-public class OSVirtualHardDisk extends VirtualHardDisk {
-
-       /**
-        * Specifies the name of the disk image to use to create the virtual
-        * machine.
-        */
-       @XmlElement(name = "SourceImageName")
-       private String sourceImageName;
-
-       @XmlElement(name = "OS")
-       private String os;
-
-       public OSVirtualHardDisk() {
-
-       }
-
-       public String getSourceImageName() {
-               return sourceImageName;
-       }
-
-       public void setSourceImageName(String sourceImageName) {
-               this.sourceImageName = sourceImageName;
-       }
-
-       public void setOs(String os) {
-               this.os = os;
-       }
-
-       public String getOs() {
-               return os;
-       }
-
-       @Override
-       public String toString() {
-               return "OSVirtualHardDisk [hostCaching=" + hostCaching + ", 
diskLabel="
-                               + diskLabel + ", diskName=" + diskName + ", 
mediaLink="
-                               + mediaLink + ", sourceImageName=" + 
sourceImageName + "]";
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/PersistentVMRole.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/PersistentVMRole.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/PersistentVMRole.java
deleted file mode 100644
index 4198831..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/PersistentVMRole.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "PersistentVMRole")
-public class PersistentVMRole extends AbstractRole {
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Protocol.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Protocol.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Protocol.java
deleted file mode 100644
index 92c01ed..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Protocol.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlType(name = "Protocol")
-@XmlEnum
-public enum Protocol {
-   @XmlEnumValue("tcp")
-   TCP, @XmlEnumValue("http")
-   HTTP, @XmlEnumValue("udp")
-   UDP;
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Role.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Role.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Role.java
deleted file mode 100644
index 4de282e..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/Role.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "Role")
-public class Role extends AbstractRole {
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/RoleSize.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/RoleSize.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/RoleSize.java
deleted file mode 100644
index bcdac6e..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/RoleSize.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlType(name = "RoleSize")
-@XmlEnum
-public enum RoleSize {
-   @XmlEnumValue("ExtraSmall")
-   ExtraSmall, 
-   @XmlEnumValue("Small")
-   Small, 
-   @XmlEnumValue("Medium")
-   Medium, 
-   @XmlEnumValue("Large")
-   Large, 
-   @XmlEnumValue("ExtraLarge")
-   ExtraLarge;
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/VirtualHardDisk.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/VirtualHardDisk.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/VirtualHardDisk.java
deleted file mode 100644
index 51f018b..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/VirtualHardDisk.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role;
-
-import javax.xml.bind.annotation.XmlElement;
-
-public class VirtualHardDisk {
-
-   /**
-    * Specifies whether the OS disk can be cached for greater efficiency 
during writes. This setting
-    * impacts the consistency and performance of the OS disk. The default 
value is ReadWrite.
-    */
-   @XmlElement(name = "HostCaching")
-   protected HostCaching hostCaching;
-   /**
-    * Specifies the friendly name of the disk containing the guest OS image in 
the image repository.
-    */
-   @XmlElement(name = "DiskLabel")
-   protected String diskLabel;
-   /**
-    * Specifies the name of an operating system image in the image repository.
-    */
-   @XmlElement(name = "DiskName")
-   protected String diskName;
-   /**
-    * Specifies the URI for a blob in a Windows Azure storage account that 
contains the OS image to
-    * use to create the OS disk.
-    */
-   @XmlElement(name = "MediaLink")
-   protected String mediaLink;
-
-   public VirtualHardDisk() {
-
-   }
-
-   public HostCaching getHostCaching() {
-      return hostCaching;
-   }
-
-   public void setHostCaching(HostCaching hostCaching) {
-      this.hostCaching = hostCaching;
-   }
-
-   public String getDiskLabel() {
-      return diskLabel;
-   }
-
-   public void setDiskLabel(String diskLabel) {
-      this.diskLabel = diskLabel;
-   }
-
-   public String getDiskName() {
-      return diskName;
-   }
-
-   public void setDiskName(String diskName) {
-      this.diskName = diskName;
-   }
-
-   public String getMediaLink() {
-      return mediaLink;
-   }
-
-   public void setMediaLink(String mediaLink) {
-      this.mediaLink = mediaLink;
-   }
-
-   @Override
-   public String toString() {
-      return "VirtualHardDisk [hostCaching=" + hostCaching + ", diskLabel=" + 
diskLabel + ", diskName=" + diskName
-               + ", mediaLink=" + mediaLink + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/CertificateSetting.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/CertificateSetting.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/CertificateSetting.java
deleted file mode 100644
index 2ef1cf3..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/CertificateSetting.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "CertificateSetting")
-public class CertificateSetting {
-
-   /**
-    * Specifies the name of the certificate store from which retrieve 
certificate.
-    */
-   @XmlElement(required = true, name = "StoreLocation")
-   private String StoreLocation;
-   /**
-    * Specifies the target certificate store location on the virtual machine.
-    * 
-    * The only supported value is LocalMachine.
-    */
-   @XmlElement(required = true, name = "StoreName")
-   private String StoreName;
-   /**
-    * Specifies the thumbprint of the certificate to be provisioned. The 
thumbprint must specify an
-    * existing service certificate.
-    */
-   @XmlElement(required = true, name = "Thumbprint")
-   private String Thumbprint;
-
-   public CertificateSetting() {
-      super();
-   }
-
-   public String getStoreLocation() {
-      return StoreLocation;
-   }
-
-   public void setStoreLocation(String storeLocation) {
-      StoreLocation = storeLocation;
-   }
-
-   public String getStoreName() {
-      return StoreName;
-   }
-
-   public void setStoreName(String storeName) {
-      StoreName = storeName;
-   }
-
-   public String getThumbprint() {
-      return Thumbprint;
-   }
-
-   public void setThumbprint(String thumbprint) {
-      Thumbprint = thumbprint;
-   }
-
-   @Override
-   public String toString() {
-      return "CertificateSetting [StoreLocation=" + StoreLocation + ", 
StoreName=" + StoreName + ", Thumbprint="
-               + Thumbprint + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/ConfigurationSet.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/ConfigurationSet.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/ConfigurationSet.java
deleted file mode 100644
index 4185b1d..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/ConfigurationSet.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-@XmlJavaTypeAdapter(ConfigurationSetAdapter.class)
-public abstract class ConfigurationSet {
-
-   /**
-    * Specifies the configuration set type.
-    */
-   @XmlElement(required = true, name = "ConfigurationSetType")
-   protected String configurationSetType;
-
-   public ConfigurationSet() {
-   }
-
-   public String getConfigurationSetType() {
-      return configurationSetType;
-   }
-
-   public void setConfigurationSetType(String configurationSetType) {
-      this.configurationSetType = configurationSetType;
-   }
-
-   @Override
-   public String toString() {
-      return "ConfigurationSet [configurationSetType=" + configurationSetType 
+ "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/ConfigurationSetAdapter.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/ConfigurationSetAdapter.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/ConfigurationSetAdapter.java
deleted file mode 100644
index 19abcf8..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/ConfigurationSetAdapter.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-import java.util.List;
-import java.util.TimeZone;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import com.google.common.collect.Lists;
-
-public class ConfigurationSetAdapter extends
-         XmlAdapter<ConfigurationSetAdapter.AdaptedConfigurationSet, 
ConfigurationSet> {
-
-   @Override
-   public ConfigurationSet unmarshal(AdaptedConfigurationSet adapted) throws 
Exception {
-
-      final String type = adapted.configurationSetType;
-      if (NetworkConfiguration.ID.equals(type)) {
-         NetworkConfiguration network = new NetworkConfiguration();
-         network.setConfigurationSetType(NetworkConfiguration.ID);
-         network.setInputEndpoints(adapted.inputEndpoints);
-         network.setSubnetNames(adapted.subnetNames);
-         return network;
-      } else if (LinuxProvisioningConfiguration.ID.equals(type)) {
-         LinuxProvisioningConfiguration linux = new 
LinuxProvisioningConfiguration();
-         linux.setConfigurationSetType(LinuxProvisioningConfiguration.ID);
-         
linux.setDisableSshPasswordAuthentication(adapted.disableSshPasswordAuthentication);
-         linux.setHostName(adapted.hostName);
-         linux.setSsh(adapted.ssh);
-         linux.setUserName(adapted.userName);
-         linux.setUserPassword(adapted.userPassword);
-         return linux;
-      } else if (WindowsProvisioningConfiguration.ID.equals(type)) {
-         WindowsProvisioningConfiguration windows = new 
WindowsProvisioningConfiguration();
-         windows.setConfigurationSetType(WindowsProvisioningConfiguration.ID);
-         windows.setAdminPassword(adapted.adminPassword);
-         windows.setComputerName(adapted.computerName);
-         windows.setDomainJoin(adapted.domainJoin);
-         windows.setEnableAutomaticUpdates(adapted.enableAutomaticUpdates);
-         
windows.setResetPasswordOnFirstLogon(adapted.resetPasswordOnFirstLogon);
-         
windows.setStoredCertificateSettings(adapted.storedCertificateSettings);
-         windows.setTimeZone(adapted.timeZone);
-         return windows;
-      }
-
-      return null;
-   }
-
-   @Override
-   public AdaptedConfigurationSet marshal(ConfigurationSet configSet) throws 
Exception {
-      if (configSet == null) {
-         return null;
-      }
-
-      AdaptedConfigurationSet adapted = new AdaptedConfigurationSet();
-      adapted.configurationSetType = configSet.getConfigurationSetType();
-
-      if (configSet instanceof NetworkConfiguration) {
-         NetworkConfiguration network = (NetworkConfiguration) configSet;
-         adapted.inputEndpoints = network.getInputEndpoints();
-         adapted.subnetNames = network.getSubnetNames();
-      } else if (configSet instanceof LinuxProvisioningConfiguration) {
-         LinuxProvisioningConfiguration linux = 
(LinuxProvisioningConfiguration) configSet;
-         adapted.disableSshPasswordAuthentication = 
linux.getDisableSshPasswordAuthentication();
-         adapted.hostName = linux.getHostName();
-         adapted.ssh = linux.getSsh();
-         adapted.userName = linux.getUserName();
-         adapted.userPassword = linux.getUserPassword();
-      } else if (configSet instanceof WindowsProvisioningConfiguration) {
-         WindowsProvisioningConfiguration windows = 
(WindowsProvisioningConfiguration) configSet;
-         adapted.adminPassword = windows.getAdminPassword();
-         adapted.computerName = windows.getComputerName();
-         adapted.domainJoin = windows.getDomainJoin();
-         adapted.enableAutomaticUpdates = windows.getEnableAutomaticUpdates();
-         adapted.resetPasswordOnFirstLogon = 
windows.getResetPasswordOnFirstLogon();
-         adapted.storedCertificateSettings = 
windows.getStoredCertificateSettings();
-         adapted.timeZone = windows.getTimeZone();
-      }
-
-      return adapted;
-   }
-
-   public static class AdaptedConfigurationSet {
-      @XmlElement(required = true, name = "ConfigurationSetType")
-      public String configurationSetType;
-
-      @XmlElement(required = true, name = "HostName")
-      public String hostName;
-
-      @XmlElement(required = true, name = "UserName")
-      public String userName;
-
-      @XmlElement(required = true, name = "UserPassword")
-      public String userPassword;
-
-      @XmlElement(name = "DisableSshPasswordAuthentication")
-      public Boolean disableSshPasswordAuthentication;
-
-      @XmlElement(name = "SSH")
-      public SSH ssh;
-
-      @XmlElement(name = "ComputerName")
-      public String computerName;
-
-      @XmlElement(required = true, name = "AdminPassword")
-      public String adminPassword;
-
-      @XmlElement(required = true, name = "ResetPasswordOnFirstLogon")
-      public Boolean resetPasswordOnFirstLogon;
-
-      @XmlElement(name = "EnableAutomaticUpdates")
-      public Boolean enableAutomaticUpdates;
-
-      @XmlElement(name = "TimeZone")
-      public TimeZone timeZone;
-
-      @XmlElement(name = "DomainJoin")
-      public DomainJoin domainJoin;
-
-      @XmlElementWrapper(required = true, name = "StoredCertificateSettings")
-      @XmlElement(name = "CertificateSetting")
-      public List<CertificateSetting> storedCertificateSettings = 
Lists.newArrayList();
-
-      @XmlElementWrapper(name = "InputEndpoints")
-      @XmlElement(name = "InputEndpoint")
-      public List<InputEndpoint> inputEndpoints = 
Lists.newArrayListWithCapacity(0);
-
-      @XmlElementWrapper(name = "SubnetNames")
-      @XmlElement(name = "SubnetName")
-      public List<String> subnetNames = Lists.newArrayListWithCapacity(0);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/Credentials.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/Credentials.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/Credentials.java
deleted file mode 100644
index f4784a6..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/Credentials.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "Credentials")
-public class Credentials {
-
-   /**
-    * Specifies the name of the domain used to authenticate an account. The 
value is a fully
-    * qualified DNS domain.
-    */
-   @XmlElement(name = "Domain")
-   private String domain;
-   /**
-    * Specifies a user name in the domain that can be used to join the domain.
-    */
-   @XmlElement(required = true, name = "Username")
-   private String username;
-   /**
-    * Specifies the password to use to join the domain.
-    */
-   @XmlElement(name = "Password")
-   private String password;
-
-   public Credentials() {
-      super();
-   }
-
-   public String getDomain() {
-      return domain;
-   }
-
-   public void setDomain(String domain) {
-      this.domain = domain;
-   }
-
-   public String getUsername() {
-      return username;
-   }
-
-   public void setUsername(String username) {
-      this.username = username;
-   }
-
-   public String getPassword() {
-      return password;
-   }
-
-   public void setPassword(String password) {
-      this.password = password;
-   }
-
-   @Override
-   public String toString() {
-      return "Credentials [domain=" + domain + ", username=" + username + ", 
password=" + password + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/DomainJoin.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/DomainJoin.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/DomainJoin.java
deleted file mode 100644
index a04c0b5..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/DomainJoin.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "DomainJoin")
-public class DomainJoin {
-
-   /**
-    * Specifies the domain to join.
-    */
-   @XmlElement(name = "JoinDomain")
-   private String joinDomain;
-   /**
-    * Specifies the Lightweight Directory Access Protocol (LDAP) X 
500-distinguished name of the
-    * organizational unit (OU) in which the computer account is created. This 
account is in Active
-    * Directory on a domain controller in the domain to which the computer is 
being joined.
-    */
-   @XmlElement(name = "MachineObjectOU")
-   private String machineObjectOU;
-   /**
-    * Specifies the Domain, Password, and Username values to use to join the 
virtual machine to the
-    * domain.
-    */
-   @XmlElement(name = "Credentials")
-   private Credentials credentials;
-
-   public DomainJoin() {
-      super();
-   }
-
-   public String getJoinDomain() {
-      return joinDomain;
-   }
-
-   public void setJoinDomain(String joinDomain) {
-      this.joinDomain = joinDomain;
-   }
-
-   public String getMachineObjectOU() {
-      return machineObjectOU;
-   }
-
-   public void setMachineObjectOU(String machineObjectOU) {
-      this.machineObjectOU = machineObjectOU;
-   }
-
-   public Credentials getCredentials() {
-      return credentials;
-   }
-
-   public void setCredentials(Credentials credentials) {
-      this.credentials = credentials;
-   }
-
-   @Override
-   public String toString() {
-      return "DomainJoin [joinDomain=" + joinDomain + ", machineObjectOU=" + 
machineObjectOU + ", credentials="
-               + credentials + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/InputEndpoint.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/InputEndpoint.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/InputEndpoint.java
deleted file mode 100644
index 9d726d4..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/InputEndpoint.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.azure.management.domain.role.Protocol;
-
-@XmlRootElement(name = "InputEndpoint")
-public class InputEndpoint {
-
-   /**
-        * 
-        */
-   @XmlElement(name = "EnableDirectServerReturn")
-   private Boolean enableDirectServerReturn;
-
-   /**
-    * Specifies a name for a set of load-balanced endpoints. Specifying this 
element for a given
-    * endpoint adds it to the set.
-    */
-   @XmlElement(required = true, name = "LoadBalancedEndpointSetName")
-   private String loadBalancedEndpointSetName;
-
-   /**
-    * Specifies the internal port on which the virtual machine is listening to 
serve the endpoint.
-    */
-   @XmlElement(required = true, name = "LocalPort")
-   private Integer localPort;
-
-   /**
-    * Specifies the name for the external endpoint.
-    */
-   @XmlElement(required = true, name = "Name")
-   private String name;
-
-   /**
-    * Specifies the external port to use for the endpoint.
-    */
-   @XmlElement(required = true, name = "Port")
-   private Integer port;
-
-   @XmlElement(name = "LoadBalancerProbe")
-   private LoadBalancerProbe loadBalancerProbe;
-
-   @XmlElement(name = "Protocol")
-   private Protocol protocol;
-
-   @XmlElement(name = "Vip")
-   private String vip;
-
-   public InputEndpoint() {
-   }
-
-   public Boolean getEnableDirectServerReturn() {
-      return enableDirectServerReturn;
-   }
-
-   public void setEnableDirectServerReturn(Boolean enableDirectServerReturn) {
-      this.enableDirectServerReturn = enableDirectServerReturn;
-   }
-
-   public String getLoadBalancedEndpointSetName() {
-      return loadBalancedEndpointSetName;
-   }
-
-   public void setLoadBalancedEndpointSetName(String 
loadBalancedEndpointSetName) {
-      this.loadBalancedEndpointSetName = loadBalancedEndpointSetName;
-   }
-
-   public Integer getLocalPort() {
-      return localPort;
-   }
-
-   public void setLocalPort(Integer localPort) {
-      this.localPort = localPort;
-   }
-
-   public String getName() {
-      return name;
-   }
-
-   public void setName(String name) {
-      this.name = name;
-   }
-
-   public Integer getPort() {
-      return port;
-   }
-
-   public void setPort(Integer port) {
-      this.port = port;
-   }
-
-   public LoadBalancerProbe getLoadBalancerProbe() {
-      return loadBalancerProbe;
-   }
-
-   public void setLoadBalancerProbe(LoadBalancerProbe loadBalancerProbe) {
-      this.loadBalancerProbe = loadBalancerProbe;
-   }
-
-   public Protocol getProtocol() {
-      return protocol;
-   }
-
-   public void setProtocol(Protocol protocol) {
-      this.protocol = protocol;
-   }
-
-   public String getVip() {
-      return vip;
-   }
-
-   public void setVip(String vip) {
-      this.vip = vip;
-   }
-
-   @Override
-   public String toString() {
-      return "InputEndpoint [enableDirectServerReturn=" + 
enableDirectServerReturn + ", loadBalancedEndpointSetName="
-               + loadBalancedEndpointSetName + ", localPort=" + localPort + ", 
name=" + name + ", port=" + port
-               + ", loadBalancerProbe=" + loadBalancerProbe + ", protocol=" + 
protocol + ", vip=" + vip + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/KeyPair.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/KeyPair.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/KeyPair.java
deleted file mode 100644
index 8ba3714..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/KeyPair.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "KeyPair")
-public class KeyPair extends SSHKey {
-
-   public KeyPair() {
-   }
-
-   @Override
-   public String toString() {
-      return "KeyPair [fingerPrint=" + fingerPrint + ", path=" + path + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/LinuxProvisioningConfiguration.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/LinuxProvisioningConfiguration.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/LinuxProvisioningConfiguration.java
deleted file mode 100644
index 10c47c0..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/LinuxProvisioningConfiguration.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-
-public class LinuxProvisioningConfiguration extends ConfigurationSet {
-
-   public static final String ID = "LinuxProvisioningConfiguration";
-
-   /**
-    * Specifies the host name for the VM. Host names are ASCII character 
strings 1 to 64 characters
-    * in length.
-    */
-   // @XmlElement(required = true,name = "HostName")
-   private String hostName;
-   /**
-    * Specifies the name of a user to be created in the sudoer group of the 
virtual machine. User
-    * names are ASCII character strings 1 to 32 characters in length.
-    */
-   // @XmlElement(required = true,name = "UserName")
-   private String userName;
-   /**
-    * Specifies the associated password for the user name. 
PasswoazureManagement are ASCII character
-    * strings 6 to 72 characters in length.
-    */
-   // @XmlElement(required = true,name = "UserPassword")
-   private String userPassword;
-   /**
-    * Specifies whether or not SSH password authentication is disabled. By 
default this value is set
-    * to true.
-    */
-   // @XmlElement(name = "DisableSshPasswordAuthentication")
-   private Boolean disableSshPasswordAuthentication;
-   /**
-    * Specifies the SSH public keys and key pairs to populate in the image 
during provisioning.
-    */
-   // @XmlElement(name = "SSH")
-   private SSH ssh;
-
-   public LinuxProvisioningConfiguration() {
-
-   }
-
-   public String getHostName() {
-      return hostName;
-   }
-
-   public void setHostName(String hostName) {
-      this.hostName = hostName;
-   }
-
-   public String getUserName() {
-      return userName;
-   }
-
-   public void setUserName(String userName) {
-      this.userName = userName;
-   }
-
-   public String getUserPassword() {
-      return userPassword;
-   }
-
-   public void setUserPassword(String userPassword) {
-      this.userPassword = userPassword;
-   }
-
-   public Boolean getDisableSshPasswordAuthentication() {
-      return disableSshPasswordAuthentication;
-   }
-
-   public void setDisableSshPasswordAuthentication(Boolean 
disableSshPasswordAuthentication) {
-      this.disableSshPasswordAuthentication = disableSshPasswordAuthentication;
-   }
-
-   public SSH getSsh() {
-      return ssh;
-   }
-
-   public void setSsh(SSH ssh) {
-      this.ssh = ssh;
-   }
-
-   @Override
-   public String toString() {
-      return "LinuxProvisioningConfigurationSet [hostName=" + hostName + ", 
userName=" + userName + ", userPassword="
-               + userPassword + ", disableSshPasswordAuthentication=" + 
disableSshPasswordAuthentication + ", ssh="
-               + ssh + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/LoadBalancerProbe.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/LoadBalancerProbe.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/LoadBalancerProbe.java
deleted file mode 100644
index b113bfb..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/LoadBalancerProbe.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.azure.management.domain.role.Protocol;
-
-/**
- * Contains properties that specify the endpoint settings which the Windows 
Azure load balancer uses
- * to monitor the availability of this virtual machine before forwarding 
traffic to the endpoint.
- */
-@XmlRootElement(name = "LoadBalancerProbe")
-public class LoadBalancerProbe {
-
-   /**
-    * Specifies the relative path name to inspect to determine the virtual 
machine availability
-    * status. If Protocol is set to TCP, this value must be NULL.
-    */
-   @XmlElement(name = "Path")
-   private String path;
-   /**
-    * Specifies the port to use to inspect the virtual machine availability 
status.
-    */
-   @XmlElement(name = "Port")
-   private Integer port;
-   /**
-    * Specifies the protocol to use to inspect the virtual machine 
availability status.
-    */
-   @XmlElement(name = "Protocol")
-   private Protocol protocol;
-
-   public LoadBalancerProbe() {
-      super();
-   }
-
-   public String getPath() {
-      return path;
-   }
-
-   public void setPath(String path) {
-      this.path = path;
-   }
-
-   public Integer getPort() {
-      return port;
-   }
-
-   public void setPort(Integer port) {
-      this.port = port;
-   }
-
-   public Protocol getProtocol() {
-      return protocol;
-   }
-
-   public void setProtocol(Protocol protocol) {
-      this.protocol = protocol;
-   }
-
-   @Override
-   public String toString() {
-      return "LoadBalancerProbe [path=" + path + ", port=" + port + ", 
protocol=" + protocol + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/NetworkConfiguration.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/NetworkConfiguration.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/NetworkConfiguration.java
deleted file mode 100644
index d84548b..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/NetworkConfiguration.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-//@XmlRootElement(name = "ConfigurationSet")
-public class NetworkConfiguration extends ConfigurationSet {
-
-   public static final String ID = "NetworkConfiguration";
-
-   /**
-    * Contains a collection of external endpoints for the virtual machine.
-    */
-   // @XmlElementWrapper(name = "InputEndpoints")
-   // @XmlElement(name = "InputEndpoint")
-   private List<InputEndpoint> inputEndpoints = 
Lists.newArrayListWithCapacity(0);
-
-   /**
-    * Specifies the name of a subnet to which the virtual machine belongs.
-    */
-   // @XmlElementWrapper(name = "SubnetNames")
-   // @XmlElement(name = "SubnetName")
-   private List<String> subnetNames = Lists.newArrayListWithCapacity(0);
-
-   public NetworkConfiguration() {
-      setConfigurationSetType(ID);
-   }
-
-   public List<InputEndpoint> getInputEndpoints() {
-      return inputEndpoints;
-   }
-
-   public void setInputEndpoints(List<InputEndpoint> inputEndpoints) {
-      this.inputEndpoints = inputEndpoints;
-   }
-
-   public List<String> getSubnetNames() {
-      return subnetNames;
-   }
-
-   public void setSubnetNames(List<String> subnetNames) {
-      this.subnetNames = subnetNames;
-   }
-
-   @Override
-   public String toString() {
-      return "NetworkConfigurationSet [configurationSetType=" + 
configurationSetType + ", InputEndpoints="
-               + inputEndpoints + ", SubnetNames=" + subnetNames + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/PublicKey.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/PublicKey.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/PublicKey.java
deleted file mode 100644
index 7576e7a..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/PublicKey.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "PublicKey")
-public class PublicKey extends SSHKey {
-
-   public PublicKey() {
-   }
-
-   @Override
-   public String toString() {
-      return "PublicKey [fingerPrint=" + fingerPrint + ", path=" + path + "]";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ab58bd2/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/SSH.java
----------------------------------------------------------------------
diff --git 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/SSH.java
 
b/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/SSH.java
deleted file mode 100644
index b7d9990..0000000
--- 
a/azure-management/src/main/java/org/jclouds/azure/management/domain/role/conf/SSH.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.azure.management.domain.role.conf;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "SSH")
-public class SSH {
-
-   /**
-    * Specifies the collection of SSH public keys.
-    */
-   @XmlElementWrapper(name = "PublicKeys")
-   @XmlElement(name = "PublicKey")
-   private List<PublicKey> publicKeys = Lists.newArrayListWithCapacity(0);
-
-   /**
-    * Specifies the public key.
-    */
-   @XmlElementWrapper(name = "KeyPairs")
-   @XmlElement(name = "KeyPair")
-   private List<KeyPair> keyPairs = Lists.newArrayListWithCapacity(0);
-
-   public SSH() {
-   }
-
-   public List<PublicKey> getPublicKeys() {
-      return publicKeys;
-   }
-
-   public void setPublicKeys(List<PublicKey> publicKeys) {
-      this.publicKeys = publicKeys;
-   }
-
-   public List<KeyPair> getKeyPairs() {
-      return keyPairs;
-   }
-
-   public void setKeyPairs(List<KeyPair> keyPairs) {
-      this.keyPairs = keyPairs;
-   }
-
-   @Override
-   public String toString() {
-      return "SSH [publicKeys=" + publicKeys + ", keyPairs=" + keyPairs + "]";
-   }
-}

Reply via email to