summaryrefslogtreecommitdiffstats
path: root/base/kra
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-08-11 05:09:02 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-08-15 12:07:08 -0500
commitd41848a5881db3d12f65e078b945829f1fe296a5 (patch)
treeb98a85b38f18cf6121d39164ae6280ef957be9e5 /base/kra
parent56768d1bd274228a391ac8a4272ab9ccf5ac3e51 (diff)
downloadpki-d41848a5881db3d12f65e078b945829f1fe296a5.tar.gz
pki-d41848a5881db3d12f65e078b945829f1fe296a5.tar.xz
pki-d41848a5881db3d12f65e078b945829f1fe296a5.zip
Cleaned up REST server class names.
The REST server classes have been renamed for better clarity and consistency. Ticket #259
Diffstat (limited to 'base/kra')
-rw-r--r--base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java6
-rw-r--r--base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java32
2 files changed, 19 insertions, 19 deletions
diff --git a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
index 9954ba94f..3ccde1cd2 100644
--- a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
+++ b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
@@ -40,7 +40,7 @@ import org.mozilla.jss.util.Password;
import com.netscape.certsrv.dbs.keydb.KeyId;
import com.netscape.certsrv.request.RequestId;
import com.netscape.cms.client.cli.ClientConfig;
-import com.netscape.cms.servlet.base.CMSResourceService;
+import com.netscape.cms.servlet.base.PKIService;
import com.netscape.cms.servlet.key.model.KeyData;
import com.netscape.cms.servlet.key.model.KeyDataInfo;
import com.netscape.cms.servlet.request.KeyRequestResource;
@@ -209,8 +209,8 @@ public class DRMTest {
// Test 1: Get transport certificate from DRM
transportCert = client.getTransportCert();
- transportCert = transportCert.substring(CMSResourceService.HEADER.length(),
- transportCert.indexOf(CMSResourceService.TRAILER));
+ transportCert = transportCert.substring(PKIService.HEADER.length(),
+ transportCert.indexOf(PKIService.TRAILER));
log("Transport Cert retrieved from DRM: " + transportCert);
diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java
index 612b0ff18..9a884f872 100644
--- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java
+++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java
@@ -5,15 +5,15 @@ import java.util.Set;
import javax.ws.rs.core.Application;
-import com.netscape.cms.servlet.admin.GroupMemberResourceService;
-import com.netscape.cms.servlet.admin.GroupResourceService;
-import com.netscape.cms.servlet.admin.SystemCertificateResourceService;
-import com.netscape.cms.servlet.admin.UserCertResourceService;
-import com.netscape.cms.servlet.admin.UserResourceService;
+import com.netscape.cms.servlet.admin.GroupMemberService;
+import com.netscape.cms.servlet.admin.GroupService;
+import com.netscape.cms.servlet.admin.SystemCertService;
+import com.netscape.cms.servlet.admin.UserCertService;
+import com.netscape.cms.servlet.admin.UserService;
import com.netscape.cms.servlet.base.CMSException;
-import com.netscape.cms.servlet.csadmin.SystemConfigurationResourceService;
-import com.netscape.cms.servlet.key.KeyResourceService;
-import com.netscape.cms.servlet.request.KeyRequestResourceService;
+import com.netscape.cms.servlet.csadmin.SystemConfigService;
+import com.netscape.cms.servlet.key.KeyService;
+import com.netscape.cms.servlet.request.KeyRequestService;
public class KeyRecoveryAuthorityApplication extends Application {
@@ -22,20 +22,20 @@ public class KeyRecoveryAuthorityApplication extends Application {
public KeyRecoveryAuthorityApplication() {
// installer
- classes.add(SystemConfigurationResourceService.class);
+ classes.add(SystemConfigService.class);
// keys and keyrequests
- classes.add(KeyResourceService.class);
- classes.add(KeyRequestResourceService.class);
+ classes.add(KeyService.class);
+ classes.add(KeyRequestService.class);
// user and group management
- classes.add(GroupMemberResourceService.class);
- classes.add(GroupResourceService.class);
- classes.add(UserCertResourceService.class);
- classes.add(UserResourceService.class);
+ classes.add(GroupMemberService.class);
+ classes.add(GroupService.class);
+ classes.add(UserCertService.class);
+ classes.add(UserService.class);
// system certs
- classes.add(SystemCertificateResourceService.class);
+ classes.add(SystemCertService.class);
// exception mapper
classes.add(CMSException.Mapper.class);