From eca4d635e67eaf3c6878d35acfaaf11df53151e2 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Thu, 26 Jul 2012 20:40:08 -0500 Subject: Moved REST services into separate URLs. To support different access control configurations the REST services have been separated by roles. Services that don't need authentication will be available under /rest. Services that require agent rights will be available under /rest/agent. Services that require admin rights will be available under /rest/admin. Ticket #107 --- base/common/src/com/netscape/cms/servlet/key/KeyResource.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'base/common/src/com/netscape/cms/servlet/key/KeyResource.java') diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyResource.java b/base/common/src/com/netscape/cms/servlet/key/KeyResource.java index 9a9b5db1a..4d352eaea 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeyResource.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeyResource.java @@ -14,14 +14,14 @@ import com.netscape.cms.servlet.key.model.KeyData; import com.netscape.cms.servlet.key.model.KeyDataInfos; import com.netscape.cms.servlet.request.model.RecoveryRequestData; -@Path("/keys") +@Path("agent/keys") public interface KeyResource { public static final int DEFAULT_MAXTIME = 10; public static final int DEFAULT_MAXRESULTS = 100; @GET - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public KeyDataInfos listKeys(@QueryParam("clientID") String clientID, @QueryParam("status") String status, @DefaultValue(""+DEFAULT_MAXRESULTS) @QueryParam("maxResults") int maxResults, @@ -35,14 +35,14 @@ public interface KeyResource { */ @POST @Path("retrieve") - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public KeyData retrieveKey(RecoveryRequestData data); // retrieval - used to test integration with a browser @POST @Path("retrieve") - @Produces(MediaType.TEXT_XML) - @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) + @Consumes({ MediaType.APPLICATION_FORM_URLENCODED }) public KeyData retrieveKey(MultivaluedMap form); } -- cgit