diff options
Diffstat (limited to 'base/kra/src/com')
3 files changed, 21 insertions, 20 deletions
diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java index 612b0ff18..f972fe4b5 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.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.certsrv.base.PKIException; +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.csadmin.SystemConfigService; +import com.netscape.cms.servlet.key.KeyService; +import com.netscape.cms.servlet.request.KeyRequestService; public class KeyRecoveryAuthorityApplication extends Application { @@ -22,23 +22,23 @@ 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); + classes.add(PKIException.Mapper.class); } diff --git a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java index 527548381..afe4ed6ea 100644 --- a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java +++ b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java @@ -54,13 +54,13 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.keydb.IKeyRecord; import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.key.KeyRequestResource; import com.netscape.certsrv.kra.EKRAException; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IService; import com.netscape.certsrv.security.IStorageKeyUnit; import com.netscape.certsrv.security.ITransportKeyUnit; -import com.netscape.cms.servlet.request.KeyRequestResource; import com.netscape.cmscore.dbs.KeyRecord; import com.netscape.cmsutil.util.Utils; diff --git a/base/kra/src/com/netscape/kra/SecurityDataService.java b/base/kra/src/com/netscape/kra/SecurityDataService.java index fa009dac9..8a5886fa5 100644 --- a/base/kra/src/com/netscape/kra/SecurityDataService.java +++ b/base/kra/src/com/netscape/kra/SecurityDataService.java @@ -19,6 +19,8 @@ package com.netscape.kra; import java.math.BigInteger; import org.mozilla.jss.crypto.SymmetricKey; + +import com.netscape.certsrv.key.KeyRequestResource; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.profile.IEnrollProfile; @@ -30,7 +32,6 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.keydb.IKeyRecord; import com.netscape.certsrv.dbs.keydb.IKeyRepository; import com.netscape.certsrv.apps.CMS; -import com.netscape.cms.servlet.request.KeyRequestResource; import com.netscape.cmscore.dbs.KeyRecord; import com.netscape.cmsutil.util.Utils; |