Fixed TPS REST services.

The REST services have been modified to support submit and cancel
actions. The ACL has been fixed to allow admins and agents to
change the status.

https://fedorahosted.org/pki/ticket/1292

8 files changed, 12 insertions, 12 deletions

diff --git a/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java b/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java
index 293c470b7..533811173 100644
--- a/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java
@@ -61,7 +61,7 @@ public class AuthenticatorClient extends Client {
     }
 
     public AuthenticatorData changeAuthenticatorStatus(String authenticatorID, String action) {
-        Response response = resource.changeAuthenticatorStatus(authenticatorID, action);
+        Response response = resource.changeStatus(authenticatorID, action);
         return client.getEntity(response, AuthenticatorData.class);
     }
 
diff --git a/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java b/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java
index d21ad552c..c94dd8af8 100644
--- a/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java
@@ -67,9 +67,9 @@ public interface AuthenticatorResource {
 
     @POST
     @Path("{authenticatorID}")
-    @ACLMapping("authenticators.approve")
+    @ACLMapping("authenticators.change-status")
     @ClientResponseType(entityType=AuthenticatorData.class)
-    public Response changeAuthenticatorStatus(
+    public Response changeStatus(
             @PathParam("authenticatorID") String authenticatorID,
             @QueryParam("action") String action);
 
diff --git a/base/common/src/com/netscape/certsrv/tps/connector/ConnectorClient.java b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorClient.java
index 7870a7d4d..a4b55bdf1 100644
--- a/base/common/src/com/netscape/certsrv/tps/connector/ConnectorClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorClient.java
@@ -61,7 +61,7 @@ public class ConnectorClient extends Client {
     }
 
     public ConnectorData changeConnectorStatus(String connectorID, String action) {
-        Response response = resource.changeConnectorStatus(connectorID, action);
+        Response response = resource.changeStatus(connectorID, action);
         return client.getEntity(response, ConnectorData.class);
     }
 
diff --git a/base/common/src/com/netscape/certsrv/tps/connector/ConnectorResource.java b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorResource.java
index 9df4bffca..bede85c70 100644
--- a/base/common/src/com/netscape/certsrv/tps/connector/ConnectorResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorResource.java
@@ -67,9 +67,9 @@ public interface ConnectorResource {
 
     @POST
     @Path("{connectorID}")
-    @ACLMapping("connectors.approve")
+    @ACLMapping("connectors.change-status")
     @ClientResponseType(entityType=ConnectorData.class)
-    public Response changeConnectorStatus(
+    public Response changeStatus(
             @PathParam("connectorID") String connectorID,
             @QueryParam("action") String action);
 
diff --git a/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java b/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java
index 3a659291e..951748d91 100644
--- a/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java
@@ -65,7 +65,7 @@ public class ProfileClient extends Client {
     }
 
     public ProfileData changeProfileStatus(String profileID, String action) {
-        Response response = resource.changeProfileStatus(profileID, action);
+        Response response = resource.changeStatus(profileID, action);
         return client.getEntity(response, ProfileData.class);
     }
 
diff --git a/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingClient.java b/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingClient.java
index dafc25f41..b2e03f293 100644
--- a/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingClient.java
@@ -61,7 +61,7 @@ public class ProfileMappingClient extends Client {
     }
 
     public ProfileMappingData changeProfileMappingStatus(String profileMappingID, String action) {
-        Response response = resource.changeProfileMappingStatus(profileMappingID, action);
+        Response response = resource.changeStatus(profileMappingID, action);
         return client.getEntity(response, ProfileMappingData.class);
     }
 
diff --git a/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingResource.java b/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingResource.java
index 5b819b899..0308615f5 100644
--- a/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingResource.java
@@ -67,9 +67,9 @@ public interface ProfileMappingResource {
 
     @POST
     @Path("{profileMappingID}")
-    @ACLMapping("profiles-mappings.approve")
+    @ACLMapping("profiles-mappings.change-status")
     @ClientResponseType(entityType=ProfileMappingData.class)
-    public Response changeProfileMappingStatus(
+    public Response changeStatus(
             @PathParam("profileMappingID") String profileMappingID,
             @QueryParam("action") String action);
 
diff --git a/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java b/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java
index 48d3a8c4d..8f0ebd065 100644
--- a/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java
@@ -67,9 +67,9 @@ public interface ProfileResource {
 
     @POST
     @Path("{profileID}")
-    @ACLMapping("profiles.approve")
+    @ACLMapping("profiles.change-status")
     @ClientResponseType(entityType=ProfileData.class)
-    public Response changeProfileStatus(
+    public Response changeStatus(
             @PathParam("profileID") String profileID,
             @QueryParam("action") String action);