Cleaned up REST server class names.

The REST server classes have been renamed for better clarity
and consistency.

Ticket #259

5 files changed, 10 insertions, 10 deletions

diff --git a/base/common/src/com/netscape/cms/servlet/admin/GroupMemberResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/GroupMemberService.java
index c192815aa..2a7419d33 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/GroupMemberResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/GroupMemberService.java
@@ -44,12 +44,12 @@ import com.netscape.certsrv.user.UserResource;
 import com.netscape.certsrv.usrgrp.IGroup;
 import com.netscape.certsrv.usrgrp.IUGSubsystem;
 import com.netscape.cms.servlet.base.CMSException;
-import com.netscape.cms.servlet.base.CMSResourceService;
+import com.netscape.cms.servlet.base.PKIService;
 
 /**
  * @author Endi S. Dewata
  */
-public class GroupMemberResourceService extends CMSResourceService implements GroupMemberResource {
+public class GroupMemberService extends PKIService implements GroupMemberResource {
 
     public final static int DEFAULT_SIZE = 20;
 
diff --git a/base/common/src/com/netscape/cms/servlet/admin/GroupResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/GroupService.java
index ce665ae3e..868f142c8 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/GroupResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/GroupService.java
@@ -41,13 +41,13 @@ import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.usrgrp.IGroup;
 import com.netscape.certsrv.usrgrp.IUGSubsystem;
 import com.netscape.cms.servlet.base.CMSException;
-import com.netscape.cms.servlet.base.CMSResourceService;
+import com.netscape.cms.servlet.base.PKIService;
 import com.netscape.cmsutil.ldap.LDAPUtil;
 
 /**
  * @author Endi S. Dewata
  */
-public class GroupResourceService extends CMSResourceService implements GroupResource {
+public class GroupService extends PKIService implements GroupResource {
 
     public final static int DEFAULT_SIZE = 20;
 
diff --git a/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java
index 72106a903..2d86d71ea 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java
@@ -26,7 +26,7 @@ import javax.ws.rs.core.Response;
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
 import com.netscape.certsrv.security.ITransportKeyUnit;
-import com.netscape.cms.servlet.base.CMSResourceService;
+import com.netscape.cms.servlet.base.PKIService;
 import com.netscape.cms.servlet.cert.model.CertificateData;
 
 /**
@@ -35,7 +35,7 @@ import com.netscape.cms.servlet.cert.model.CertificateData;
  * @author alee
  *
  */
-public class SystemCertificateResourceService extends CMSResourceService implements SystemCertificateResource {
+public class SystemCertService extends PKIService implements SystemCertificateResource {
 
     /**
      * Used to retrieve the transport certificate
diff --git a/base/common/src/com/netscape/cms/servlet/admin/UserCertResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/UserCertService.java
index e0e2ddfde..4f2304a97 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/UserCertResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/UserCertService.java
@@ -51,14 +51,14 @@ import com.netscape.certsrv.user.UserCertResource;
 import com.netscape.certsrv.usrgrp.IUGSubsystem;
 import com.netscape.certsrv.usrgrp.IUser;
 import com.netscape.cms.servlet.base.CMSException;
-import com.netscape.cms.servlet.base.CMSResourceService;
+import com.netscape.cms.servlet.base.PKIService;
 import com.netscape.cmsutil.util.Cert;
 import com.netscape.cmsutil.util.Utils;
 
 /**
  * @author Endi S. Dewata
  */
-public class UserCertResourceService extends CMSResourceService implements UserCertResource {
+public class UserCertService extends PKIService implements UserCertResource {
 
     public final static int DEFAULT_SIZE = 20;
 
diff --git a/base/common/src/com/netscape/cms/servlet/admin/UserResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/UserService.java
index 1639c5912..1128e09e7 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/UserResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/UserService.java
@@ -46,13 +46,13 @@ import com.netscape.certsrv.usrgrp.IGroup;
 import com.netscape.certsrv.usrgrp.IUGSubsystem;
 import com.netscape.certsrv.usrgrp.IUser;
 import com.netscape.cms.servlet.base.CMSException;
-import com.netscape.cms.servlet.base.CMSResourceService;
+import com.netscape.cms.servlet.base.PKIService;
 import com.netscape.cmsutil.ldap.LDAPUtil;
 
 /**
  * @author Endi S. Dewata
  */
-public class UserResourceService extends CMSResourceService implements UserResource {
+public class UserService extends PKIService implements UserResource {
 
     public final static int DEFAULT_SIZE = 20;