From 00df85a93adbb86273918f2e4fe540a4ae017438 Mon Sep 17 00:00:00 2001 From: Vincent Behar Date: Fri, 8 Jul 2011 17:02:03 +0200 Subject: [PATCH] complete mapping for a project info --- TODO | 2 +- .../rundeck/api/domain/RundeckProject.java | 19 ++++++++++++++++++- .../org/rundeck/api/parser/ProjectParser.java | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index bf17578..fc43d8c 100644 --- a/TODO +++ b/TODO @@ -16,7 +16,7 @@ http://rundeck.org/1.2.1/RunDeck-Guide.html#rundeck-api 12. Running Adhoc Commands - OK 13. Running Adhoc Scripts - TODO 14. Listing Projects - OK -15. Getting Project Info - TODO +15. Getting Project Info - OK 16. Listing History - TODO 17. Creating History Event Reports - TODO 18. Listing Resources - OK (XML only, YAML not supported yet) diff --git a/src/main/java/org/rundeck/api/domain/RundeckProject.java b/src/main/java/org/rundeck/api/domain/RundeckProject.java index 0903972..c5e3fa4 100644 --- a/src/main/java/org/rundeck/api/domain/RundeckProject.java +++ b/src/main/java/org/rundeck/api/domain/RundeckProject.java @@ -30,6 +30,8 @@ public class RundeckProject implements Serializable { private String description; + private String resourceModelProviderUrl; + public String getName() { return name; } @@ -46,9 +48,18 @@ public class RundeckProject implements Serializable { this.description = description; } + public String getResourceModelProviderUrl() { + return resourceModelProviderUrl; + } + + public void setResourceModelProviderUrl(String resourceModelProviderUrl) { + this.resourceModelProviderUrl = resourceModelProviderUrl; + } + @Override public String toString() { - return "RundeckProject [name=" + name + ", description=" + description + "]"; + return "RundeckProject [name=" + name + ", description=" + description + ", resourceModelProviderUrl=" + + resourceModelProviderUrl + "]"; } @Override @@ -57,6 +68,7 @@ public class RundeckProject implements Serializable { int result = 1; result = prime * result + ((description == null) ? 0 : description.hashCode()); result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((resourceModelProviderUrl == null) ? 0 : resourceModelProviderUrl.hashCode()); return result; } @@ -79,6 +91,11 @@ public class RundeckProject implements Serializable { return false; } else if (!name.equals(other.name)) return false; + if (resourceModelProviderUrl == null) { + if (other.resourceModelProviderUrl != null) + return false; + } else if (!resourceModelProviderUrl.equals(other.resourceModelProviderUrl)) + return false; return true; } diff --git a/src/main/java/org/rundeck/api/parser/ProjectParser.java b/src/main/java/org/rundeck/api/parser/ProjectParser.java index ef19a47..999ec70 100644 --- a/src/main/java/org/rundeck/api/parser/ProjectParser.java +++ b/src/main/java/org/rundeck/api/parser/ProjectParser.java @@ -48,6 +48,7 @@ public class ProjectParser implements XmlNodeParser { project.setName(StringUtils.trimToNull(projectNode.valueOf("name"))); project.setDescription(StringUtils.trimToNull(projectNode.valueOf("description"))); + project.setResourceModelProviderUrl(StringUtils.trimToNull(projectNode.valueOf("resources/providerURL"))); return project; }