Merged changes in com.netscape.certsrv.common.

Due to packaging issue the source code in com.netscape.certsrv.common
were duplicated into common and console packages and over time they
have become out-of-sync. This patch merges the changes such that they
are now identical. When the packaging issue is fixed later the
duplicate copy can be removed.

Ticket #113

7 files changed, 14 insertions, 3 deletions

diff --git a/base/common/src/com/netscape/certsrv/common/ConfigConstants.java b/base/common/src/com/netscape/certsrv/common/ConfigConstants.java
index 0e135dd2b..4f3a05591 100644
--- a/base/common/src/com/netscape/certsrv/common/ConfigConstants.java
+++ b/base/common/src/com/netscape/certsrv/common/ConfigConstants.java
@@ -22,6 +22,7 @@ package com.netscape.certsrv.common;
  * in the protocol between the configuration daemon
  * and UI configuration wizard.
  *
+ * @author Christine Ho
  * @version $Revision$, $Date$
  */
 public interface ConfigConstants {
@@ -202,6 +203,7 @@ public interface ConfigConstants {
     public static final String PR_SSL_SUBJECT_NAME = "sslSubjectName";
     public static final String PR_KEY_TYPE = "keyType";
     public static final String PR_KEY_LENGTH = "keyLength";
+    public static final String PR_KEY_CURVENAME = "keyCurveName";
     public static final String PR_CERT_REQUEST = "certReq";
     public static final String PR_REQUEST_ID = "ReqID";
     public static final String PR_REQUEST_FORMAT = "ReqFormat";
@@ -274,6 +276,7 @@ public interface ConfigConstants {
     public static final String PR_RSA_MIN_KEYLENGTH = "RSAMinKeyLength";
     public static final String PR_CA_KEYTYPE = "ca_keyType";
     public static final String PR_HASH_TYPE = "hashType";
+    public static final String PR_SIGNEDBY_TYPE = "signedBy";
     public static final String PR_NOTAFTER = "notAfter";
     public static final String PR_CA_O_COMPONENT = "caOComponent";
     public static final String PR_CA_C_COMPONENT = "caCComponent";
@@ -293,7 +296,7 @@ public interface ConfigConstants {
     public static final String PR_CA_SERIAL_NUMBER = "caSerialNumber";
     public static final String PR_CA_ENDSERIAL_NUMBER = "caEndSerialNumber";
 
-    // KRA number
+    // KRA serial number
     public static final String PR_REQUEST_NUMBER = "requestNumber";
     public static final String PR_ENDREQUEST_NUMBER = "endRequestNumber";
     public static final String PR_SERIAL_REQUEST_NUMBER = "serialRequestNumber";
diff --git a/base/common/src/com/netscape/certsrv/common/Constants.java b/base/common/src/com/netscape/certsrv/common/Constants.java
index 23a9075ae..880e14643 100644
--- a/base/common/src/com/netscape/certsrv/common/Constants.java
+++ b/base/common/src/com/netscape/certsrv/common/Constants.java
@@ -21,6 +21,8 @@ package com.netscape.certsrv.common;
  * This interface contains constants that are shared
  * by certificate server and its client SDK.
  *
+ * @author Jack Pan-Chen
+ * @author Christine Ho
  * @version $Revision$, $Date$
  */
 public interface Constants {
diff --git a/base/common/src/com/netscape/certsrv/common/DestDef.java b/base/common/src/com/netscape/certsrv/common/DestDef.java
index de7739d0a..188fb5c9f 100644
--- a/base/common/src/com/netscape/certsrv/common/DestDef.java
+++ b/base/common/src/com/netscape/certsrv/common/DestDef.java
@@ -22,6 +22,7 @@ package com.netscape.certsrv.common;
  * used in the administration protocol between the
  * console and the server.
  *
+ * @author Jack Pan-Chen
  * @version $Revision$, $Date$
  */
 public interface DestDef {
diff --git a/base/common/src/com/netscape/certsrv/common/OpDef.java b/base/common/src/com/netscape/certsrv/common/OpDef.java
index 862b44760..28cc31f59 100644
--- a/base/common/src/com/netscape/certsrv/common/OpDef.java
+++ b/base/common/src/com/netscape/certsrv/common/OpDef.java
@@ -22,6 +22,7 @@ package com.netscape.certsrv.common;
  * used in the administration protocol between the console
  * and the server.
  *
+ * @author Jack Pan-Chen
  * @version $Revision$, $Date$
  */
 public interface OpDef {
diff --git a/base/common/src/com/netscape/certsrv/common/PrefixDef.java b/base/common/src/com/netscape/certsrv/common/PrefixDef.java
index ac85694ac..01a722f91 100644
--- a/base/common/src/com/netscape/certsrv/common/PrefixDef.java
+++ b/base/common/src/com/netscape/certsrv/common/PrefixDef.java
@@ -22,6 +22,7 @@ package com.netscape.certsrv.common;
  * used in the administration protocol between
  * the console and the server.
  *
+ * @author Jack Pan-Chen
  * @version $Revision$, $Date$
  */
 public interface PrefixDef {
diff --git a/base/common/src/com/netscape/certsrv/common/ScopeDef.java b/base/common/src/com/netscape/certsrv/common/ScopeDef.java
index 017d082c8..f689d1504 100644
--- a/base/common/src/com/netscape/certsrv/common/ScopeDef.java
+++ b/base/common/src/com/netscape/certsrv/common/ScopeDef.java
@@ -22,6 +22,7 @@ package com.netscape.certsrv.common;
  * used in the administration protocol between the
  * console and the server.
  *
+ * @author Jack Pan-Chen
  * @version $Revision$, $Date$
  */
 public interface ScopeDef {
diff --git a/base/common/src/com/netscape/certsrv/common/TaskId.java b/base/common/src/com/netscape/certsrv/common/TaskId.java
index 407ec9187..bd6f970b3 100644
--- a/base/common/src/com/netscape/certsrv/common/TaskId.java
+++ b/base/common/src/com/netscape/certsrv/common/TaskId.java
@@ -23,6 +23,7 @@ package com.netscape.certsrv.common;
  * configuration wizard and the configuration
  * daemon.
  *
+ * @author Christine Ho
  * @version $Revision$, $Date$
  */
 public interface TaskId {
@@ -66,8 +67,9 @@ public interface TaskId {
     // get information about all cryptotokens
     public final static String TASK_TOKEN_INFO = "tokenInfo";
 
-    // server get master or clone setting
+    // get master or clone setting
     public final static String TASK_MASTER_OR_CLONE = "SetMasterOrClone";
+
     // single signon
     public final static String TASK_SINGLE_SIGNON = "singleSignon";
 
@@ -99,7 +101,7 @@ public interface TaskId {
     // set CA starting serial number
     public final static String TASK_SET_CA_SERIAL = "setCASerial";
 
-    // set CA starting serial number
+    // set KRA request and key starting and ending number
     public final static String TASK_SET_KRA_NUMBER = "setKRANumber";
 
     // check key length