From 323238168cfa74bc5b410655138aa3c869bd0144 Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Tue, 20 Mar 2012 16:44:28 +0000 Subject: [PATCH] Issue 830: AdminCatalog issues --- .../director/v1_5/domain/AdminCatalog.java | 12 ++------- .../vcloud/director/v1_5/domain/AdminOrg.java | 19 +++----------- .../vcloud/director/v1_5/domain/AdminVdc.java | 25 ++++++------------- .../vcloud/director/v1_5/domain/Catalog.java | 6 +++-- .../vcloud/director/v1_5/domain/Org.java | 2 ++ .../vcloud/director/v1_5/domain/Vdc.java | 2 ++ 6 files changed, 21 insertions(+), 45 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java index 8058916b1a..f9d3170b76 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java +++ b/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. * - * - *

Java class for AdminCatalog complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * * 

  * <complexType name="AdminCatalog">
  *   <complexContent>
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminOrg.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminOrg.java
index d5ab81c52b..76a83f8cd0 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminOrg.java
+++ b/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.
- *             
- * 
- * 
Java class for AdminOrg complex type.
- * 
- * 
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.
+ *            
  * 
  * <complexType name="AdminOrg">
  *   <complexContent>
@@ -59,10 +51,7 @@ import com.google.common.base.Objects.ToStringHelper;
  *   </complexContent>
  * </complexType>
  * 

- * 
- * 
  */
-@XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement(name = "AdminOrg")
 @XmlType(propOrder = {
     "settings",
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
index 72c4b70b74..dcd945ec1c 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
+++ b/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.
- *             
- * 
- * 
Java class for AdminVdc complex type.
- * 
- * 
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.
+ *
  * 
  * <complexType name="AdminVdc">
  *   <complexContent>
@@ -59,11 +50,9 @@ import com.google.common.base.Objects.ToStringHelper;
  *   </complexContent>
  * </complexType>
  * 

- * 
- * 
  */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AdminVdc", propOrder = {
+@XmlRootElement(name = "AdminVdc")
+@XmlType(name = "AdminVdcType", propOrder = {
     "resourceGuaranteedMemory",
     "resourceGuaranteedCpu",
     "vCpuInMhz",
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
index b4e936a6ea..eeeb825f4d 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
+++ b/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.
- * 

+ * Container for references to {@link VAppTemplate} and {@link Media} objects.
+ *
  * 
  * <complexType name="CatalogType" />
  * 

  *
  * @author grkvlt@apache.org
  */
+@XmlSeeAlso({ AdminCatalog.class })
 @XmlRootElement(name = "Catalog")
 public class Catalog extends CatalogType {
 
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java
index 8868328183..5969579b76 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java
+++ b/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;
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
index 601c33eacc..67b578294a 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
+++ b/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() {