Issue 830: AdminCatalog issues

labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java

@@ -16,23 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.jclouds.vcloud.director.v1_5.domain;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * 
- *                 Admin representation of the container for meta data (key-value pair) associated to different
- *                 entities in the system.
+ * Admin representation of the container for meta data (key-value pair) associated to different
+ * entities in the system.
  *             
- * 
- * <p>Java class for AdminCatalog complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
  * <pre>
  * &lt;complexType name="AdminCatalog">
  *   &lt;complexContent>

labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminOrg.java

@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.jclouds.vcloud.director.v1_5.domain;
 
 import static com.google.common.base.Objects.equal;
@@ -30,18 +29,11 @@ import javax.xml.bind.annotation.XmlType;
 import com.google.common.base.Objects;
 import com.google.common.base.Objects.ToStringHelper;
 
-
 /**
- * 
- *                 The AdminOrg represents an administrative view of an organization.
- *                 It includes all members of the Org element, and adds several
- *                 elements that can be viewed and modified only by system administrators.
- *             
- * 
- * <p>Java class for AdminOrg complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * The AdminOrg represents an administrative view of an organization.
+ * It includes all members of the Org element, and adds several
+ * elements that can be viewed and modified only by system administrators.
+ *            
  * <pre>
  * &lt;complexType name="AdminOrg">
  *   &lt;complexContent>
@@ -59,10 +51,7 @@ import com.google.common.base.Objects.ToStringHelper;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
-@XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement(name = "AdminOrg")
 @XmlType(propOrder = {
     "settings",

labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java

@@ -16,31 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.jclouds.vcloud.director.v1_5.domain;
 
 import static com.google.common.base.Objects.equal;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 import com.google.common.base.Objects;
 import com.google.common.base.Objects.ToStringHelper;
 
-
 /**
- * 
- *                 Provides an administrative view of a vDC. Includes all members
- *                 of the Vdc element, and adds several elements that can be
- *                 viewed and modified only by administrators.
- *             
- * 
- * <p>Java class for AdminVdc complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ * Provides an administrative view of a vDC. Includes all members
+ * of the Vdc element, and adds several elements that can be
+ * viewed and modified only by administrators.
+ *
  * <pre>
  * &lt;complexType name="AdminVdc">
  *   &lt;complexContent>
@@ -59,11 +50,9 @@ import com.google.common.base.Objects.ToStringHelper;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AdminVdc", propOrder = {
+@XmlRootElement(name = "AdminVdc")
+@XmlType(name = "AdminVdcType", propOrder = {
     "resourceGuaranteedMemory",
     "resourceGuaranteedCpu",
     "vCpuInMhz",

labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java

@@ -19,18 +19,20 @@
 package org.jclouds.vcloud.director.v1_5.domain;
 
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
 
 import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
 
 /**
- * Container for references to VappTemplate and Media objects.
- * <p/>
+ * Container for references to {@link VAppTemplate} and {@link Media} objects.
+ *
  * <pre>
  * &lt;complexType name="CatalogType" /&gt;
  * </pre>
  *
  * @author grkvlt@apache.org
  */
+@XmlSeeAlso({ AdminCatalog.class })
 @XmlRootElement(name = "Catalog")
 public class Catalog extends CatalogType {
 

labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java

@@ -22,6 +22,7 @@ import static com.google.common.base.Objects.equal;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
 
 import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
 
@@ -40,6 +41,7 @@ import com.google.common.base.Objects.ToStringHelper;
  * @author Adrian Cole
  */
 @XmlRootElement(name = "Org")
+@XmlSeeAlso({ AdminOrg.class })
 public class Org extends EntityType {
 
    public static final String MEDIA_TYPE = VCloudDirectorMediaType.ORG;

labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java

@@ -23,6 +23,7 @@ import static com.google.common.base.Objects.equal;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 
 import com.google.common.base.Objects;
@@ -37,6 +38,7 @@ import com.google.common.base.Objects.ToStringHelper;
  */
 @XmlRootElement(name = "Vdc")
 @XmlType(name = "VdcType")
+@XmlSeeAlso({ AdminVdc.class })
 public class Vdc extends EntityType {
 
    public static Builder<?> builder() {