Reorganized REST service classes.

The REST service classes have been moved into org.dogtagpki.server
namespace. A new upgrade script has been added to update existing
instances.

Ticket #114

4 files changed, 4 insertions, 87 deletions

diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java
deleted file mode 100644
index 0b311427f..000000000
--- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.netscape.kra;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import javax.ws.rs.core.Application;
-
-import com.netscape.certsrv.apps.CMS;
-import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.base.IConfigStore;
-import com.netscape.certsrv.base.PKIException;
-import com.netscape.cms.authorization.ACLInterceptor;
-import com.netscape.cms.authorization.AuthMethodInterceptor;
-import com.netscape.cms.servlet.account.AccountService;
-import com.netscape.cms.servlet.admin.GroupService;
-import com.netscape.cms.servlet.admin.SystemCertService;
-import com.netscape.cms.servlet.admin.UserService;
-import com.netscape.cms.servlet.csadmin.SecurityDomainService;
-import com.netscape.cms.servlet.csadmin.SystemConfigService;
-import com.netscape.cms.servlet.key.KeyService;
-import com.netscape.cms.servlet.request.KeyRequestService;
-import com.netscape.cmscore.logging.AuditService;
-import com.netscape.cmscore.selftests.SelfTestService;
-
-public class KeyRecoveryAuthorityApplication extends Application {
-
-    private Set<Object> singletons = new LinkedHashSet<Object>();
-    private Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
-
-    public KeyRecoveryAuthorityApplication() {
-
-        // account
-        classes.add(AccountService.class);
-
-        // audit
-        classes.add(AuditService.class);
-
-        // installer
-        classes.add(SystemConfigService.class);
-
-        // security domain
-        IConfigStore cs = CMS.getConfigStore();
-        try {
-            boolean standalone = cs.getBoolean("kra.standalone", false);
-            if (standalone) {
-                classes.add(SecurityDomainService.class);
-            }
-        } catch (EBaseException e) {
-            CMS.debug(e);
-            throw new RuntimeException(e);
-        }
-
-        // keys and keyrequests
-        classes.add(KeyService.class);
-        classes.add(KeyRequestService.class);
-
-        // selftests
-        classes.add(SelfTestService.class);
-
-        // user and group management
-        classes.add(GroupService.class);
-        classes.add(UserService.class);
-
-        // system certs
-        classes.add(SystemCertService.class);
-
-        // exception mapper
-        classes.add(PKIException.Mapper.class);
-
-        // interceptors
-        singletons.add(new AuthMethodInterceptor());
-        singletons.add(new ACLInterceptor());
-    }
-
-    public Set<Class<?>> getClasses() {
-        return classes;
-    }
-
-    public Set<Object> getSingletons() {
-        return singletons;
-    }
-
-}
diff --git a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java
index f3b7709e7..269fa8df4 100644
--- a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java
+++ b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java
@@ -30,6 +30,7 @@ import java.util.Random;
 
 import javax.crypto.spec.RC2ParameterSpec;
 
+import org.dogtagpki.server.kra.rest.KeyRequestService;
 import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.asn1.OCTET_STRING;
 import org.mozilla.jss.crypto.Cipher;
@@ -64,7 +65,6 @@ import com.netscape.certsrv.request.IService;
 import com.netscape.certsrv.request.RequestId;
 import com.netscape.certsrv.security.IStorageKeyUnit;
 import com.netscape.certsrv.security.ITransportKeyUnit;
-import com.netscape.cms.servlet.request.KeyRequestService;
 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 b9620f5d2..8201414db 100644
--- a/base/kra/src/com/netscape/kra/SecurityDataService.java
+++ b/base/kra/src/com/netscape/kra/SecurityDataService.java
@@ -19,6 +19,7 @@ package com.netscape.kra;
 
 import java.math.BigInteger;
 
+import org.dogtagpki.server.kra.rest.KeyRequestService;
 import org.mozilla.jss.crypto.SymmetricKey;
 
 import com.netscape.certsrv.apps.CMS;
@@ -35,7 +36,6 @@ import com.netscape.certsrv.request.IService;
 import com.netscape.certsrv.request.RequestId;
 import com.netscape.certsrv.security.IStorageKeyUnit;
 import com.netscape.certsrv.security.ITransportKeyUnit;
-import com.netscape.cms.servlet.request.KeyRequestService;
 import com.netscape.cmscore.dbs.KeyRecord;
 import com.netscape.cmsutil.util.Utils;
 
diff --git a/base/kra/src/com/netscape/kra/SymKeyGenService.java b/base/kra/src/com/netscape/kra/SymKeyGenService.java
index d1e60fa70..774bbcda9 100644
--- a/base/kra/src/com/netscape/kra/SymKeyGenService.java
+++ b/base/kra/src/com/netscape/kra/SymKeyGenService.java
@@ -45,7 +45,7 @@ import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.IService;
 import com.netscape.certsrv.request.RequestId;
 import com.netscape.certsrv.security.IStorageKeyUnit;
-import com.netscape.cms.servlet.request.KeyRequestService;
+import com.netscape.cms.servlet.key.KeyRequestDAO;
 import com.netscape.cmscore.dbs.KeyRecord;
 
 /**
@@ -113,7 +113,7 @@ public class SymKeyGenService implements IService {
         }
 
         CryptoToken token = mStorageUnit.getToken();
-        KeyGenAlgorithm kgAlg = KeyRequestService.KEYGEN_ALGORITHMS.get(algorithm);
+        KeyGenAlgorithm kgAlg = KeyRequestDAO.KEYGEN_ALGORITHMS.get(algorithm);
         if (kgAlg == null) {
             throw new EBaseException("Invalid algorithm");
         }