diff options
| -rw-r--r-- | base/common/src/com/netscape/certsrv/key/KeyRequestResource.java | 31 | ||||
| -rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java | 16 |
2 files changed, 0 insertions, 47 deletions
diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java index 412908fc9..17e8a67e5 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java +++ b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java @@ -45,7 +45,6 @@ public interface KeyRequestResource { @QueryParam("maxResults") Integer maxResults, @QueryParam("maxTime") Integer maxTime); - // Archiving - used to test integration with a browser @POST @ClientResponseType(entityType=KeyRequestInfo.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @@ -66,36 +65,6 @@ public interface KeyRequestResource { @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public KeyRequestInfo getRequestInfo(@PathParam("id") RequestId id); - // Archiving - used to test integration with a browser - @POST - @Path("archive") - @ClientResponseType(entityType=KeyRequestInfo.class) - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) - public Response archiveKey(MultivaluedMap<String, String> form); - - @POST - @Path("archive") - @ClientResponseType(entityType=KeyRequestInfo.class) - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - public Response archiveKey(KeyArchivalRequest data); - - //Recovery - used to test integration with a browser - @POST - @Path("recover") - @ClientResponseType(entityType=KeyRequestInfo.class) - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) - public Response recoverKey(MultivaluedMap<String, String> form); - - @POST - @Path("recover") - @ClientResponseType(entityType=KeyRequestInfo.class) - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - public Response recoverKey(KeyRecoveryRequest data); - @POST @Path("{id}/approve") public void approveRequest(@PathParam("id") RequestId id); diff --git a/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java b/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java index 3ea92406a..c89265783 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java +++ b/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java @@ -126,14 +126,6 @@ public class KeyRequestService extends PKIService implements KeyRequestResource return info; } - // Archiving - used to test integration with a browser - @Override - public Response archiveKey(MultivaluedMap<String, String> form) { - KeyArchivalRequest data = new KeyArchivalRequest(form); - return archiveKey(data); - } - - @Override public Response archiveKey(KeyArchivalRequest data) { // auth and authz // Catch this before internal server processing has to deal with it @@ -162,14 +154,6 @@ public class KeyRequestService extends PKIService implements KeyRequestResource } } - //Recovery - used to test integration with a browser - @Override - public Response recoverKey(MultivaluedMap<String, String> form) { - KeyRecoveryRequest data = new KeyRecoveryRequest(form); - return recoverKey(data); - } - - @Override public Response recoverKey(KeyRecoveryRequest data) { // auth and authz |