From 2d3d5611143ea3c75823a156ff4ebd331a305253 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Tue, 9 Oct 2012 15:56:05 -0500
Subject: Fixed KRA test.

The security configuration, JAXB mappings, and test script for KRA
have been updated to run properly.
---
 base/common/src/com/netscape/certsrv/key/KeyData.java         | 4 ++--
 base/common/src/com/netscape/certsrv/key/KeyDataInfo.java     | 4 ++--
 base/common/src/com/netscape/certsrv/key/KeyDataInfos.java    | 2 +-
 base/common/src/com/netscape/certsrv/key/KeyRequestInfo.java  | 2 +-
 base/common/src/com/netscape/certsrv/key/KeyRequestInfos.java | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'base/common/src')

diff --git a/base/common/src/com/netscape/certsrv/key/KeyData.java b/base/common/src/com/netscape/certsrv/key/KeyData.java
index 63c0591c2..2ee7d1b92 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyData.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyData.java
@@ -22,15 +22,15 @@
 package com.netscape.certsrv.key;
 
 import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 
 /**
  * @author alee
  *
  */
-@XmlRootElement(name="SecurityData")
+@XmlRootElement(name="KeyData")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class KeyData {
     @XmlElement
diff --git a/base/common/src/com/netscape/certsrv/key/KeyDataInfo.java b/base/common/src/com/netscape/certsrv/key/KeyDataInfo.java
index 6f4751dcc..3af348ef3 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyDataInfo.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyDataInfo.java
@@ -22,9 +22,9 @@ package com.netscape.certsrv.key;
 
 
 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.XmlAccessorType;
 
 import com.netscape.certsrv.dbs.keydb.KeyId;
 
@@ -32,7 +32,7 @@ import com.netscape.certsrv.dbs.keydb.KeyId;
  * @author alee
  *
  */
-@XmlRootElement(name="SecurityDataInfo")
+@XmlRootElement(name="KeyDataInfo")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class KeyDataInfo {
 
diff --git a/base/common/src/com/netscape/certsrv/key/KeyDataInfos.java b/base/common/src/com/netscape/certsrv/key/KeyDataInfos.java
index c04820299..4e82f27b5 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyDataInfos.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyDataInfos.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlTransient;
 
 import com.netscape.certsrv.base.Link;
 
-@XmlRootElement(name = "SecurityDataInfos")
+@XmlRootElement(name = "KeyDataInfos")
 public class KeyDataInfos {
 
     protected Collection<KeyDataInfo> keyInfos;
diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestInfo.java b/base/common/src/com/netscape/certsrv/key/KeyRequestInfo.java
index 2a0e062e5..f18e60e64 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyRequestInfo.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyRequestInfo.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 import com.netscape.certsrv.dbs.keydb.KeyId;
 import com.netscape.certsrv.request.CMSRequestInfo;
 
-@XmlRootElement(name = "SecurityDataRequestInfo")
+@XmlRootElement(name = "KeyRequestInfo")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class KeyRequestInfo extends CMSRequestInfo {
 
diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestInfos.java b/base/common/src/com/netscape/certsrv/key/KeyRequestInfos.java
index 67e6fdf5c..1fbd363d3 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyRequestInfos.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyRequestInfos.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlTransient;
 
 import com.netscape.certsrv.base.Link;
 
-@XmlRootElement(name = "SecurityDataRequestInfos")
+@XmlRootElement(name = "KeyRequestInfos")
 public class KeyRequestInfos {
     protected Collection<KeyRequestInfo> requests;
     protected List<Link> links;
-- 
cgit