Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed namespace identifier to VCLOUD_1_5_NS

This commit is contained in:
Andrew Donald Kennedy 2012-02-09 01:47:27 +00:00
parent 64e698d4ff
commit 8185b28041
13 changed files with 27 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorConstants.java
View File

@ -26,6 +26,6 @@ package org.jclouds.vcloud.director.v1_5;
public class VCloudDirectorConstants {
/** The XML namespace used by the clients. */
public static final String XMLNS = "http://www.vmware.com/vcloud/v1.5";
public static final String VCLOUD_1_5_NS = "http://www.vmware.com/vcloud/v1.5";
}

17
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java
View File

@ -157,9 +157,9 @@ public class EntityType<T extends EntityType<T>> extends ResourceType<T> {
}
}
@XmlElement(namespace = XMLNS, name = "Description")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Description")
private String description;
@XmlElement(namespace = XMLNS, name = "TasksInProgress")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "TasksInProgress")
private TasksInProgress tasksInProgress;
@XmlAttribute
private String id;
@ -211,19 +211,6 @@ public class EntityType<T extends EntityType<T>> extends ResourceType<T> {
this.id = id;
}
/**
* Returns the unique UUID string for this entity.
*
* Once we have an entity, the {@link #getId()} field is better suited to retrieving the
* id than {@link #getHref()}.
*
* @see ReferenceType#getUuid()
*/
@Override
public String getUuid() {
return Iterables.getLast(Splitter.on(":").split(id));
}
/**
* Contains the name of the the entity.
*/

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
View File

@ -40,7 +40,7 @@ import com.google.common.base.Objects;
*
* @author grkvlt@apache.org
*/
@XmlRootElement(namespace = XMLNS, name = "Error")
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "Error")
@XmlAccessorType(XmlAccessType.FIELD)
public class Error {

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
View File

@ -44,7 +44,7 @@ import com.google.common.collect.Sets;
*
* @author danikov
*/
@XmlRootElement(namespace = XMLNS, name = "Metadata")
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "Metadata")
public class Metadata extends ResourceType<Metadata> {
public static final String MEDIA_TYPE = VCloudDirectorMediaType.METADATA;
@ -137,7 +137,7 @@ public class Metadata extends ResourceType<Metadata> {
this.metadata = ImmutableSet.copyOf(metadataEntries);
}
@XmlElement(namespace = XMLNS, name = "MetadataEntry")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "MetadataEntry")
private Set<MetadataEntry> metadata = Sets.newLinkedHashSet();
public Set<MetadataEntry> getMetadata() {

6
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
View File

@ -43,7 +43,7 @@ import com.google.common.collect.Sets;
*
* @author danikov
*/
@XmlRootElement(namespace = XMLNS, name = "MetadataEntry")
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "MetadataEntry")
public class MetadataEntry extends ResourceType<MetadataEntry> {
public static final String MEDIA_TYPE = VCloudDirectorMediaType.METADATA_ENTRY;
@ -138,9 +138,9 @@ public class MetadataEntry extends ResourceType<MetadataEntry> {
this.value = checkNotNull(value, "value");
}
@XmlElement(namespace = XMLNS, name = "Key")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Key")
private String key;
@XmlElement(namespace = XMLNS, name = "Value")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Value")
private String value;
/**

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

@ -45,7 +45,7 @@ import com.google.common.collect.Sets;
*
* @author Adrian Cole
*/
@XmlRootElement(namespace = XMLNS, name = "Org")
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "Org")
public class Org extends EntityType<Org> {
public static final String MEDIA_TYPE = VCloudDirectorMediaType.ORG;
@ -174,7 +174,7 @@ public class Org extends EntityType<Org> {
this.fullName = fullName;
}
@XmlElement(namespace = XMLNS, name = "FullName")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "FullName")
private String fullName;
/**

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgList.java
View File

@ -38,7 +38,7 @@ import com.google.common.collect.Sets;
*
* @author Adrian Cole
*/
@XmlRootElement(namespace = XMLNS, name = "OrgList")
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "OrgList")
public class OrgList {
public static final String MEDIA_TYPE = VCloudDirectorMediaType.ORG_LIST;
@ -88,7 +88,7 @@ public class OrgList {
this.orgs = ImmutableSet.copyOf(orgs);
}
@XmlElement(namespace = XMLNS, name = "Org")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Org")
private Set<Reference> orgs = Sets.newLinkedHashSet();
public Set<Reference> getOrgs() {

9
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ReferenceType.java
View File

@ -158,15 +158,6 @@ public class ReferenceType<T extends ReferenceType<T>> implements URISupplier {
this.id = id;
}
/**
* Returns the unique UUID string for this reference.
*
* @see ResourceType#getUuid()
*/
public String getUuid() {
return Iterables.getLast(Splitter.on("/").split(href.getPath()));
}
/**
* Contains the name of the the entity.
*

11
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceType.java
View File

@ -112,7 +112,7 @@ public class ResourceType<T extends ResourceType<T>> implements URISupplier {
private URI href;
@XmlAttribute
private String type;
@XmlElement(namespace = XMLNS, name = "Link")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Link")
private Set<Link> links = Sets.newLinkedHashSet();
protected ResourceType(URI href) {
@ -148,15 +148,6 @@ public class ResourceType<T extends ResourceType<T>> implements URISupplier {
return getHref();
}
/**
* Returns the unique UUID string for this resource.
*
* @see ReferenceType#getUuid()
*/
public String getUuid() {
return Iterables.getLast(Splitter.on("/").split(href.getPath()));
}
/**
* Contains the type of the the entity.
*

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java
View File

@ -44,7 +44,7 @@ import com.google.common.collect.Sets;
*
* @author Adrian Cole
*/
@XmlRootElement(namespace = XMLNS, name = "Session")
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "Session")
@XmlAccessorType(XmlAccessType.FIELD)
public class Session {
@ -124,7 +124,7 @@ public class Session {
this.links = ImmutableSet.copyOf(links);
}
@XmlElement(namespace = XMLNS, name = "Link")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Link")
private Set<Link> links = Sets.newLinkedHashSet();
@XmlAttribute
private String user;

14
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
View File

@ -45,7 +45,7 @@ import com.google.common.collect.Sets;
*
* @author grkvlt@apache.org
*/
@XmlRootElement(namespace = XMLNS, name = "Task")
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "Task")
public class Task extends EntityType<Task> {
public static final String MEDIA_TYPE = VCloudDirectorMediaType.TASK;
@ -286,17 +286,17 @@ public class Task extends EntityType<Task> {
super(href, name);
}
@XmlElement(namespace = XMLNS, name = "Error")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Error")
private Error error;
@XmlElement(namespace = XMLNS, name = "Organization")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Organization")
private Reference org;
@XmlElement(namespace = XMLNS, name = "Progress")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Progress")
private Integer progress;
@XmlElement(namespace = XMLNS, name = "Owner")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Owner")
private Reference owner;
@XmlElement(namespace = XMLNS, name = "User")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "User")
private Reference user;
@XmlElement(namespace = XMLNS, name = "Params")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Params")
private Object params;
@XmlAttribute
private String status;

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksInProgress.java
View File

@ -37,7 +37,7 @@ import com.google.common.collect.Sets;
/**
* @author grkvlt@apache.org
*/
@XmlRootElement(namespace = XMLNS, name = "TasksInProgress")
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "TasksInProgress")
@XmlAccessorType(XmlAccessType.FIELD)
public class TasksInProgress {
@ -86,7 +86,7 @@ public class TasksInProgress {
this.tasks = ImmutableSet.copyOf(tasks);
}
@XmlElement(namespace = XMLNS, name = "Task")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Task")
private Set<Task> tasks = Sets.newLinkedHashSet();
public Set<Task> getTasks() {

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
View File

@ -40,7 +40,7 @@ import com.google.common.collect.Sets;
*
* @author Adrian Cole
*/
@XmlRootElement(namespace = XMLNS, name = "TasksList")
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "TasksList")
public class TasksList extends EntityType<TasksList> {
public static final String MEDIA_TYPE = VCloudDirectorMediaType.TASKS_LIST;
@ -177,7 +177,7 @@ public class TasksList extends EntityType<TasksList> {
this.tasks = ImmutableSet.copyOf(tasks);
}
@XmlElement(namespace = XMLNS, name = "Task")
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Task")
private Set<Task> tasks = Sets.newLinkedHashSet();
public Set<Task> getTasks() {