From eca4d635e67eaf3c6878d35acfaaf11df53151e2 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
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/certsrv/user/UserCertResource.java | 6 +++---
 base/common/src/com/netscape/certsrv/user/UserResource.java     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'base/common/src/com/netscape/certsrv/user')

diff --git a/base/common/src/com/netscape/certsrv/user/UserCertResource.java b/base/common/src/com/netscape/certsrv/user/UserCertResource.java
index b9339bc33..db463ea59 100644
--- a/base/common/src/com/netscape/certsrv/user/UserCertResource.java
+++ b/base/common/src/com/netscape/certsrv/user/UserCertResource.java
@@ -34,7 +34,7 @@ import org.jboss.resteasy.annotations.ClientResponseType;
 /**
  * @author Endi S. Dewata
  */
-@Path("/users/{userID}/certs")
+@Path("admin/users/{userID}/certs")
 public interface UserCertResource {
 
     @GET
@@ -52,12 +52,12 @@ public interface UserCertResource {
     public Response addUserCert(@PathParam("userID") String userID, UserCertData userCertData);
 
     @GET
-    @Path("/{certID}")
+    @Path("{certID}")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public UserCertData getUserCert(@PathParam("userID") String userID, @PathParam("certID") String certID);
 
     @DELETE
-    @Path("/{certID}")
+    @Path("{certID}")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public void removeUserCert(@PathParam("userID") String userID, @PathParam("certID") String certID);
 }
diff --git a/base/common/src/com/netscape/certsrv/user/UserResource.java b/base/common/src/com/netscape/certsrv/user/UserResource.java
index fae700bc3..4a837165f 100644
--- a/base/common/src/com/netscape/certsrv/user/UserResource.java
+++ b/base/common/src/com/netscape/certsrv/user/UserResource.java
@@ -34,7 +34,7 @@ import org.jboss.resteasy.annotations.ClientResponseType;
 /**
  * @author Endi S. Dewata
  */
-@Path("/users")
+@Path("admin/users")
 public interface UserResource {
 
     @GET
@@ -51,19 +51,19 @@ public interface UserResource {
     public Response addUser(UserData userData);
 
     @GET
-    @Path("/{userID}")
+    @Path("{userID}")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public UserData getUser(@PathParam("userID") String userID);
 
     @POST
-    @Path("/{userID}")
+    @Path("{userID}")
     @ClientResponseType(entityType=UserData.class)
     @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response modifyUser(@PathParam("userID") String userID, UserData userData);
 
     @DELETE
-    @Path("/{userID}")
+    @Path("{userID}")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public void removeUser(@PathParam("userID") String userID);
 }
-- 
cgit