diff --git a/base/kra/shared/webapps/kra/WEB-INF/web.xml b/base/kra/shared/webapps/kra/WEB-INF/web.xml
index 9efb91a42f8..0c630c017b5 100644
--- a/base/kra/shared/webapps/kra/WEB-INF/web.xml
+++ b/base/kra/shared/webapps/kra/WEB-INF/web.xml
@@ -3,85 +3,6 @@
Key Recovery Authority
-
- kraKRADisplayBySerialForRecovery
- com.netscape.cms.servlet.key.DisplayBySerialForRecovery
- GetClientCert
- true
- AuthzMgr
- BasicAclAuthz
- authority
- kra
- templatePath
- /agent/kra/displayBySerialForRecovery.template
- ID
- kraKRADisplayBySerialForRecovery
- AuthMgr
- certUserDBAuthMgr
- resourceID
- certServer.kra.key
-
-
-
- kraGetConfigEntries
- com.netscape.cms.servlet.csadmin.KRAGetConfigEntries
- GetClientCert
- false
- authority
- kra
- ID
- kraGetConfigEntries
- AuthzMgr
- BasicAclAuthz
- AuthMgr
- TokenAuth
- resourceID
- certServer.clone.configuration.GetConfigEntries
-
-
-
- kraports
- com.netscape.cms.servlet.base.KRAPortsServlet
- ID
- kraports
- GetClientCert
- false
- interface
- ee
-
-
-
- kraRegisterUser
- com.netscape.cms.servlet.csadmin.KRARegisterUser
- GetClientCert
- false
- authority
- kra
- ID
- kraRegisterUser
- GroupName
- Data Recovery Manager Agents
- AuthMgr
- TokenAuth
- AuthzMgr
- BasicAclAuthz
- resourceID
- certServer.kra.registerUser
-
-
-
- kraDynamicVariables
- com.netscape.cms.servlet.base.KRADynamicVariables
- ID
- kraDynamicVariables
- GetClientCert
- false
- dynamicVariables
- serverdate=serverdate(),subsystemname=subsystemname(),http=http(),authmgrs=authmgrs(),clacrlurl=clacrlurl()
- authority
- kra
-
-
kraheader
com.netscape.cms.servlet.base.IndexServlet
@@ -118,25 +39,6 @@
certUserDBAuthMgr
-
- kraConnector
- com.netscape.cms.servlet.connector.KRAConnectorServlet
- GetClientCert
- true
- AuthzMgr
- BasicAclAuthz
- authority
- kra
- ID
- kraConnector
- RequestEncoder
- com.netscape.cmscore.connector.HttpRequestEncoder
- resourceID
- certServer.kra.connector
- AuthMgr
- certUserDBAuthMgr
-
-
kraSrchKey
com.netscape.cms.servlet.base.DisplayHtmlServlet
@@ -211,40 +113,6 @@
certServer.kra.keys
-
- kraKRAGetPk12
- com.netscape.cms.servlet.key.GetPk12
- GetClientCert
- true
- AuthzMgr
- BasicAclAuthz
- authority
- kra
- ID
- kraKRAGetPk12
- AuthMgr
- certUserDBAuthMgr
- resourceID
- certServer.kra.key
-
-
-
- kraKRAGetAsyncPk12
- com.netscape.cms.servlet.key.GetAsyncPk12
- GetClientCert
- true
- AuthzMgr
- BasicAclAuthz
- authority
- kra
- ID
- kraKRAGetAsyncPk12
- AuthMgr
- certUserDBAuthMgr
- resourceID
- certServer.kra.key
-
-
kraGrantRecovery
com.netscape.cms.servlet.base.DisplayHtmlServlet
@@ -285,27 +153,6 @@
certServer.kra.keys
-
- krakraqueryReq
- com.netscape.cms.servlet.request.KeyQueryReq
- GetClientCert
- true
- parser
- KeyReqParser.PARSER
- AuthzMgr
- BasicAclAuthz
- authority
- kra
- templatePath
- /agent/kra/queryReq.template
- ID
- krakraqueryReq
- resourceID
- certServer.kra.requests
- AuthMgr
- certUserDBAuthMgr
-
-
kraKRADisplayBySerial
com.netscape.cms.servlet.key.DisplayBySerial
@@ -325,17 +172,6 @@
certServer.kra.key
-
- krapolicy
- com.netscape.cms.servlet.admin.KRAPolicyAdminServlet
- ID
- krapolicy
- AuthzMgr
- BasicAclAuthz
- authority
- kra
-
-
-
- kraauths
- com.netscape.cms.servlet.admin.KRAAuthAdminServlet
- ID
- kraauths
- AuthzMgr
- BasicAclAuthz
-
-
-
- kraacl
- com.netscape.cms.servlet.admin.KRAACLAdminServlet
- ID
- kraacl
- AuthzMgr
- BasicAclAuthz
-
-
-
- kraug
- com.netscape.cms.servlet.admin.KRAUsrGrpAdminServlet
- ID
- kraug
- AuthzMgr
- BasicAclAuthz
-
-
-
-
- kraserver
- com.netscape.cms.servlet.admin.KRACMSAdminServlet
- ID
- kraserver
- AuthzMgr
- BasicAclAuthz
-
-
-
- krakra
- com.netscape.cms.servlet.admin.KRAAdminServlet
- ID
- krakra
- AuthzMgr
- BasicAclAuthz
-
-
kralog
com.netscape.cms.servlet.admin.LogAdminServlet
@@ -547,37 +337,11 @@
admin
-
- kraserver
- /server
-
-
-
- krakra
- /kra
-
-
kralog
/log
-
-
- kraug
- /ug
-
-
-
- kraacl
- /acl
-
-
-
- kraauths
- /auths
-
-
-
- krapolicy
- /krapolicy
-
-
-
- kraKRADisplayBySerialForRecovery
- /agent/kra/displayBySerialForRecovery
-
-
-
- kraports
- /ee/kra/ports
-
-
-
- kraDynamicVariables
- /dynamicVars.js
-
-
kraheader
/agent/header
@@ -615,11 +359,6 @@
/agent/kra/srchRecoverKey.html
-
- kraConnector
- /agent/kra/connector
-
-
kraSrchKey
/agent/kra/srchKey.html
@@ -640,16 +379,6 @@
/agent/kra/srchKey
-
- kraKRAGetPk12
- /agent/kra/getPk12
-
-
-
- kraKRAGetAsyncPk12
- /agent/kra/getAsyncPk12
-
-
kraGrantRecovery
/agent/kra/grantRecovery.html
@@ -660,26 +389,11 @@
/agent/kra/srchKeyForRecovery
-
- krakraqueryReq
- /agent/kra/queryReq
-
-
kraKRADisplayBySerial
/agent/kra/displayBySerial
-
- kraRegisterUser
- /admin/kra/registerUser
-
-
-
- kraGetConfigEntries
- /admin/kra/getConfigEntries
-
-
services
/services
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAACLAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAACLAdminServlet.java
index c53e5916c18..0f7c335cdd9 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAACLAdminServlet.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAACLAdminServlet.java
@@ -17,6 +17,17 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.admin;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+ name = "kraacl",
+ urlPatterns = "/acl",
+ initParams = {
+ @WebInitParam(name="ID", value="kraacl"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz")
+ }
+)
public class KRAACLAdminServlet extends ACLAdminServlet {
private static final long serialVersionUID = 1L;
}
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java
index 6876f4a0ad6..65f1a52520f 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java
@@ -22,6 +22,8 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -43,13 +45,17 @@
* Recovery Authority. This servlet is responsible to serve
* KRA administrative operation such as configuration
* parameter updates.
- *
- * @version $Revision$, $Date$
*/
+@WebServlet(
+ name = "krakra",
+ urlPatterns = "/kra",
+ initParams = {
+ @WebInitParam(name="ID", value="krakra"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz")
+ }
+)
public class KRAAdminServlet extends AdminServlet {
- /**
- *
- */
+
private static final long serialVersionUID = -5794220348195666729L;
protected static final String PROP_ENABLED = "enabled";
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAuthAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAuthAdminServlet.java
index 1c5ffc738cd..9ac697f26d6 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAuthAdminServlet.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAuthAdminServlet.java
@@ -17,6 +17,17 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.admin;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+ name = "kraauths",
+ urlPatterns = "/auths",
+ initParams = {
+ @WebInitParam(name="ID", value="kraauths"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz")
+ }
+)
public class KRAAuthAdminServlet extends AuthAdminServlet {
private static final long serialVersionUID = 1L;
}
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRACMSAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRACMSAdminServlet.java
index a4b94092504..88932e4e7db 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRACMSAdminServlet.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRACMSAdminServlet.java
@@ -18,6 +18,9 @@
// --- END COPYRIGHT BLOCK ---
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
import org.dogtagpki.server.kra.KRAEngine;
import com.netscape.certsrv.base.EBaseException;
@@ -32,8 +35,18 @@
* level administrative operations such as configuration
* parameter updates.
*/
+@WebServlet(
+ name = "kraserver",
+ urlPatterns = "/server",
+ initParams = {
+ @WebInitParam(name="ID", value="kraserver"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz")
+ }
+)
public class KRACMSAdminServlet extends CMSAdminServlet {
+ private static final long serialVersionUID = 1L;
+
@Override
public boolean isSubsystemInstalled(String subsystem) {
return subsystem.equals("kra");
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAPolicyAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAPolicyAdminServlet.java
index 6998dfb5de0..b18af5ddc0b 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAPolicyAdminServlet.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAPolicyAdminServlet.java
@@ -19,6 +19,8 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
import org.dogtagpki.legacy.policy.IPolicyProcessor;
import org.dogtagpki.server.kra.KRAEngine;
@@ -32,8 +34,18 @@
* KRA is responsible for registering an instance of this with the remote
* administration subsystem.
*/
+@WebServlet(
+ name = "krapolicy",
+ urlPatterns = "/krapolicy",
+ initParams = {
+ @WebInitParam(name="ID", value="krapolicy"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz"),
+ @WebInitParam(name="authority", value="kra")
+ }
+)
public class KRAPolicyAdminServlet extends PolicyAdminServlet {
+ private static final long serialVersionUID = 1L;
public static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(KRAPolicyAdminServlet.class);
/**
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAUsrGrpAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAUsrGrpAdminServlet.java
index bd8f0eb811a..755c925d50a 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAUsrGrpAdminServlet.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAUsrGrpAdminServlet.java
@@ -17,6 +17,17 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.admin;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+ name = "kraug",
+ urlPatterns = "/ug",
+ initParams = {
+ @WebInitParam(name="ID", value="kraug"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz")
+ }
+)
public class KRAUsrGrpAdminServlet extends UsrGrpAdminServlet {
private static final long serialVersionUID = 1L;
}
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRADynamicVariables.java b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRADynamicVariables.java
index 06d0f11c1d6..4960f457170 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRADynamicVariables.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRADynamicVariables.java
@@ -17,6 +17,19 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.base;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+ name = "kraDynamicVariables",
+ urlPatterns = "/dynamicVars.js",
+ initParams = {
+ @WebInitParam(name="ID", value="kraDynamicVariables"),
+ @WebInitParam(name="GetClientCert", value="false"),
+ @WebInitParam(name="dynamicVariables", value="serverdate=serverdate(),subsystemname=subsystemname(),http=http(),authmgrs=authmgrs(),clacrlurl=clacrlurl()"),
+ @WebInitParam(name="authority", value="kra")
+ }
+)
public class KRADynamicVariables extends DynamicVariablesServlet {
private static final long serialVersionUID = 1L;
}
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAPortsServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAPortsServlet.java
index 05f81085f9f..6a82305a48d 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAPortsServlet.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/base/KRAPortsServlet.java
@@ -17,6 +17,18 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.base;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+ name = "kraports",
+ urlPatterns = "/ee/kra/ports",
+ initParams = {
+ @WebInitParam(name="ID", value="kraports"),
+ @WebInitParam(name="GetClientCert", value="false"),
+ @WebInitParam(name="interface", value="ee")
+ }
+)
public class KRAPortsServlet extends PortsServlet {
private static final long serialVersionUID = 1L;
}
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/connector/KRAConnectorServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/connector/KRAConnectorServlet.java
index 8bf5b182bc8..dfd50db73bb 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/connector/KRAConnectorServlet.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/connector/KRAConnectorServlet.java
@@ -17,6 +17,22 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.connector;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+ name = "kraConnector",
+ urlPatterns = "/agent/kra/connector",
+ initParams = {
+ @WebInitParam(name="GetClientCert", value="true"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz"),
+ @WebInitParam(name="authority", value="kra"),
+ @WebInitParam(name="ID", value="kraConnector"),
+ @WebInitParam(name="RequestEncoder", value="com.netscape.cmscore.connector.HttpRequestEncoder"),
+ @WebInitParam(name="resourceID", value="certServer.kra.connector"),
+ @WebInitParam(name="AuthMgr", value="certUserDBAuthMgr")
+ }
+)
public class KRAConnectorServlet extends ConnectorServlet {
private static final long serialVersionUID = 1L;
}
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetConfigEntries.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetConfigEntries.java
index 0b3661d601c..1bbcf82a429 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetConfigEntries.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetConfigEntries.java
@@ -17,6 +17,21 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.csadmin;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+ name = "kraGetConfigEntries",
+ urlPatterns = "/admin/kra/getConfigEntries",
+ initParams = {
+ @WebInitParam(name="GetClientCert", value="false"),
+ @WebInitParam(name="authority", value="kra"),
+ @WebInitParam(name="ID", value="kraGetConfigEntries"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz"),
+ @WebInitParam(name="AuthMgr", value="TokenAuth"),
+ @WebInitParam(name="resourceID", value="certServer.clone.configuration.GetConfigEntries")
+ }
+)
public class KRAGetConfigEntries extends GetConfigEntries {
private static final long serialVersionUID = 1L;
}
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRARegisterUser.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRARegisterUser.java
index 96718eb1800..bdcb3f8e25f 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRARegisterUser.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRARegisterUser.java
@@ -17,6 +17,22 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cms.servlet.csadmin;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+ name = "kraRegisterUser",
+ urlPatterns = "/admin/kra/registerUser",
+ initParams = {
+ @WebInitParam(name="GetClientCert", value="false"),
+ @WebInitParam(name="authority", value="kra"),
+ @WebInitParam(name="ID", value="kraRegisterUser"),
+ @WebInitParam(name="GroupName", value="Data Recovery Manager Agents"),
+ @WebInitParam(name="AuthMgr", value="TokenAuth"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz"),
+ @WebInitParam(name="resourceID", value="certServer.kra.registerUser")
+ }
+)
public class KRARegisterUser extends RegisterUser {
private static final long serialVersionUID = 1L;
}
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
index b7a92804a3f..bde881fce37 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
@@ -24,6 +24,8 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -49,14 +51,22 @@
/**
* Display a Specific Key Archival Request, and initiate
* key recovery process
- *
- * @version $Revision$, $Date$
*/
+@WebServlet(
+ name = "kraKRADisplayBySerialForRecovery",
+ urlPatterns = "/agent/kra/displayBySerialForRecovery",
+ initParams = {
+ @WebInitParam(name="GetClientCert", value="true"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz"),
+ @WebInitParam(name="authority", value="kra"),
+ @WebInitParam(name="templatePath", value="/agent/kra/displayBySerialForRecovery.template"),
+ @WebInitParam(name="ID", value="kraKRADisplayBySerialForRecovery"),
+ @WebInitParam(name="AuthMgr", value="certUserDBAuthMgr"),
+ @WebInitParam(name="resourceID", value="certServer.kra.key")
+ }
+)
public class DisplayBySerialForRecovery extends CMSServlet {
- /**
- *
- */
private static final long serialVersionUID = 6876016034084761827L;
private final static String INFO = "displayBySerial";
private final static String TPL_FILE = "displayBySerialForRecovery.template";
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/GetAsyncPk12.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/GetAsyncPk12.java
index 20207756104..fca45057e19 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/key/GetAsyncPk12.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/GetAsyncPk12.java
@@ -23,6 +23,8 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -50,8 +52,19 @@
/**
* Get the recovered key in PKCS#12 format
* - for asynchronous key recovery only
- *
*/
+@WebServlet(
+ name = "kraKRAGetAsyncPk12",
+ urlPatterns = "/agent/kra/getAsyncPk12",
+ initParams = {
+ @WebInitParam(name="GetClientCert", value="true"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz"),
+ @WebInitParam(name="authority", value="kra"),
+ @WebInitParam(name="ID", value="kraKRAGetAsyncPk12"),
+ @WebInitParam(name="AuthMgr", value="certUserDBAuthMgr"),
+ @WebInitParam(name="resourceID", value="certServer.kra.key")
+ }
+)
public class GetAsyncPk12 extends CMSServlet {
public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(GetAsyncPk12.class);
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/GetPk12.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/GetPk12.java
index 00c26154bac..2684ff47c0b 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/key/GetPk12.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/GetPk12.java
@@ -24,6 +24,8 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -50,9 +52,19 @@
/**
* Get the recovered key in PKCS#12 format
- *
- * @version $Revision$, $Date$
*/
+@WebServlet(
+ name = "kraKRAGetPk12",
+ urlPatterns = "/agent/kra/getPk12",
+ initParams = {
+ @WebInitParam(name="GetClientCert", value="true"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz"),
+ @WebInitParam(name="authority", value="kra"),
+ @WebInitParam(name="ID", value="kraKRAGetPk12"),
+ @WebInitParam(name="AuthMgr", value="certUserDBAuthMgr"),
+ @WebInitParam(name="resourceID", value="certServer.kra.key")
+ }
+)
public class GetPk12 extends CMSServlet {
public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(GetPk12.class);
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyQueryReq.java b/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyQueryReq.java
index 0a48ef03011..3080e8724f1 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyQueryReq.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/request/KeyQueryReq.java
@@ -19,6 +19,8 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import org.dogtagpki.server.authentication.AuthToken;
@@ -29,8 +31,24 @@
/**
* Show paged list of key requests matching search criteria.
*/
+@WebServlet(
+ name = "krakraqueryReq",
+ urlPatterns = "/agent/kra/queryReq",
+ initParams = {
+ @WebInitParam(name="GetClientCert", value="true"),
+ @WebInitParam(name="parser", value="KeyReqParser.PARSER"),
+ @WebInitParam(name="AuthzMgr", value="BasicAclAuthz"),
+ @WebInitParam(name="authority", value="kra"),
+ @WebInitParam(name="templatePath", value="/agent/kra/queryReq.template"),
+ @WebInitParam(name="ID", value="krakraqueryReq"),
+ @WebInitParam(name="resourceID", value="certServer.kra.requests"),
+ @WebInitParam(name="AuthMgr", value="certUserDBAuthMgr")
+ }
+)
public class KeyQueryReq extends QueryReq {
+ private static final long serialVersionUID = 1L;
+
public KeyQueryReq() {
}