summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2015-04-24 12:46:38 -0400
committerAde Lee <alee@redhat.com>2015-04-24 13:09:52 -0400
commitf6f3919592d50c1a8824422ee38a3e08f6124298 (patch)
tree546955ac3937cde4d1cd2f9fb0f5d5b7a81e6888
parent5a64143e483ebb77458f398ea848bb120bc81ad2 (diff)
downloadpki-f6f3919592d50c1a8824422ee38a3e08f6124298.tar.gz
pki-f6f3919592d50c1a8824422ee38a3e08f6124298.tar.xz
pki-f6f3919592d50c1a8824422ee38a3e08f6124298.zip
Fix some javadoc errors that prevent F23 build
-rw-r--r--base/common/src/com/netscape/certsrv/apps/CMS.java4
-rw-r--r--base/common/src/com/netscape/certsrv/apps/ICMSEngine.java4
-rw-r--r--base/common/src/com/netscape/certsrv/profile/IProfileInput.java1
-rw-r--r--base/common/src/com/netscape/certsrv/profile/IProfileOutput.java1
-rw-r--r--base/common/src/com/netscape/certsrv/profile/ProfileDataInfo.java2
-rw-r--r--base/common/src/com/netscape/certsrv/profile/ProfileRetrievalRequest.java2
-rw-r--r--base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java3
-rw-r--r--base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java3
-rw-r--r--base/javadoc/CMakeLists.txt1
9 files changed, 3 insertions, 18 deletions
diff --git a/base/common/src/com/netscape/certsrv/apps/CMS.java b/base/common/src/com/netscape/certsrv/apps/CMS.java
index 5ba6dc0a6..e301e20ef 100644
--- a/base/common/src/com/netscape/certsrv/apps/CMS.java
+++ b/base/common/src/com/netscape/certsrv/apps/CMS.java
@@ -1115,7 +1115,6 @@ public final class CMS {
* @param name configuration name
* @param isValueConfigured true if value is configured
* @param params configuration parameters
- * @exception EBaseException failed to create subject alt name configuration
*/
public static void getGeneralNameConfigDefaultParams(String name,
boolean isValueConfigured, Vector<String> params) {
@@ -1129,7 +1128,6 @@ public final class CMS {
* @param name configuration name
* @param isValueConfigured true if value is configured
* @param params configuration parameters
- * @exception EBaseException failed to create subject alt name configuration
*/
public static void getGeneralNamesConfigDefaultParams(String name,
boolean isValueConfigured, Vector<String> params) {
@@ -1143,7 +1141,6 @@ public final class CMS {
* @param name configuration name
* @param isValueConfigured true if value is configured
* @param info configuration parameters
- * @exception EBaseException failed to create subject alt name configuration
*/
public static void getGeneralNameConfigExtendedPluginInfo(String name,
boolean isValueConfigured, Vector<String> info) {
@@ -1157,7 +1154,6 @@ public final class CMS {
* @param name configuration name
* @param isValueConfigured true if value is configured
* @param info configuration parameters
- * @exception EBaseException failed to create subject alt name configuration
*/
public static void getGeneralNamesConfigExtendedPluginInfo(String name,
boolean isValueConfigured, Vector<String> info) {
diff --git a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
index 294447d29..b90c73997 100644
--- a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
+++ b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
@@ -919,7 +919,6 @@ public interface ICMSEngine extends ISubsystem {
* @param name configuration name
* @param isValueConfigured true if value is configured
* @param params configuration parameters
- * @exception EBaseException failed to create subject alt name configuration
*/
public void getGeneralNameConfigDefaultParams(String name,
boolean isValueConfigured, Vector<String> params);
@@ -930,7 +929,6 @@ public interface ICMSEngine extends ISubsystem {
* @param name configuration name
* @param isValueConfigured true if value is configured
* @param params configuration parameters
- * @exception EBaseException failed to create subject alt name configuration
*/
public void getGeneralNamesConfigDefaultParams(String name,
boolean isValueConfigured, Vector<String> params);
@@ -941,7 +939,6 @@ public interface ICMSEngine extends ISubsystem {
* @param name configuration name
* @param isValueConfigured true if value is configured
* @param info configuration parameters
- * @exception EBaseException failed to create subject alt name configuration
*/
public void getGeneralNameConfigExtendedPluginInfo(String name,
boolean isValueConfigured, Vector<String> info);
@@ -952,7 +949,6 @@ public interface ICMSEngine extends ISubsystem {
* @param name configuration name
* @param isValueConfigured true if value is configured
* @param info configuration parameters
- * @exception EBaseException failed to create subject alt name configuration
*/
public void getGeneralNamesConfigExtendedPluginInfo(String name,
boolean isValueConfigured, Vector<String> info);
diff --git a/base/common/src/com/netscape/certsrv/profile/IProfileInput.java b/base/common/src/com/netscape/certsrv/profile/IProfileInput.java
index 09b42806d..d025e563b 100644
--- a/base/common/src/com/netscape/certsrv/profile/IProfileInput.java
+++ b/base/common/src/com/netscape/certsrv/profile/IProfileInput.java
@@ -113,7 +113,6 @@ public interface IProfileInput extends IConfigTemplate {
* @param locale user locale
* @param request request
* @param value value
- * @exception EProfileException failed to get value
*/
public void setValue(String name, Locale locale, IRequest request,
String value) throws EPropertyException;
diff --git a/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java b/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java
index dd3b47c54..5b5dfe8cd 100644
--- a/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java
+++ b/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java
@@ -114,7 +114,6 @@ public interface IProfileOutput extends IConfigTemplate {
* @param locale user locale
* @param request request
* @param value property value
- * @exception EProfileException failed to retrieve value
*/
public void setValue(String name, Locale locale, IRequest request,
String value) throws EPropertyException;
diff --git a/base/common/src/com/netscape/certsrv/profile/ProfileDataInfo.java b/base/common/src/com/netscape/certsrv/profile/ProfileDataInfo.java
index c01d55d16..5c2fea5d3 100644
--- a/base/common/src/com/netscape/certsrv/profile/ProfileDataInfo.java
+++ b/base/common/src/com/netscape/certsrv/profile/ProfileDataInfo.java
@@ -54,7 +54,7 @@ public class ProfileDataInfo {
}
/**
- * @param keyURL the profileURL to set
+ * @param profileURL the profileURL to set
*/
public void setProfileURL(String profileURL) {
this.profileURL = profileURL;
diff --git a/base/common/src/com/netscape/certsrv/profile/ProfileRetrievalRequest.java b/base/common/src/com/netscape/certsrv/profile/ProfileRetrievalRequest.java
index 608686b79..a88748521 100644
--- a/base/common/src/com/netscape/certsrv/profile/ProfileRetrievalRequest.java
+++ b/base/common/src/com/netscape/certsrv/profile/ProfileRetrievalRequest.java
@@ -58,7 +58,7 @@ public class ProfileRetrievalRequest {
}
/**
- * @param ProfileId the ProfileId to set
+ * @param profileId the ProfileId to set
*/
public void setProfileId(String profileId) {
this.profileId = profileId;
diff --git a/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java b/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
index 6e4b9252c..23a1f773f 100644
--- a/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
+++ b/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
@@ -89,10 +89,8 @@ public interface IEncryptionUnit extends IToken {
* Unwraps data. This method rebuilds the private key by
* unwrapping the private key data.
*
- * @param sessionKey session key that unwrap the private key
* @param symmAlgOID symmetric algorithm
* @param symmAlgParams symmetric algorithm parameters
- * @param privateKey private key data
* @param pubKey public key
* @param transportCert transport certificate
* @return private key object
@@ -139,7 +137,6 @@ public interface IEncryptionUnit extends IToken {
*
* @param encSymmKey wrapped symmetric key to be unwrapped
* @return Symmetric key object
- * @exception EBaseException failed to unwrap
*/
public SymmetricKey unwrap_sym(byte encSymmKey[],
diff --git a/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java b/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
index 1208a7d42..bc3d76a1e 100644
--- a/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
+++ b/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
@@ -69,7 +69,6 @@ public interface ITransportKeyUnit extends IEncryptionUnit {
* @param encSymmKey wrapped symmetric key to be unwrapped
* @param usage Key usage for unwrapped key.
* @return Symmetric key object
- * @exception EBaseException failed to unwrap
*/
public SymmetricKey unwrap_sym(byte encSymmKey[], SymmetricKey.Usage usage);
@@ -80,7 +79,6 @@ public interface ITransportKeyUnit extends IEncryptionUnit {
*
* @param encSymmKey wrapped symmetric key to be unwrapped
* @return Symmetric key object
- * @exception EBaseException failed to unwrap
*/
public SymmetricKey unwrap_sym(byte encSymmKey[]);
@@ -91,7 +89,6 @@ public interface ITransportKeyUnit extends IEncryptionUnit {
*
* @param encSymmKey wrapped symmetric key to be unwrapped
* @return Symmetric key object
- * @exception EBaseException failed to unwrap
*/
public SymmetricKey unwrap_encrypt_sym(byte encSymmKey[]);
diff --git a/base/javadoc/CMakeLists.txt b/base/javadoc/CMakeLists.txt
index 8e892ee86..47d18399a 100644
--- a/base/javadoc/CMakeLists.txt
+++ b/base/javadoc/CMakeLists.txt
@@ -24,6 +24,7 @@ javadoc(pki-javadoc
${HTTPCLIENT_JAR} ${HTTPCORE_JAR}
${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} ${RESTEASY_CLIENT_JAR}
${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${PKI_TOMCAT_JAR} ${PKI_CMS_JAR} ${PKI_TOOLS_JAR}
+ ${NUXWDOG_JAR}
OPTIONS
-windowtitle 'pki-javadoc'
-doctitle '<h1>PKI Javadoc</h1>'