From 90fefde97207741382efec2cf234771fcdf4e50d Mon Sep 17 00:00:00 2001
From: Patrick Nguyen <patrick.nguyen@springsource.com>
Date: Thu, 11 Feb 2010 14:35:10 -0800
Subject: [PATCH] [HE-400] Add additional validation for the create and modify
 time

---
 hqu/hqapi1/app/AlertdefinitionController.groovy             | 4 +++-
 src/org/hyperic/hq/hqapi1/test/AlertDefinitionTestBase.java | 4 ++++
 xsd/HQApi1.xsd                                              | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/hqu/hqapi1/app/AlertdefinitionController.groovy b/hqu/hqapi1/app/AlertdefinitionController.groovy
index c00aa94d..0e6e4b2e 100644
--- a/hqu/hqapi1/app/AlertdefinitionController.groovy
+++ b/hqu/hqapi1/app/AlertdefinitionController.groovy
@@ -66,7 +66,9 @@ public class AlertdefinitionController extends ApiController {
                          range: d.range,
                          willRecover: d.willRecover,
                          notifyFiltered: d.notifyFiltered,
-                         controlFiltered: d.controlFiltered]
+                         controlFiltered: d.controlFiltered,
+                         ctime: d.ctime,
+                         mtime: d.mtime]
 
             if (!excludeIds) {
                 attrs['id'] = d.id
diff --git a/src/org/hyperic/hq/hqapi1/test/AlertDefinitionTestBase.java b/src/org/hyperic/hq/hqapi1/test/AlertDefinitionTestBase.java
index 2921147d..17aa03de 100644
--- a/src/org/hyperic/hq/hqapi1/test/AlertDefinitionTestBase.java
+++ b/src/org/hyperic/hq/hqapi1/test/AlertDefinitionTestBase.java
@@ -59,6 +59,10 @@ protected void validateDefinition(AlertDefinition d) {
                    d.getFrequency() >= 0 && d.getFrequency() <= 4);
         assertTrue("Invalid priority " + d.getPriority(),
                    d.getPriority() >= 1 & d.getPriority() <= 3);
+        assertTrue("Create time must be greater than 0",
+        		   d.getCtime() > 0);
+        assertTrue("Modify time must be greater than 0",
+        		   d.getMtime() > 0);
     }
 
     protected void cleanup(List<AlertDefinition> definitions) throws IOException {
diff --git a/xsd/HQApi1.xsd b/xsd/HQApi1.xsd
index d8c6ad0f..2aa6e8ce 100644
--- a/xsd/HQApi1.xsd
+++ b/xsd/HQApi1.xsd
@@ -803,6 +803,8 @@
         <xs:attribute name="description" type="xs:string"      use="required" />
         <xs:attribute name="name"        type="xs:string"      use="required" />
         <xs:attribute name="id"          type="xs:int"         use="optional" />
+        <xs:attribute name="ctime"       type="xs:long"        use="optional" />
+        <xs:attribute name="mtime"       type="xs:long"        use="optional" />
     </xs:complexType>
 
     <xs:element name="AlertDefinitionResponse">