From c73890c7c617732a84d009e117ff7aeab0133053 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 14 Nov 2013 10:32:39 -0500 Subject: Updated ACL and auth method mapping names. The ACL and auth method mapping names in some resources have been modified to be more consistent with those in other resources. --- .../netscape/certsrv/cert/CertRequestResource.java | 36 +++++++++++----------- .../com/netscape/certsrv/cert/CertResource.java | 16 +++++----- .../com/netscape/certsrv/group/GroupResource.java | 4 +-- .../netscape/certsrv/key/KeyRequestResource.java | 4 +-- .../src/com/netscape/certsrv/key/KeyResource.java | 4 +-- .../netscape/certsrv/profile/ProfileResource.java | 12 ++++---- .../certsrv/system/KRAConnectorResource.java | 4 +-- .../certsrv/system/TPSConnectorResource.java | 2 +- .../com/netscape/certsrv/user/UserResource.java | 4 +-- 9 files changed, 43 insertions(+), 43 deletions(-) (limited to 'base/common/src/com') diff --git a/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java b/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java index 7656080a1..8dc30bcdf 100644 --- a/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java +++ b/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java @@ -62,8 +62,8 @@ public interface CertRequestResource { @GET @Path("agent/certrequests") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certrequests") - @AuthMethodMapping("agent") + @ACLMapping("certrequests") + @AuthMethodMapping("certrequests") public CertRequestInfos listRequests(@QueryParam("requestState") String requestState, @QueryParam("requestType") String requestType, @QueryParam("start") RequestId start, @@ -74,8 +74,8 @@ public interface CertRequestResource { @GET @Path("agent/certrequests/{id}") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certrequests") - @AuthMethodMapping("agent") + @ACLMapping("certrequests") + @AuthMethodMapping("certrequests") public CertReviewResponse reviewRequest(@PathParam("id") RequestId id); @GET @@ -93,50 +93,50 @@ public interface CertRequestResource { @POST @Path("agent/certrequests/{id}/approve") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certrequests") - @AuthMethodMapping("agent") + @ACLMapping("certrequests") + @AuthMethodMapping("certrequests") public void approveRequest(@PathParam("id") RequestId id, CertReviewResponse data); @POST @Path("agent/certrequests/{id}/reject") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certrequests") - @AuthMethodMapping("agent") + @ACLMapping("certrequests") + @AuthMethodMapping("certrequests") public void rejectRequest(@PathParam("id") RequestId id, CertReviewResponse data); @POST @Path("agent/certrequests/{id}/cancel") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certrequests") - @AuthMethodMapping("agent") + @ACLMapping("certrequests") + @AuthMethodMapping("certrequests") public void cancelRequest(@PathParam("id") RequestId id, CertReviewResponse data); @POST @Path("agent/certrequests/{id}/update") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certrequests") - @AuthMethodMapping("agent") + @ACLMapping("certrequests") + @AuthMethodMapping("certrequests") public void updateRequest(@PathParam("id") RequestId id, CertReviewResponse data); @POST @Path("agent/certrequests/{id}/validate") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certrequests") - @AuthMethodMapping("agent") + @ACLMapping("certrequests") + @AuthMethodMapping("certrequests") public void validateRequest(@PathParam("id") RequestId id, CertReviewResponse data); @POST @Path("agent/certrequests/{id}/unassign") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certrequests") - @AuthMethodMapping("agent") + @ACLMapping("certrequests") + @AuthMethodMapping("certrequests") public void unassignRequest(@PathParam("id") RequestId id, CertReviewResponse data); @POST @Path("agent/certrequests/{id}/assign") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certrequests") - @AuthMethodMapping("agent") + @ACLMapping("certrequests") + @AuthMethodMapping("certrequests") public void assignRequest(@PathParam("id") RequestId id, CertReviewResponse data); } diff --git a/base/common/src/com/netscape/certsrv/cert/CertResource.java b/base/common/src/com/netscape/certsrv/cert/CertResource.java index b5b282b18..9f527e130 100644 --- a/base/common/src/com/netscape/certsrv/cert/CertResource.java +++ b/base/common/src/com/netscape/certsrv/cert/CertResource.java @@ -43,31 +43,31 @@ public interface CertResource { @GET @Path("agent/certs/{id}") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certs") - @AuthMethodMapping("agent") + @ACLMapping("certs") + @AuthMethodMapping("certs") public CertData reviewCert(@PathParam("id") CertId id); @POST @Path("agent/certs/{id}/revoke-ca") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certs") - @AuthMethodMapping("agent") + @ACLMapping("certs") + @AuthMethodMapping("certs") public CertRequestInfo revokeCACert(@PathParam("id") CertId id, CertRevokeRequest request); @POST @Path("agent/certs/{id}/revoke") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certs") - @AuthMethodMapping("agent") + @ACLMapping("certs") + @AuthMethodMapping("certs") public CertRequestInfo revokeCert(@PathParam("id") CertId id, CertRevokeRequest request); @POST @Path("agent/certs/{id}/unrevoke") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - @ACLMapping("agent.certs") - @AuthMethodMapping("agent") + @ACLMapping("certs") + @AuthMethodMapping("certs") public CertRequestInfo unrevokeCert(@PathParam("id") CertId id, CertUnrevokeRequest request); } diff --git a/base/common/src/com/netscape/certsrv/group/GroupResource.java b/base/common/src/com/netscape/certsrv/group/GroupResource.java index ea59922a5..12c90228b 100644 --- a/base/common/src/com/netscape/certsrv/group/GroupResource.java +++ b/base/common/src/com/netscape/certsrv/group/GroupResource.java @@ -38,8 +38,8 @@ import com.netscape.certsrv.authentication.AuthMethodMapping; * @author Endi S. Dewata */ @Path("admin/groups") -@ACLMapping("admin.groups") -@AuthMethodMapping("admin") +@ACLMapping("groups") +@AuthMethodMapping("groups") public interface GroupResource { @GET diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java index b7bea7057..9256ac461 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java +++ b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java @@ -18,8 +18,8 @@ import com.netscape.certsrv.authentication.AuthMethodMapping; import com.netscape.certsrv.request.RequestId; @Path("agent/keyrequests") -@ACLMapping("agent.keyrequests") -@AuthMethodMapping("agent") +@ACLMapping("keyrequests") +@AuthMethodMapping("keyrequests") public interface KeyRequestResource { public final String SYMMETRIC_KEY_TYPE = "symmetricKey"; diff --git a/base/common/src/com/netscape/certsrv/key/KeyResource.java b/base/common/src/com/netscape/certsrv/key/KeyResource.java index a574abb65..c420e0d45 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyResource.java +++ b/base/common/src/com/netscape/certsrv/key/KeyResource.java @@ -14,8 +14,8 @@ import com.netscape.certsrv.authentication.AuthMethodMapping; @Path("agent/keys") -@ACLMapping("agent.keys") -@AuthMethodMapping("agent") +@ACLMapping("keys") +@AuthMethodMapping("keys") public interface KeyResource { @GET diff --git a/base/common/src/com/netscape/certsrv/profile/ProfileResource.java b/base/common/src/com/netscape/certsrv/profile/ProfileResource.java index 5af61bff7..39ed0e6e2 100644 --- a/base/common/src/com/netscape/certsrv/profile/ProfileResource.java +++ b/base/common/src/com/netscape/certsrv/profile/ProfileResource.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.authentication.AuthMethodMapping; public interface ProfileResource { @GET - @ACLMapping("profile.list") + @ACLMapping("profiles.list") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public ProfileDataInfos listProfiles( @QueryParam("start") Integer start, @@ -30,34 +30,34 @@ public interface ProfileResource { @GET @Path("{id}") - @ACLMapping("profile.read") + @ACLMapping("profiles.read") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public ProfileData retrieveProfile(@PathParam("id") String id); @POST @ClientResponseType(entityType=ProfileData.class) - @ACLMapping("profile.create") + @ACLMapping("profiles.create") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public Response createProfile(ProfileData data); @POST @Path("{id}") - @ACLMapping("profile.approve") + @ACLMapping("profiles.approve") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public void modifyProfileState(@PathParam("id") String id, @QueryParam("action") String action); @PUT @Path("{id}") @ClientResponseType(entityType=ProfileData.class) - @ACLMapping("profile.modify") + @ACLMapping("profiles.modify") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public Response modifyProfile(@PathParam("id") String id, ProfileData data); @DELETE @Path("{id}") - @ACLMapping("profile.delete") + @ACLMapping("profiles.delete") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public void deleteProfile(@PathParam("id") String id); diff --git a/base/common/src/com/netscape/certsrv/system/KRAConnectorResource.java b/base/common/src/com/netscape/certsrv/system/KRAConnectorResource.java index 0799b55a6..474994e9e 100644 --- a/base/common/src/com/netscape/certsrv/system/KRAConnectorResource.java +++ b/base/common/src/com/netscape/certsrv/system/KRAConnectorResource.java @@ -32,8 +32,8 @@ import com.netscape.certsrv.authentication.AuthMethodMapping; * @author Ade Lee */ @Path("admin/kraconnector") -@ACLMapping("admin.kraconnector") -@AuthMethodMapping("admin") +@ACLMapping("kraconnectors") +@AuthMethodMapping("kraconnectors") public interface KRAConnectorResource { @POST diff --git a/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java b/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java index aeee39071..441e6f303 100644 --- a/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java +++ b/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.key.KeyData; * @author Ade Lee */ @Path("/admin/tps-connectors") -@AuthMethodMapping("admin") +@AuthMethodMapping("tpsconnectors") public interface TPSConnectorResource { @GET @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) diff --git a/base/common/src/com/netscape/certsrv/user/UserResource.java b/base/common/src/com/netscape/certsrv/user/UserResource.java index 961f5ebda..19db939dd 100644 --- a/base/common/src/com/netscape/certsrv/user/UserResource.java +++ b/base/common/src/com/netscape/certsrv/user/UserResource.java @@ -38,8 +38,8 @@ import com.netscape.certsrv.authentication.AuthMethodMapping; * @author Endi S. Dewata */ @Path("admin/users") -@ACLMapping("admin.users") -@AuthMethodMapping("admin") +@ACLMapping("users") +@AuthMethodMapping("users") public interface UserResource { public static final String ATTR_TPS_PROFILES = "tpsProfiles"; -- cgit