From 6c2de0548dd6b29a6a3071de89193f5b72825b30 Mon Sep 17 00:00:00 2001
From: Duncan Mackintosh <duncanm@cbnl.com>
Date: Thu, 25 Aug 2011 12:11:57 +0100
Subject: [PATCH] CBNL CORE: Tweaked REST interface to expose a complete category list and node parent id on node results

---
 .../java/org/opennms/netmgt/model/OnmsNode.java    |    3 ++-
 .../org/opennms/web/rest/OnmsCategoryResource.java |    7 +++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNode.java b/opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNode.java
index 4d9abb1..25a2327 100644
--- a/opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNode.java
+++ b/opennms-model/src/main/java/org/opennms/netmgt/model/OnmsNode.java
@@ -67,6 +67,7 @@ import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlIDREF;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
@@ -272,7 +273,7 @@ public class OnmsNode extends OnmsEntity implements Serializable,
      *
      * @return a {@link org.opennms.netmgt.model.OnmsNode} object.
      */
-    @XmlTransient
+    @XmlIDREF
     @ManyToOne(fetch=FetchType.LAZY)
     @JoinColumn(name="nodeParentID")
     public OnmsNode getParent() {
diff --git a/opennms-webapp/src/main/java/org/opennms/web/rest/OnmsCategoryResource.java b/opennms-webapp/src/main/java/org/opennms/web/rest/OnmsCategoryResource.java
index bd98188..624b777 100644
--- a/opennms-webapp/src/main/java/org/opennms/web/rest/OnmsCategoryResource.java
+++ b/opennms-webapp/src/main/java/org/opennms/web/rest/OnmsCategoryResource.java
@@ -45,6 +45,13 @@ public class OnmsCategoryResource extends OnmsRestService {
     @Autowired
     private CategoryDao m_categoryDao;
     
+    @GET
+    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+    @Path("list")
+    public OnmsCategoryCollection getAllGategories() {
+    	return new OnmsCategoryCollection(m_categoryDao.findAll());
+    }
+    
     /**
      * <p>getCategories</p>
      *
-- 
1.7.1