summaryrefslogtreecommitdiffstats
path: root/pki/base/common/src/com/netscape/certsrv/dbs
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/common/src/com/netscape/certsrv/dbs')
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java38
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java85
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java40
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java40
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java80
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java22
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java41
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java171
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java213
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java44
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java212
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java144
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java36
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java48
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/Modification.java87
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java61
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java176
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java94
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java528
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java47
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java161
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java181
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java153
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java49
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java174
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyId.java122
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java37
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java106
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java30
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java88
-rw-r--r--pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java44
31 files changed, 0 insertions, 3352 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java b/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java
deleted file mode 100644
index a2201b8e6..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-import java.util.ListResourceBundle;
-
-/**
- * A class represents a resource bundle for DBS subsystem.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public class DBResources extends ListResourceBundle {
-
- /**
- * Returns the content of this resource.
- */
- public Object[][] getContents() {
- return contents;
- }
-
- static final Object[][] contents = {};
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java b/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java
deleted file mode 100644
index 77508dca4..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java
+++ /dev/null
@@ -1,85 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-import com.netscape.certsrv.base.EBaseException;
-
-/**
- * A class represents a database exception.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public class EDBException extends EBaseException {
-
- /**
- *
- */
- private static final long serialVersionUID = -895521374187351529L;
- /**
- * Resource class name.
- */
- private static final String DB_RESOURCES = DBResources.class.getName();
-
- /**
- * Constructs a database exception.
- * <P>
- *
- * @param msgFormat message format
- */
- public EDBException(String msgFormat) {
- super(msgFormat);
- }
-
- /**
- * Constructs a database exception.
- * <P>
- *
- * @param msgFormat message format
- * @param param parameter
- */
- public EDBException(String msgFormat, String param) {
- super(msgFormat, param);
- }
-
- /**
- * Constructs a database exception.
- * <P>
- *
- * @param msgFormat message format
- * @param e exception as parameter
- */
- public EDBException(String msgFormat, Exception e) {
- super(msgFormat, e);
- }
-
- /**
- * Constructs a database exception.
- * <P>
- *
- * @param msgFormat message format
- * @param params list of parameters
- */
- public EDBException(String msgFormat, Object params[]) {
- super(msgFormat, params);
- }
-
- protected String getBundleName() {
- return DB_RESOURCES;
- }
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java b/pki/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java
deleted file mode 100644
index 6afb2dcc3..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-/**
- * Indicates internal db is down.
- *
- * @version $Revision$, $Date$
- */
-public class EDBNotAvailException extends EDBException {
-
- /**
- *
- */
- private static final long serialVersionUID = 8516095366048215233L;
-
- /**
- * Constructs a ldap server down exception with host & port info.
- *
- * @param errorString Detailed error message.
- */
- public EDBNotAvailException(String errorString) {
- super(errorString);
- }
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java b/pki/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java
deleted file mode 100644
index dd3880c12..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-/**
- * Indicates internal db is down.
- *
- * @version $Revision$, $Date$
- */
-public class EDBRecordNotFoundException extends EDBException {
-
- /**
- *
- */
- private static final long serialVersionUID = -3797213848651705426L;
-
- /**
- * Constructs a ldap server down exception with host & port info.
- *
- * @param errorString Detailed error message.
- */
- public EDBRecordNotFoundException(String errorString) {
- super(errorString);
- }
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java
deleted file mode 100644
index 27e15bd7d..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-import java.util.Enumeration;
-
-import netscape.ldap.LDAPAttributeSet;
-
-import com.netscape.certsrv.base.EBaseException;
-
-/**
- * An interface represents an attribute mapper. A mapper
- * has knowledge on how to convert a db attribute into
- * zero or more LDAP attribute, and vice versa.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public interface IDBAttrMapper {
-
- /**
- * Retrieves a list of LDAP attributes that are used
- * in the mapper. By having this, the framework can
- * provide search on selective attributes.
- *
- * @return a list of supported attribute names
- */
- public Enumeration<String> getSupportedLDAPAttributeNames();
-
- /**
- * Maps object attribute into LDAP attributes.
- *
- * @param parent parent object where the object comes from
- * @param name name of db attribute
- * @param obj object itself
- * @param attrs LDAP attribute set where the result should be stored
- * @exception EBaseException failed to map object
- */
- public void mapObjectToLDAPAttributeSet(IDBObj parent,
- String name, Object obj, LDAPAttributeSet attrs)
- throws EBaseException;
-
- /**
- * Maps LDAP attributes into object, and puts the object
- * into 'parent'.
- *
- * @param attrs LDAP attribute set
- * @param name name of db attribute to be processed
- * @param parent parent object where the object should be added
- * @exception EBaseException failed to map object
- */
- public void mapLDAPAttributeSetToObject(LDAPAttributeSet attrs,
- String name, IDBObj parent) throws EBaseException;
-
- /**
- * Maps search filters into LDAP search filter.
- *
- * @param name name of db attribute
- * @param op filte operation (i.e. "=", ">=")
- * @param value attribute value
- * @exception EBaseException failed to map filter
- */
- public String mapSearchFilter(String name, String op,
- String value) throws EBaseException;
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java
deleted file mode 100644
index 5684dd4d7..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.netscape.certsrv.dbs;
-
-/**
- * An interface representing a dynamic attribute mapper.
- * A dynamic mapper has knowledge on how to convert a set of dynamically
- * assigned db attribute into zero or more dynamically assigned LDAP
- * attributes, and vice versa.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public interface IDBDynAttrMapper extends IDBAttrMapper {
-
- /**
- * Returns true if the LDAP attribute can be mapped by this
- * dynamic mapper.
- *
- * @param attrName LDAP attribute name to check
- * @return a list of supported attribute names
- */
- public boolean supportsLDAPAttributeName(String attrName);
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java
deleted file mode 100644
index 5c634beeb..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-import java.util.Enumeration;
-
-import com.netscape.certsrv.base.IAttrSet;
-
-/**
- * An interface represents a database object
- * that is serializable.
- *
- * @version $Revision$, $Date$
- */
-public interface IDBObj extends IAttrSet {
-
- /**
- * Returns a list of serializable attribute
- * names. This method should return the
- * attribute name even if there is no attribute
- * value for the attribute.
- *
- * @return a list of serializable attribute names
- */
- public Enumeration<String> getSerializableAttrNames();
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java
deleted file mode 100644
index 241f3af9f..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java
+++ /dev/null
@@ -1,171 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-import netscape.ldap.LDAPAttributeSet;
-
-import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.base.ISubsystem;
-
-/**
- * A class represents a registry where all the
- * schema (object classes and attribute) information
- * is stored.
- *
- * Attribute mappers can be registered with this
- * registry.
- *
- * Given the schema information stored, this registry
- * has knowledge to convert a Java object into a
- * LDAPAttributeSet or vice versa.
- *
- * @version $Revision$, $Date$
- */
-public interface IDBRegistry extends ISubsystem {
-
- /**
- * Registers object class.
- *
- * @param className java class to create for the object classes
- * @param ldapNames a list of LDAP object classes
- * @exception EDBException failed to register
- */
- public void registerObjectClass(String className, String ldapNames[])
- throws EDBException;
-
- /**
- * See if an object class is registered.
- *
- * @param className java class to create
- * @return true if object class is registered already
- */
- public boolean isObjectClassRegistered(String className);
-
- /**
- * Registers attribute mapper.
- *
- * @param ufName LDAP attribute name
- * @param mapper mapper to invoke for the attribute
- * @exception EDBException failed to register
- */
- public void registerAttribute(String ufName, IDBAttrMapper mapper)
- throws EDBException;
-
- /**
- * See if an attribute is registered.
- *
- * @param ufName attribute name
- * @return true if attribute is registered already
- */
- public boolean isAttributeRegistered(String ufName);
-
- /**
- * Registers a dynamic attribute mapper.
- *
- * @param mapper The dynamic mapper to register
- */
- public void registerDynamicMapper(IDBDynAttrMapper mapper);
-
- /**
- * Creates LDAP-based search filters with help of
- * registered mappers.
- * Parses filter from filter string specified in RFC1558.
- *
- * <pre>
- * <filter> ::= '(' <filtercomp> ')'
- * <filtercomp> ::= <and> | <or> | <not> | <item>
- * <and> ::= '&' <filterlist>
- * <or> ::= '|' <filterlist>
- * <not> ::= '!' <filter>
- * <filterlist> ::= <filter> | <filter> <filterlist>
- * <item> ::= <simple> | <present> | <substring>
- * <simple> ::= <attr> <filtertype> <value>
- * <filtertype> ::= <equal> | <approx> | <greater> | <less>
- * <equal> ::= '='
- * <approx> ::= '~='
- * <greater> ::= '>='
- * <less> ::= '<='
- * <present> ::= <attr> '=*'
- * <substring> ::= <attr> '=' <initial> <any> <final>
- * <initial> ::= NULL | <value>
- * <any> ::= '*' <starval>
- * <starval> ::= NULL | <value> '*' <starval>
- * <final> ::= NULL | <value>
- * </pre>
- *
- * @param filter CMS-based filter
- * @return LDAP-based filter string
- * @exception EBaseException failed to convert filter
- */
- public String getFilter(String filter) throws EBaseException;
-
- /**
- * Creates LDAP-based search filters with help of
- * registered mappers.
- *
- * @param filter CMS-based filter
- * @param c filter converter
- * @return LDAP-based filter string
- * @exception EBaseException failed to convert filter
- */
- public String getFilter(String filter, IFilterConverter c)
- throws EBaseException;
-
- /**
- * Maps object into LDAP attribute set.
- *
- * @param parent object's parent
- * @param name name of the object
- * @param obj object to be mapped
- * @param attrs LDAP attribute set
- * @exception EBaseException failed to map object
- */
- public void mapObject(IDBObj parent, String name, Object obj,
- LDAPAttributeSet attrs) throws EBaseException;
-
- /**
- * Retrieves a list of LDAP attributes that are associated
- * with the given attributes.
- *
- * @param attrs attributes
- * @return LDAP-based attributes
- * @exception EBaseException failed to map attributes
- */
- public String[] getLDAPAttributes(String attrs[])
- throws EBaseException;
-
- /**
- * Creates attribute set from object.
- *
- * @param obj database object
- * @return LDAP attribute set
- * @exception EBaseException failed to create set
- */
- public LDAPAttributeSet createLDAPAttributeSet(IDBObj obj)
- throws EBaseException;
-
- /**
- * Creates object from attribute set.
- *
- * @param attrs LDAP attribute set
- * @return database object
- * @exception EBaseException failed to create object
- */
- public IDBObj createObject(LDAPAttributeSet attrs)
- throws EBaseException;
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java
deleted file mode 100644
index c186d1145..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java
+++ /dev/null
@@ -1,213 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-import netscape.ldap.LDAPSearchResults;
-
-import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.base.ISubsystem;
-
-/**
- * An interface represents the database session. Operations
- * can be performed with a session.
- *
- * Transaction and Caching support can be integrated
- * into session.
- *
- * @version $Revision$, $Date$
- */
-public interface IDBSSession {
-
- /**
- * Returns database subsystem.
- *
- * @return subsystem
- */
- public ISubsystem getDBSubsystem();
-
- /**
- * Closes this session.
- *
- * @exception EDBException failed to close session
- */
- public void close() throws EDBException;
-
- /**
- * Adds object to backend database. For example,
- *
- * <PRE>
- * session.add(&quot;cn=123459,o=certificate repository,o=airius.com&quot;,
- * certRec);
- * </PRE>
- *
- * @param name name of the object
- * @param obj object to be added
- * @exception EDBException failed to add object
- */
- public void add(String name, IDBObj obj) throws EBaseException;
-
- /**
- * Reads an object from the database.
- *
- * @param name name of the object that is to be read
- * @return database object
- * @exception EBaseException failed to read object
- */
- public IDBObj read(String name) throws EBaseException;
-
- /**
- * Reads an object from the database, and only populates
- * the selected attributes.
- *
- * @param name name of the object that is to be read
- * @param attrs selected attributes
- * @return database object
- * @exception EBaseException failed to read object
- */
- public IDBObj read(String name, String attrs[])
- throws EBaseException;
-
- /**
- * Deletes object from database.
- *
- * @param name name of the object that is to be deleted
- * @exception EBaseException failed to delete object
- */
- public void delete(String name) throws EBaseException;
-
- /**
- * Modify an object in the database.
- *
- * @param name name of the object that is to be modified
- * @param mods modifications
- * @exception EBaseException failed to modify
- */
- public void modify(String name, ModificationSet mods)
- throws EBaseException;
-
- /**
- * Searchs for a list of objects that match the
- * filter.
- *
- * @param base starting point of the search
- * @param filter search filter
- * @return search results
- * @exception EBaseException failed to search
- */
- public IDBSearchResults search(String base, String filter)
- throws EBaseException;
-
- /**
- * Searchs for a list of objects that match the
- * filter.
- *
- * @param base starting point of the search
- * @param filter search filter
- * @param maxSize max number of entries
- * @return search results
- * @exception EBaseException failed to search
- */
- public IDBSearchResults search(String base, String filter, int maxSize)
- throws EBaseException;
-
- /**
- * Searchs for a list of objects that match the
- * filter.
- *
- * @param base starting point of the search
- * @param filter search filter
- * @param maxSize max number of entries
- * @param timeLimit timeout limit
- * @return search results
- * @exception EBaseException failed to search
- */
- public IDBSearchResults search(String base, String filter, int maxSize,
- int timeLimit) throws EBaseException;
-
- /**
- * Retrieves a list of object that satifies the given
- * filter.
- *
- * @param base starting point of the search
- * @param filter search filter
- * @param attrs selected attributes
- * @return search results
- * @exception EBaseException failed to search
- */
- public IDBSearchResults search(String base, String filter,
- String attrs[]) throws EBaseException;
-
- /**
- * Retrieves a list of objects.
- *
- * @param base starting point of the search
- * @param filter search filter
- * @param attrs selected attributes
- * @return search results in virtual list
- * @exception EBaseException failed to search
- */
- public <T> IDBVirtualList<T> createVirtualList(String base, String filter,
- String attrs[]) throws EBaseException;
-
- /**
- * Sets persistent search to retrieve modified
- * certificate records.
- *
- * @param base starting point of the search
- * @param filter search filter
- * @param attrs selected attributes
- * @return LDAP search results
- * @exception EBaseException failed to search
- */
- public LDAPSearchResults persistentSearch(String base, String filter,
- String attrs[]) throws EBaseException;
-
- public void abandon(LDAPSearchResults results) throws EBaseException;
-
- /**
- * Retrieves a list of objects.
- *
- * @param base starting point of the search
- * @param filter search filter
- * @param attrs selected attributes
- * @param sortKey key used to sort the list
- * @param pageSize page size in the virtual list
- * @return search results in virtual list
- * @exception EBaseException failed to search
- */
- public <T> IDBVirtualList<T> createVirtualList(String base, String filter,
- String attrs[], String sortKey, int pageSize)
- throws EBaseException;
-
- /**
- * Retrieves a list of objects.
- *
- * @param base starting point of the search
- * @param filter search filter
- * @param attrs selected attributes
- * @param startFrom starting point
- * @param sortKey key used to sort the list
- * @param pageSize page size in the virtual list
- * @return search results in virtual list
- * @exception EBaseException failed to search
- */
- public <T> IDBVirtualList<T> createVirtualList(String base, String filter,
- String attrs[], String startFrom,
- String sortKey, int pageSize)
- throws EBaseException;
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java
deleted file mode 100644
index 04736cf32..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-import java.util.Enumeration;
-
-/**
- * A class represents the search results. A search
- * results object contain a enumeration of
- * Java objects that are just read from the database.
- *
- * @version $Revision$, $Date$
- */
-public interface IDBSearchResults extends Enumeration<Object> {
-
- /**
- * Checks if any element is available.
- *
- * @return true if there is more elements
- */
- public boolean hasMoreElements();
-
- /**
- * Retrieves next element.
- *
- * @return next element
- */
- public Object nextElement();
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java
deleted file mode 100644
index fec6e6afa..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java
+++ /dev/null
@@ -1,212 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-import java.math.BigInteger;
-
-import netscape.ldap.LDAPConnection;
-
-import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.base.ISubsystem;
-
-/**
- * An interface represents certificate server
- * backend database.
- * <P>
- * This interface separate the database subsystem functionalities from internal implementation.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public interface IDBSubsystem extends ISubsystem {
-
- public static final String SUB_ID = "dbs";
-
- // values for repos
- public static final int CERTS = 0;
- public static final int REQUESTS = 1;
- public static final int REPLICA_ID = 2;
- public static final int NUM_REPOS = 3;
-
- /**
- * Retrieves the base DN.
- *
- * @return base DN of the subsystem
- */
- public String getBaseDN();
-
- /**
- * Retrieves the registry.
- *
- * @return registry
- */
- public IDBRegistry getRegistry();
-
- /**
- * Creates a database session.
- *
- * @return database session
- * @exception EDBException failed to create session
- */
- public IDBSSession createSession() throws EDBException;
-
- /**
- * Avoids losing serial number.
- *
- * @return true if serial number recovery option is enabled
- */
- public boolean enableSerialNumberRecovery();
-
- /**
- * Records next serial number in config file
- *
- * @param serial next serial number
- * @exception EBaseException failed to set
- */
- public void setNextSerialConfig(BigInteger serial) throws EBaseException;
-
- /**
- * Gets the next serial number in config file
- *
- * @return next serial number
- */
- public BigInteger getNextSerialConfig();
-
- /**
- * Records maximum serial number limit in config file
- *
- * @param serial max serial number
- * @param repo repo identifier
- * @exception EBaseException failed to set
- */
- public void setMaxSerialConfig(int repo, String serial) throws EBaseException;
-
- /**
- * Records minimum serial number limit in config file
- *
- * @param serial min serial number
- * @param repo repo identifier
- * @exception EBaseException failed to set
- */
- public void setMinSerialConfig(int repo, String serial) throws EBaseException;
-
- /**
- * Records maximum serial number limit for the next range in config file
- *
- * @param serial max serial number
- * @param repo repo identifier
- * @exception EBaseException failed to set
- */
- public void setNextMaxSerialConfig(int repo, String serial) throws EBaseException;
-
- /**
- * Records minimum serial number limit for the next range in config file
- *
- * @param serial min serial number
- * @param repo repo identifier
- * @exception EBaseException failed to set
- */
- public void setNextMinSerialConfig(int repo, String serial) throws EBaseException;
-
- /**
- * Gets minimum serial number limit in config file
- *
- * @param repo repo identifier
- * @return min serial number
- */
- public String getMinSerialConfig(int repo);
-
- /**
- * Gets the maximum serial number limit in config file
- *
- * @param repo repo identifier
- * @return max serial number
- */
- public String getMaxSerialConfig(int repo);
-
- /**
- * Gets the maximum serial number limit for next range in config file
- *
- * @param repo repo identifier
- * @return max serial number
- */
- public String getNextMaxSerialConfig(int repo);
-
- /**
- * Gets minimum serial number limit for next range in config file
- *
- * @param repo repo identifier
- * @return min serial number
- */
- public String getNextMinSerialConfig(int repo);
-
- /**
- * Gets low water mark limit in config file
- *
- * @param repo repo identifier
- * @return low water mark
- */
- public String getLowWaterMarkConfig(int repo);
-
- /**
- * Gets range increment limit for next range in config file
- *
- * @param repo repo identifier
- * @return range increment
- */
- public String getIncrementConfig(int repo);
-
- /**
- * Gets number corresponding to start of next range from database
- *
- * @param repo repo identifier
- * @return start of next range
- */
- public String getNextRange(int repo);
-
- /**
- * Determines if a range conflict has been observed in database
- *
- * @param repo repo identifier
- * @return true if range conflict, false otherwise
- */
- public boolean hasRangeConflict(int repo);
-
- /**
- * Determines if serial number management has been enabled
- *
- * @return true if enabled, false otherwise
- */
- public boolean getEnableSerialMgmt();
-
- /**
- * Sets whether serial number management is enabled for certs
- * and requests.
- *
- * @param value true/false
- * @exception EBaseException failed to set
- */
- public void setEnableSerialMgmt(boolean value) throws EBaseException;
-
- /**
- * Returns LDAP connection to connection pool.
- *
- * @param conn connection to be returned
- */
- public void returnConn(LDAPConnection conn);
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java
deleted file mode 100644
index 919a82efb..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java
+++ /dev/null
@@ -1,144 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-import com.netscape.certsrv.base.EBaseException;
-
-/**
- * A interface represents a virtual list of search results.
- * Note that this class must be used with DS4.0.
- *
- * @version $Revision$, $Date$
- */
-public interface IDBVirtualList<E> {
-
- /**
- * Sets the paging size of this virtual list.
- * The page size here is just a buffer size. A buffer is kept around
- * that is three times as large as the number of visible entries.
- * That way, you can scroll up/down several items(up to a page-full)
- * without refetching entries from the directory.
- *
- * @param size the page size
- */
- public void setPageSize(int size);
-
- /**
- * Sets the sort key
- *
- * @param sortKey the attribute to sort by
- * @exception EBaseException failed to set
- */
- public void setSortKey(String sortKey) throws EBaseException;
-
- /**
- * Sets the sort key
- *
- * @param sortKeys the attributes to sort by
- * @exception EBaseException failed to set
- */
- public void setSortKey(String[] sortKeys) throws EBaseException;
-
- /**
- * Retrieves the size of this virtual list.
- * Recommend to call getSize() before getElementAt() or getElements()
- * since you'd better check if the index is out of bound first.
- *
- * @return current size in list
- */
- public int getSize();
-
- /**
- * Returns current index.
- *
- * @return current index
- */
-
- public int getSizeBeforeJumpTo();
-
- public int getSizeAfterJumpTo();
-
- public int getCurrentIndex();
-
- /**
- * Get a page starting at "first" (although we may also fetch
- * some preceding entries)
- * Recommend to call getSize() before getElementAt() or getElements()
- * since you'd better check if the index is out of bound first.
- *
- * @param first the index of the first entry of the page you want to fetch
- */
- public boolean getPage(int first);
-
- /**
- * Called by application to scroll the list with initial letters.
- * Consider text to be an initial substring of the attribute of the
- * primary sorting key(the first one specified in the sort key array)
- * of an entry.
- * If no entries match, the one just before(or after, if none before)
- * will be returned as mSelectedIndex
- *
- * @param text the prefix of the first entry of the page you want to fetch
- */
- public boolean getPage(String text);
-
- /**
- * Fetchs data of a single list item
- * Recommend to call getSize() before getElementAt() or getElements()
- * since you'd better check if the index is out of bound first.
- * If the index is out of range of the virtual list, an exception
- * will be thrown and return null
- *
- * @param index the index of the element to fetch
- */
- public E getElementAt(int index);
-
- /**
- * Retrieves and jumps to element in the given position.
- *
- * @param i position
- * @return object
- */
- public E getJumpToElementAt(int i);
-
- /**
- * Processes elements as soon as it arrives. It is
- * more memory-efficient.
- *
- * @param startidx starting index
- * @param endidx ending index
- * @param ep object to call
- * @exception EBaseException failed to process elements
- */
- public void processElements(int startidx, int endidx, IElementProcessor ep)
- throws EBaseException;
-
- /**
- * Gets the virutal selected index
- *
- * @return selected index
- */
- public int getSelectedIndex();
-
- /**
- * Gets the top of the buffer
- *
- * @return first index
- */
- public int getFirstIndex();
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java b/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java
deleted file mode 100644
index 648a13aef..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-import com.netscape.certsrv.base.EBaseException;
-
-/**
- * Processor handles object read from the session.
- *
- * @version $Revision$, $Date$
- */
-public interface IElementProcessor {
-
- /**
- * Handles object
- *
- * @param o object to be processed
- * @exception EBaseException failed to process object
- */
- public void process(Object o) throws EBaseException;
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java b/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java
deleted file mode 100644
index 2c0ccb89f..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-/**
- * An interface represents a filter converter
- * that understands how to convert a attribute
- * type from one defintion to another.
- * For example,
- *
- * <PRE>
- * (1) database layer need to convert
- * registered attribute type to ldap attribute
- * type.
- * (2) high level subsystem need to convert
- * locale specific attribute type to registered
- * attribute type.
- * </PRE>
- *
- * @version $Revision$, $Date$
- */
-public interface IFilterConverter {
-
- /**
- * Converts attribute into LDAP attribute.
- *
- * @param attr attribute name
- * @param op attribute operation
- * @param value attribute value
- * @return The LDAP attribute
- */
- public String convert(String attr, String op, String value);
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java b/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java
deleted file mode 100644
index 6c61bdb1f..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java
+++ /dev/null
@@ -1,87 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-/**
- * A class represents a modification. This is used by the
- * database (dbs) framework for modification operations.
- * It specifices the modification type and values.
- *
- * @version $Revision$, $Date$
- */
-public class Modification {
-
- /**
- * Add new value.
- */
- public static final int MOD_ADD = 0;
-
- /**
- * Deletes old value.
- */
- public static final int MOD_DELETE = 1;
-
- /**
- * Replace old value.
- */
- public static final int MOD_REPLACE = 2;
-
- private String mName = null;
- private int mOp;
- private Object mValue = null;
-
- /**
- * Constructs a role modification.
- *
- * @param name attribute name
- * @param op attribute operation (i.e. MOD_ADD, MOD_DELETE, or MOD_REPLACE)
- * @param value attribute value
- */
- public Modification(String name, int op, Object value) {
- mName = name;
- mOp = op;
- mValue = value;
- }
-
- /**
- * Retrieves attribute name.
- *
- * @return attribute name
- */
- public String getName() {
- return mName;
- }
-
- /**
- * Retrieves modification operation type.
- *
- * @return modification type
- */
- public int getOp() {
- return mOp;
- }
-
- /**
- * Retrieves attribute value.
- *
- * @return attribute value
- */
- public Object getValue() {
- return mValue;
- }
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java b/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java
deleted file mode 100644
index 70e9b377d..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
- * A class represents a modification set. A modification
- * set contains zero or more modifications.
- *
- * @version $Revision$, $Date$
- */
-public class ModificationSet {
-
- /**
- * A list of modifications
- */
- private Vector<Modification> mods = new Vector<Modification>();
-
- /**
- * Constructs modification set.
- */
- public ModificationSet() {
- }
-
- /**
- * Adds modification to this set.
- *
- * @param name attribute name
- * @param op modification operation
- * @param value attribute value
- */
- public void add(String name, int op, Object value) {
- mods.addElement(new Modification(name, op, value));
- }
-
- /**
- * Retrieves a list of modifications.
- *
- * @return a list of Modifications
- */
- public Enumeration<Modification> getModifications() {
- return mods.elements();
- }
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java
deleted file mode 100644
index d05c9ed5f..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java
+++ /dev/null
@@ -1,176 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.certdb;
-
-import java.math.BigInteger;
-import java.util.Date;
-
-import netscape.security.x509.X509CertImpl;
-
-import com.netscape.certsrv.base.MetaInfo;
-import com.netscape.certsrv.dbs.IDBObj;
-
-/**
- * An interface contains constants for certificate record.
- *
- * @version $Revision$, $Date$
- */
-public interface ICertRecord extends IDBObj {
-
- public final static String ATTR_ID = "certRecordId";
- public final static String ATTR_META_INFO = "certMetaInfo";
- public final static String ATTR_REVO_INFO = "certRevoInfo";
- public final static String ATTR_CERT_STATUS = "certStatus";
- public final static String ATTR_CREATE_TIME = "certCreateTime";
- public final static String ATTR_MODIFY_TIME = "certModifyTime";
- public final static String ATTR_AUTO_RENEW = "certAutoRenew";
- public final static String ATTR_ISSUED_BY = "certIssuedBy";
- public final static String ATTR_REVOKED_BY = "certRevokedBy";
- public final static String ATTR_REVOKED_ON = "certRevokedOn";
- public final static String ATTR_X509CERT = "x509cert";
-
- public static final String META_LDAPPUBLISH = "inLdapPublishDir";
- public static final String META_REQUEST_ID = "requestId";
- public static final String META_RENEWED_CERT = "renewedCertSerialNo";
- public static final String META_OLD_CERT = "oldCertSerialNo";
- public static final String META_CERT_TYPE = "certType";
- public static final String META_CRMF_REQID = "crmfReqId";
- public static final String META_CHALLENGE_PHRASE = "challengePhrase";
- public static final String META_PROFILE_ID = "profileId";
-
- public final static String STATUS_VALID = "VALID";
- public final static String STATUS_INVALID = "INVALID";
- public final static String STATUS_REVOKED = "REVOKED";
- public final static String STATUS_EXPIRED = "EXPIRED";
- public final static String STATUS_REVOKED_EXPIRED = "REVOKED_EXPIRED";
-
- public final static String AUTO_RENEWAL_DISABLED = "DISABLED";
- public final static String AUTO_RENEWAL_ENABLED = "ENABLED";
- public final static String AUTO_RENEWAL_DONE = "DONE";
- public final static String AUTO_RENEWAL_NOTIFIED = "NOTIFIED";
-
- public final static String X509CERT_NOT_BEFORE = "notBefore";
- public final static String X509CERT_NOT_AFTER = "notAfter";
- public final static String X509CERT_DURATION = "duration";
- public final static String X509CERT_EXTENSION = "extension";
- public final static String X509CERT_SUBJECT = "subject";
- public final static String X509CERT_PUBLIC_KEY_DATA = "publicKeyData";
- public final static String X509CERT_VERSION = "version";
- public final static String X509CERT_ALGORITHM = "algorithm";
- public final static String X509CERT_SIGNING_ALGORITHM = "signingAlgorithm";
- public final static String X509CERT_SERIAL_NUMBER = "serialNumber";
-
- /* attribute type used the following with search filter */
- public final static String ATTR_X509CERT_NOT_BEFORE =
- ATTR_X509CERT + "." + X509CERT_NOT_BEFORE;
- public final static String ATTR_X509CERT_NOT_AFTER =
- ATTR_X509CERT + "." + X509CERT_NOT_AFTER;
- public final static String ATTR_X509CERT_DURATION =
- ATTR_X509CERT + "." + X509CERT_DURATION;
- public final static String ATTR_X509CERT_EXTENSION =
- ATTR_X509CERT + "." + X509CERT_EXTENSION;
- public final static String ATTR_X509CERT_SUBJECT =
- ATTR_X509CERT + "." + X509CERT_SUBJECT;
- public final static String ATTR_X509CERT_VERSION =
- ATTR_X509CERT + "." + X509CERT_VERSION;
- public final static String ATTR_X509CERT_ALGORITHM =
- ATTR_X509CERT + "." + X509CERT_ALGORITHM;
- public final static String ATTR_X509CERT_SIGNING_ALGORITHM =
- ATTR_X509CERT + "." + X509CERT_SIGNING_ALGORITHM;
- public final static String ATTR_X509CERT_SERIAL_NUMBER =
- ATTR_X509CERT + "." + X509CERT_SERIAL_NUMBER;
- public final static String ATTR_X509CERT_PUBLIC_KEY_DATA =
- ATTR_X509CERT + "." + X509CERT_PUBLIC_KEY_DATA;
-
- /**
- * Retrieves serial number from stored certificate.
- *
- * @return certificate serial number
- */
- public BigInteger getCertificateSerialNumber();
-
- /**
- * Retrieves serial number from certificate record.
- *
- * @return certificate serial number
- */
- public BigInteger getSerialNumber();
-
- /**
- * Retrieves certificate from certificate record.
- *
- * @return certificate
- */
- public X509CertImpl getCertificate();
-
- /**
- * Retrieves name of who issued this certificate.
- *
- * @return name of who issued this certificate
- */
- public String getIssuedBy();
-
- /**
- * Retrieves name of who revoked this certificate.
- *
- * @return name of who revoked this certificate
- */
- public String getRevokedBy();
-
- /**
- * Retrieves date when this certificate was revoked.
- *
- * @return date when this certificate was revoked
- */
- public Date getRevokedOn();
-
- /**
- * Retrieves meta info.
- *
- * @return meta info
- */
- public MetaInfo getMetaInfo();
-
- /**
- * Retrieves certificate status.
- *
- * @return certificate status
- */
- public String getStatus();
-
- /**
- * Retrieves time of creation of this certificate record.
- *
- * @return time of creation of this certificate record
- */
- public Date getCreateTime();
-
- /**
- * Retrieves time of modification of this certificate record.
- *
- * @return time of modification of this certificate record
- */
- public Date getModifyTime();
-
- /**
- * Retrieves revocation info.
- *
- * @return revocation info
- */
- public IRevocationInfo getRevocationInfo();
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java
deleted file mode 100644
index 59a826ee2..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java
+++ /dev/null
@@ -1,94 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.certdb;
-
-import java.util.Enumeration;
-
-import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.dbs.IElementProcessor;
-
-/**
- * A class represents a list of certificate records.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public interface ICertRecordList {
-
- /**
- * Gets the current index.
- *
- * @return current index
- */
- public int getCurrentIndex();
-
- /**
- * Retrieves the size of request list.
- *
- * @return size
- */
- public int getSize();
-
- /**
- * Gets size before jump to index.
- *
- * @return size
- */
- public int getSizeBeforeJumpTo();
-
- /**
- * Gets size after jump to index.
- *
- * @return size
- */
- public int getSizeAfterJumpTo();
-
- /**
- * Process certificate record as soon as it is returned.
- *
- * @param startidx starting index
- * @param endidx ending index
- * @param ep element processor
- * @exception EBaseException failed to process cert records
- */
- public void processCertRecords(int startidx, int endidx,
- IElementProcessor ep) throws EBaseException;
-
- /**
- * Retrieves requests.
- * It's no good to call this if you didnt check
- * if the startidx, endidx are valid.
- *
- * @param startidx starting index
- * @param endidx ending index
- * @exception EBaseException failed to retrieve
- */
- public Enumeration<ICertRecord> getCertRecords(int startidx, int endidx)
- throws EBaseException;
-
- /**
- * Gets one single record at a time similar to
- * processCertRecords but no extra class needed.
- *
- * @param index position of the record to be retrieved
- * @return object
- * @exception EBaseException failed to retrieve
- */
- public ICertRecord getCertRecord(int index)
- throws EBaseException;
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java
deleted file mode 100644
index a8505c2a2..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java
+++ /dev/null
@@ -1,528 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.certdb;
-
-import java.math.BigInteger;
-import java.security.cert.Certificate;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import netscape.ldap.LDAPEntry;
-import netscape.security.x509.X509CertImpl;
-
-import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.base.MetaInfo;
-import com.netscape.certsrv.dbs.IElementProcessor;
-import com.netscape.certsrv.dbs.ModificationSet;
-import com.netscape.certsrv.dbs.repository.IRepository;
-import com.netscape.cmscore.dbs.CertificateRepository.RenewableCertificateCollection;
-
-/**
- * An interface represents a CMS certificate repository.
- * It stores all the issued certificate.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public interface ICertificateRepository extends IRepository {
-
- /**
- * Adds a certificate record to the repository. Each certificate
- * record contains four parts: certificate, meta-attributes,
- * issue information and reovcation information.
- * <P>
- *
- * @param record X.509 certificate
- * @exception EBaseException failed to add new certificate to
- * the repository
- */
- public void addCertificateRecord(ICertRecord record)
- throws EBaseException;
-
- /**
- * Reads the certificate identified by the given serial no.
- *
- * @param serialNo serial number of certificate
- * @return certificate
- * @exception EBaseException failed to retrieve certificate
- */
- public X509CertImpl getX509Certificate(BigInteger serialNo)
- throws EBaseException;
-
- /**
- * Reads certificate from repository.
- *
- * @param serialNo serial number of certificate
- * @return certificate record
- * @exception EBaseException failed to retrieve certificate
- */
- public ICertRecord readCertificateRecord(BigInteger serialNo)
- throws EBaseException;
-
- /**
- * Sets certificate status update internal
- *
- * @param requestRepo request repository
- * @param interval update interval
- * @param listenToCloneModifications enable listening to clone modifications
- */
- public void setCertStatusUpdateInterval(IRepository requestRepo,
- int interval,
- boolean listenToCloneModifications);
-
- /**
- * Updates certificate status now. This is a blocking method.
- *
- * @exception EBaseException failed to update
- */
- public void updateCertStatus() throws EBaseException;
-
- /**
- * Modifies certificate record.
- *
- * @param serialNo serial number of record
- * @param mods modifications
- * @exception EBaseException failed to modify
- */
- public void modifyCertificateRecord(BigInteger serialNo,
- ModificationSet mods) throws EBaseException;
-
- /**
- * Checks if the certificate exists in this repository.
- *
- * @param serialNo serial number of certificate
- * @return true if it exists
- * @exception EBaseException failed to check
- */
- public boolean containsCertificate(BigInteger serialNo)
- throws EBaseException;
-
- /**
- * Deletes certificate from this repository.
- *
- * @param serialNo serial number of certificate
- * @exception EBaseException failed to delete
- */
- public void deleteCertificateRecord(BigInteger serialNo)
- throws EBaseException;
-
- /**
- * Marks certificate as revoked.
- *
- * @param id serial number
- * @param info revocation information
- * @exception EBaseException failed to mark
- */
- public void markAsRevoked(BigInteger id, IRevocationInfo info)
- throws EBaseException;
-
- /**
- * Updates certificate status.
- *
- * @param id serial number
- * @param status certificate status
- * @exception EBaseException failed to update status
- */
- public void updateStatus(BigInteger id, String status)
- throws EBaseException;
-
- /**
- * Marks certificate as renewable.
- *
- * @param record certificate record to modify
- * @exception EBaseException failed to update
- */
- public void markCertificateAsRenewable(ICertRecord record)
- throws EBaseException;
-
- /**
- * Marks certificate as not renewable.
- *
- * @param record certificate record to modify
- * @exception EBaseException failed to update
- */
- public void markCertificateAsNotRenewable(ICertRecord record)
- throws EBaseException;
-
- /**
- * Marks certificate as renewed.
- *
- * @param serialNo certificate record to modify
- * @exception EBaseException failed to update
- */
- public void markCertificateAsRenewed(String serialNo)
- throws EBaseException;
-
- /**
- * Marks certificate as renewed and notified.
- *
- * @param serialNo certificate record to modify
- * @exception EBaseException failed to update
- */
- public void markCertificateAsRenewalNotified(String serialNo)
- throws EBaseException;
-
- /**
- * Finds a list of certificate records that satisifies
- * the filter.
- * Here is a list of filter
- * attribute can be used:
- *
- * <pre>
- * certRecordId
- * certMetaInfo
- * certStatus
- * certCreateTime
- * certModifyTime
- * x509Cert.notBefore
- * x509Cert.notAfter
- * x509Cert.subject
- * </pre>
- *
- * The filter should follow RFC1558 LDAP filter syntax.
- * For example,
- *
- * <pre>
- * (&(certRecordId=5)(x509Cert.notBefore=934398398))
- * </pre>
- *
- * @param filter search filter
- * @param maxSize max size to return
- * @return a list of certificates
- * @exception EBaseException failed to search
- */
- public Enumeration<Object> searchCertificates(String filter, int maxSize)
- throws EBaseException;
-
- /**
- * Finds a list of certificate records that satisifies
- * the filter.
- *
- * @param filter search filter
- * @param maxSize max size to return
- * @param timeLimit timeout value
- * @return a list of certificates
- * @exception EBaseException failed to search
- */
- public Enumeration<ICertRecord> searchCertificates(String filter, int maxSize,
- int timeLimit) throws EBaseException;
-
- /**
- * Finds a list of certificate records that satisifies
- * the filter.
- *
- * @param filter search filter
- * @param attrs selected attribute
- * @param pageSize page size
- * @return a list of certificates
- * @exception EBaseException failed to search
- */
- public ICertRecordList findCertRecordsInList(String filter,
- String attrs[], int pageSize) throws EBaseException;
-
- /**
- * Finds a list of certificate records that satisifies
- * the filter.
- *
- * @param filter search filter
- * @param attrs selected attribute
- * @param sortKey key to use for sorting the returned elements
- * @param pageSize page size
- * @return a list of certificates
- * @exception EBaseException failed to search
- */
- public ICertRecordList findCertRecordsInList(String filter,
- String attrs[], String sortKey, int pageSize)
- throws EBaseException;
-
- /**
- * Finds a list of certificate records that satisifies
- * the filter.
- *
- * @param filter search filter
- * @param attrs selected attribute
- * @param jumpTo jump to index
- * @param sortKey key to use for sorting the returned elements
- * @param pageSize page size
- * @return a list of certificates
- * @exception EBaseException failed to search
- */
- public ICertRecordList findCertRecordsInList(String filter,
- String attrs[], String jumpTo, String sortKey, int pageSize)
- throws EBaseException;
-
- public ICertRecordList findCertRecordsInList(String filter,
- String attrs[], String jumpTo, boolean hardJumpTo, String sortKey, int pageSize)
- throws EBaseException;
-
- /**
- * Finds a list of certificate records that satisifies
- * the filter.
- *
- * @param filter search filter
- * @param attrs selected attribute
- * @param jumpTo jump to index
- * @param sortKey key to use for sorting the returned elements
- * @param pageSize page size
- * @return a list of certificates
- * @exception EBaseException failed to search
- */
- public ICertRecordList findCertRecordsInListRawJumpto(String filter,
- String attrs[], String jumpTo, String sortKey, int pageSize)
- throws EBaseException;
-
- public static final int ALL_CERTS = 0;
- public static final int ALL_VALID_CERTS = 1;
- public static final int ALL_UNREVOKED_CERTS = 2;
-
- /**
- * Gets all valid and unexpired certificates pertaining
- * to a subject DN.
- *
- * @param subjectDN The distinguished name of the subject.
- * @param validityType The type of certificatese to retrieve.
- * @return An array of certificates.
- * @throws EBaseException on error.
- */
- public X509CertImpl[] getX509Certificates(String subjectDN,
- int validityType) throws EBaseException;
-
- /**
- * Retrieves all the revoked certificates that have not expired.
- *
- * @param asOfDate as of date
- * @return a list of revoked certificates
- * @exception EBaseException failed to retrieve
- */
- public Enumeration<ICertRecord> getRevokedCertificates(Date asOfDate)
- throws EBaseException;
-
- /**
- * Retrieves all revoked certificates including ones that have expired
- * or that are not yet valid.
- *
- * @return a list of revoked certificates
- * @exception EBaseException failed to search
- */
- public Enumeration<ICertRecord> getAllRevokedCertificates()
- throws EBaseException;
-
- /**
- * Retrieves all revoked but not expired certificates.
- *
- * @return a list of revoked certificates
- * @exception EBaseException failed to search
- */
- public Enumeration<ICertRecord> getAllRevokedNonExpiredCertificates()
- throws EBaseException;
-
- /**
- * Finds all certificates given a filter.
- *
- * @param filter search filter
- * @return a list of certificates
- * @exception EBaseException failed to search
- */
- public Enumeration<X509CertImpl> findCertificates(String filter)
- throws EBaseException;
-
- /**
- * Finds all certificate records given a filter.
- *
- * @param filter search filter
- * @return a list of certificates
- * @exception EBaseException failed to search
- */
- public Enumeration<ICertRecord> findCertRecords(String filter)
- throws EBaseException;
-
- /**
- * Gets Revoked certs orderes by noAfter date, jumps to records
- * where notAfter date is greater than current.
- *
- * @param date reference date
- * @param pageSize page size
- * @return a list of certificate records
- * @exception EBaseException failed to retrieve
- */
- public ICertRecordList getRevokedCertsByNotAfterDate(Date date,
- int pageSize) throws EBaseException;
-
- /**
- * Gets Invalid certs orderes by noAfter date, jumps to records
- * where notAfter date is greater than current.
- *
- * @param date reference date
- * @param pageSize page size
- * @return a list of certificate records
- * @exception EBaseException failed to retrieve
- */
- public ICertRecordList getInvalidCertsByNotBeforeDate(Date date,
- int pageSize) throws EBaseException;
-
- /**
- * Gets valid certs orderes by noAfter date, jumps to records
- * where notAfter date is greater than current.
- *
- * @param date reference date
- * @param pageSize page size
- * @return a list of certificate records
- * @exception EBaseException failed to retrieve
- */
- public ICertRecordList getValidCertsByNotAfterDate(Date date,
- int pageSize) throws EBaseException;
-
- /**
- * Creates certificate record.
- *
- * @param id serial number
- * @param cert certificate
- * @param meta meta information
- * @return certificate record
- */
- public ICertRecord createCertRecord(BigInteger id,
- Certificate cert, MetaInfo meta);
-
- /**
- * Finds certificate records.
- *
- * @param filter search filter
- * @return a list of certificate records
- * @exception EBaseException failed to retrieve cert records
- */
- public Enumeration<Object> findCertRecs(String filter)
- throws EBaseException;
-
- /**
- * Retrieves renewable certificates.
- *
- * @param renewalTime renewal time
- * @return certificates
- * @exception EBaseException failed to retrieve
- */
- public Hashtable<String, RenewableCertificateCollection> getRenewableCertificates(String renewalTime)
- throws EBaseException;
-
- /**
- * Unmark a revoked certificates.
- *
- * @param id serial number
- * @param info revocation information
- * @param revokedOn revocation date
- * @param revokedBy userid
- * @exception EBaseException failed to unmark
- */
- public void unmarkRevoked(BigInteger id, IRevocationInfo info,
- Date revokedOn, String revokedBy)
- throws EBaseException;
-
- /**
- * Retrieves valid and not published certificates.
- *
- * @param from starting serial number
- * @param to ending serial number
- * @return a list of certificates
- * @exception EBaseException failed to retrieve
- */
- public Enumeration<ICertRecord> getValidNotPublishedCertificates(String from, String to)
- throws EBaseException;
-
- /**
- * Retrieves expired and published certificates.
- *
- * @param from starting serial number
- * @param to ending serial number
- * @return a list of certificates
- * @exception EBaseException failed to retrieve
- */
- public Enumeration<ICertRecord> getExpiredPublishedCertificates(String from, String to)
- throws EBaseException;
-
- /**
- * Retrieves revoked and published certificates.
- *
- * @param from starting serial number
- * @param to ending serial number
- * @return a list of certificates
- * @exception EBaseException failed to retrieve
- */
- public Enumeration<ICertRecord> getRevokedPublishedCertificates(String from, String to)
- throws EBaseException;
-
- /**
- * Retrieves valid certificates.
- *
- * @param from starting serial number
- * @param to ending serial number
- * @return a list of certificates
- * @exception EBaseException failed to retrieve
- */
- public Enumeration<ICertRecord> getValidCertificates(String from, String to)
- throws EBaseException;
-
- /**
- * Retrieves expired certificates.
- *
- * @param from starting serial number
- * @param to ending serial number
- * @return a list of certificates
- * @exception EBaseException failed to retrieve
- */
- public Enumeration<ICertRecord> getExpiredCertificates(String from, String to)
- throws EBaseException;
-
- /**
- * Retrieves revoked certificates.
- *
- * @param from starting serial number
- * @param to ending serial number
- * @return a list of certificates
- * @exception EBaseException failed to retrieve
- */
- public Enumeration<ICertRecord> getRevokedCertificates(String from, String to)
- throws EBaseException;
-
- /**
- * Retrieves modified certificate records.
- *
- * @param entry LDAPEntry with modified data
- */
- public void getModifications(LDAPEntry entry);
-
- /**
- * Removes certificate records with this repository.
- *
- * @param beginS BigInteger with radix 16
- * @param endS BigInteger with radix 16
- */
- public void removeCertRecords(BigInteger beginS, BigInteger endS) throws EBaseException;
-
- /**
- * Builds a list of revoked certificates to put them into CRL.
- * Calls certificate record processor to get necessary data
- * from certificate records.
- * This also regenerates CRL cache.
- *
- * @param cp certificate record processor
- * @exception EBaseException if an error occurred in the database.
- */
- public void processRevokedCerts(IElementProcessor cp, String filter, int pageSize) throws EBaseException;
-
- public void shutdown();
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java
deleted file mode 100644
index fb773576c..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.certdb;
-
-import java.util.Date;
-
-import netscape.security.x509.CRLExtensions;
-
-/**
- * A class represents a certificate revocation info. This
- * object is written as an attribute of certificate record
- * which essentially signifies a revocation act.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public interface IRevocationInfo {
-
- /**
- * Retrieves revocation date.
- *
- * @return revocation date
- */
- public Date getRevocationDate();
-
- /**
- * Retrieves CRL entry extensions.
- *
- * @return CRL entry extensions
- */
- public CRLExtensions getCRLEntryExtensions();
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java
deleted file mode 100644
index b990bbf57..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java
+++ /dev/null
@@ -1,161 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.crldb;
-
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.Hashtable;
-
-import netscape.security.x509.RevokedCertificate;
-
-import com.netscape.certsrv.dbs.IDBObj;
-
-/**
- * An interface that defines abilities of
- * a CRL issuing point record.
- *
- * @version $Revision$, $Date$
- */
-public interface ICRLIssuingPointRecord extends IDBObj {
-
- public static final String ATTR_ID = "id";
- public static final String ATTR_CRL_NUMBER = "crlNumber";
- public static final String ATTR_DELTA_NUMBER = "deltaNumber";
- public static final String ATTR_CRL_SIZE = "crlSize";
- public static final String ATTR_DELTA_SIZE = "deltaSize";
- public static final String ATTR_THIS_UPDATE = "thisUpdate";
- public static final String ATTR_NEXT_UPDATE = "nextUpdate";
- public static final String ATTR_FIRST_UNSAVED = "firstUnsaved";
- public static final String ATTR_CRL = "certificaterevocationlist";
- public static final String ATTR_CRL_CACHE = "crlCache";
- public static final String ATTR_CA_CERT = "cACertificate";
- public static final String ATTR_REVOKED_CERTS = "revokedCerts";
- public static final String ATTR_UNREVOKED_CERTS = "unrevokedCerts";
- public static final String ATTR_EXPIRED_CERTS = "expiredCerts";
- public static final String ATTR_DELTA_CRL = "deltaRevocationList";
-
- public static final String CLEAN_CACHE = "-1";
- public static final String NEW_CACHE = "-2";
-
- /**
- * Retrieve unique CRL identifier.
- *
- * @return unique CRL identifier
- */
- public String getId();
-
- /**
- * Retrieves current CRL number out of CRL issuing point record.
- *
- * @return current CRL number
- */
- public BigInteger getCRLNumber();
-
- /**
- * Retrieves CRL size measured by the number of entries.
- *
- * @return CRL size
- */
- public Long getCRLSize();
-
- /**
- * Retrieves this update time.
- *
- * @return time of this update
- */
- public Date getThisUpdate();
-
- /**
- * Retrieves next update time.
- *
- * @return time of next update
- */
- public Date getNextUpdate();
-
- /**
- * Retrieves current delta CRL number out of CRL issuing point record.
- *
- * @return current delta CRL number
- */
- public BigInteger getDeltaCRLNumber();
-
- /**
- * Retrieves delta CRL size measured by the number of entries.
- *
- * @return delta CRL size
- */
- public Long getDeltaCRLSize();
-
- /**
- * Retrieve Retrieve reference to the first unsaved data.
- *
- * @return reference to the first unsaved data
- */
- public String getFirstUnsaved();
-
- /**
- * Retrieves encoded CRL.
- *
- * @return encoded CRL
- */
- public byte[] getCRL();
-
- /**
- * Retrieves encoded delta CRL.
- *
- * @return encoded delta CRL
- */
- public byte[] getDeltaCRL();
-
- /**
- * Retrieves encoded CA certificate.
- *
- * @return encoded CA certificate
- */
- public byte[] getCACert();
-
- /**
- * Retrieves cache information about CRL.
- *
- * @return list of recently revoked certificates
- */
- public Hashtable<BigInteger, RevokedCertificate> getCRLCacheNoClone();
-
- public Hashtable<BigInteger, RevokedCertificate> getCRLCache();
-
- /**
- * Retrieves cache information about revoked certificates.
- *
- * @return list of recently revoked certificates
- */
- public Hashtable<BigInteger, RevokedCertificate> getRevokedCerts();
-
- /**
- * Retrieves cache information about certificates released from hold.
- *
- * @return list of certificates recently released from hold
- */
- public Hashtable<BigInteger, RevokedCertificate> getUnrevokedCerts();
-
- /**
- * Retrieves cache information about expired certificates.
- *
- * @return list of recently expired certificates
- */
- public Hashtable<BigInteger, RevokedCertificate> getExpiredCerts();
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java
deleted file mode 100644
index 806a2cb19..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java
+++ /dev/null
@@ -1,181 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.crldb;
-
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import netscape.security.x509.RevokedCertificate;
-
-import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.dbs.ModificationSet;
-
-/**
- * An interface represents a CMS CRL repository. It stores
- * all the CRL issuing points.
- *
- * @version $Revision$, $Date$
- */
-public interface ICRLRepository {
-
- /**
- * Adds CRL issuing point record.
- *
- * @param rec issuing point record
- * @exception EBaseException failed to add new issuing point record
- */
- public void addCRLIssuingPointRecord(ICRLIssuingPointRecord rec)
- throws EBaseException;
-
- /**
- * Retrieves all the issuing points' names.
- *
- * @return A list of issuing points' names.
- * @exception EBaseException failed to retrieve all the issuing points' names.
- */
- public Vector<String> getIssuingPointsNames() throws EBaseException;
-
- /**
- * Reads issuing point record.
- *
- * @return issuing point record
- * @exception EBaseException failed to read issuing point record
- */
- public ICRLIssuingPointRecord readCRLIssuingPointRecord(String id)
- throws EBaseException;
-
- /**
- * Deletes issuing point record.
- *
- * @param id issuing point record id
- * @exception EBaseException failed to delete issuing point record
- */
- public void deleteCRLIssuingPointRecord(String id)
- throws EBaseException;
-
- /**
- * Modifies issuing point record.
- *
- * @param id issuing point record id
- * @param mods set of modifications
- * @exception EBaseException failed to modify issuing point record
- */
- public void modifyCRLIssuingPointRecord(String id, ModificationSet mods)
- throws EBaseException;
-
- /**
- * Updates CRL issuing point record.
- *
- * @param id issuing point record id
- * @param newCRL encoded binary CRL
- * @param thisUpdate time of this update
- * @param nextUpdate time of next update
- * @param crlNumber CRL number
- * @param crlSize CRL size
- * @exception EBaseException failed to update issuing point record
- */
- public void updateCRLIssuingPointRecord(String id, byte[] newCRL,
- Date thisUpdate, Date nextUpdate, BigInteger crlNumber, Long crlSize)
- throws EBaseException;
-
- /**
- * Updates CRL issuing point record.
- *
- * @param id issuing point record id
- * @param newCRL encoded binary CRL
- * @param thisUpdate time of this update
- * @param nextUpdate time of next update
- * @param crlNumber CRL number
- * @param crlSize CRL size
- * @param revokedCerts list of revoked certificates
- * @param unrevokedCerts list of released from hold certificates
- * @param expiredCerts list of expired certificates
- * @exception EBaseException failed to update issuing point record
- */
- public void updateCRLIssuingPointRecord(String id, byte[] newCRL,
- Date thisUpdate, Date nextUpdate, BigInteger crlNumber, Long crlSize,
- Hashtable<BigInteger, RevokedCertificate> revokedCerts,
- Hashtable<BigInteger, RevokedCertificate> unrevokedCerts,
- Hashtable<BigInteger, RevokedCertificate> expiredCerts)
- throws EBaseException;
-
- /**
- * Updates CRL issuing point record.
- *
- * @param id issuing point record id
- * @param revokedCerts list of revoked certificates
- * @param unrevokedCerts list of released from hold certificates
- * @exception EBaseException failed to update issuing point record
- */
- public void updateRevokedCerts(String id, Hashtable<BigInteger, RevokedCertificate> revokedCerts, Hashtable<BigInteger, RevokedCertificate> unrevokedCerts)
- throws EBaseException;
-
- /**
- * Updates CRL issuing point record.
- *
- * @param id issuing point record id
- * @param expiredCerts list of expired certificates
- * @exception EBaseException failed to update issuing point record
- */
- public void updateExpiredCerts(String id, Hashtable<BigInteger, RevokedCertificate> expiredCerts)
- throws EBaseException;
-
- /**
- * Updates CRL issuing point record.
- *
- * @param id issuing point record id
- * @param crlSize CRL size
- * @param revokedCerts list of revoked certificates
- * @param unrevokedCerts list of released from hold certificates
- * @param expiredCerts list of expired certificates
- * @exception EBaseException failed to update issuing point record
- */
- public void updateCRLCache(String id, Long crlSize,
- Hashtable<BigInteger, RevokedCertificate> revokedCerts,
- Hashtable<BigInteger, RevokedCertificate> unrevokedCerts,
- Hashtable<BigInteger, RevokedCertificate> expiredCerts)
- throws EBaseException;
-
- /**
- * Updates CRL issuing point record with delta-CRL.
- *
- * @param id issuing point record id
- * @param deltaCRLNumber delta CRL number
- * @param deltaCRLSize delta CRL size
- * @param nextUpdate time of next update
- * @param deltaCRL delta CRL in binary form
- * @exception EBaseException failed to update issuing point record
- */
- public void updateDeltaCRL(String id, BigInteger deltaCRLNumber,
- Long deltaCRLSize, Date nextUpdate,
- byte[] deltaCRL)
- throws EBaseException;
-
- /**
- * Updates CRL issuing point record with reference to the first
- * unsaved data.
- *
- * @param id issuing point record id
- * @param firstUnsaved reference to the first unsaved data
- * @exception EBaseException failed to update issuing point record
- */
- public void updateFirstUnsaved(String id, String firstUnsaved)
- throws EBaseException;
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java
deleted file mode 100644
index 7da212469..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java
+++ /dev/null
@@ -1,153 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.keydb;
-
-import java.math.BigInteger;
-import java.util.Date;
-
-import com.netscape.certsrv.base.EBaseException;
-
-/**
- * An interface contains constants for key record.
- *
- * @version $Revision$, $Date$
- */
-public interface IKeyRecord {
- public static final String ATTR_ID = "keySerialNumber";
- public static final String ATTR_STATE = "keyState";
- public static final String ATTR_ALGORITHM = "algorithm";
- public static final String ATTR_KEY_SIZE = "keySize";
- public static final String ATTR_OWNER_NAME = "keyOwnerName";
- public static final String ATTR_PRIVATE_KEY_DATA = "privateKey";
- public static final String ATTR_PUBLIC_KEY_DATA = "publicKey";
- public static final String ATTR_DATE_OF_RECOVERY = "dateOfRecovery";
- public static final String ATTR_CREATE_TIME = "keyCreateTime";
- public static final String ATTR_MODIFY_TIME = "keyModifyTime";
- public static final String ATTR_META_INFO = "keyMetaInfo";
- public static final String ATTR_ARCHIVED_BY = "keyArchivedBy";
- public static final String ATTR_CLIENT_ID = "clientId";
- public static final String ATTR_DATA_TYPE = "dataType";
- public static final String ATTR_STATUS = "status";
-
-
- // key state
- public static final String STATUS_ANY = "ANY";
- public static final String STATUS_VALID = "VALID";
- public static final String STATUS_INVALID = "INVALID";
-
- /**
- * Retrieves the state of the key.
- *
- * @return key state
- * @exception EBaseException failed to retrieve state of the key
- */
- public KeyState getState() throws EBaseException;
-
- /**
- * Retrieves key identifier.
- *
- * @return key id
- * @exception EBaseException failed to retrieve key id
- */
- public BigInteger getSerialNumber() throws EBaseException;
-
- /**
- * Retrieves key owner name.
- *
- * @return key owner name
- * @exception EBaseException failed to retrieve key owner name
- */
- public String getOwnerName() throws EBaseException;
-
- /**
- * Retrieves key algorithm.
- *
- * @return key algorithm
- */
- public String getAlgorithm();
-
- /**
- * Retrieves key length.
- *
- * @return key length
- * @exception EBaseException failed to retrieve key length
- */
- public Integer getKeySize() throws EBaseException;
-
- /**
- * Retrieves client ID.
- *
- * @return client id
- * @exception EBaseException failed to retrieve client id
- */
- public String getClientId() throws EBaseException;
-
- /**
- * Retrieves key data type.
- *
- * @return data type
- * @exception EBaseException failed to retrieve data type
- */
- public String getDataType() throws EBaseException;
-
- /**
- * Retrieves key status.
- *
- * @return key status
- * @exception EBaseException failed to retrieve key status
- */
- public String getKeyStatus() throws EBaseException;
-
- /**
- * Retrieves archiver identifier.
- *
- * @return archiver uid
- */
-
- public String getArchivedBy();
-
- /**
- * Retrieves creation time.
- *
- * @return creation time
- */
- public Date getCreateTime();
-
- /**
- * Retrieves last modification time.
- *
- * @return modification time
- */
- public Date getModifyTime();
-
- /**
- * Retrieves dates of recovery.
- *
- * @return recovery history
- * @exception EBaseException failed to retrieve recovery history
- */
- public Date[] getDateOfRevocation() throws EBaseException;
-
- /**
- * Retrieves public key data.
- *
- * @return public key data
- * @exception EBaseException failed to retrieve public key data
- */
- public byte[] getPublicKeyData() throws EBaseException;
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java
deleted file mode 100644
index 75f833892..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.keydb;
-
-import java.util.Enumeration;
-
-import com.netscape.certsrv.base.EBaseException;
-
-/**
- * A class represents a list of key records.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public interface IKeyRecordList {
-
- /**
- * Retrieves the size of key list.
- *
- * @return size of key list
- */
- public int getSize();
-
- /**
- * Retrieves key records.
- *
- * @param startidx start index
- * @param endidx end index
- * @return key records
- * @exception EBaseException failed to retrieve key records
- */
- public Enumeration<IKeyRecord> getKeyRecords(int startidx, int endidx)
- throws EBaseException;
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java
deleted file mode 100644
index 627844286..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java
+++ /dev/null
@@ -1,174 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.keydb;
-
-import java.math.BigInteger;
-import java.security.PublicKey;
-import java.util.Enumeration;
-
-import netscape.security.x509.X500Name;
-
-import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.dbs.ModificationSet;
-import com.netscape.certsrv.dbs.repository.IRepository;
-
-/**
- * An interface represents a Key repository. This is the
- * container of archived keys.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public interface IKeyRepository extends IRepository {
-
- /**
- * Archives a key to the repository.
- * <P>
- *
- * @param record key record
- * @exception EBaseException failed to archive key
- */
- public void addKeyRecord(IKeyRecord record) throws EBaseException;
-
- /**
- * Reads an archived key by serial number.
- * <P>
- *
- * @param serialNo serial number
- * @return key record
- * @exception EBaseException failed to recover key
- */
- public IKeyRecord readKeyRecord(BigInteger serialNo)
- throws EBaseException;
-
- /**
- * Reads an archived key by b64 encoded cert.
- * <P>
- *
- * @param cert b64 encoded cert
- * @return key record
- * @exception EBaseException failed to recover key
- */
- public IKeyRecord readKeyRecord(String cert)
- throws EBaseException;
-
- /**
- * Reads an archived key by owner name.
- * <P>
- *
- * @param ownerName owner name
- * @return key record
- * @exception EBaseException failed to recover key
- */
- public IKeyRecord readKeyRecord(X500Name ownerName)
- throws EBaseException;
-
- /**
- * Reads archived key using public key.
- *
- * @param publicKey public key that is corresponding
- * to the private key
- * @return key record
- * @exception EBaseException failed to read key
- */
- public IKeyRecord readKeyRecord(PublicKey publicKey)
- throws EBaseException;
-
- /**
- * Searches for private keys.
- *
- * @param filter LDAP filter for the search
- * @param maxSize maximium number of entries to be returned
- * @return a list of private key records
- * @exception EBaseException failed to search keys
- */
- public Enumeration<IKeyRecord> searchKeys(String filter, int maxSize)
- throws EBaseException;
-
- /**
- * Searches for private keys.
- *
- * @param filter LDAP filter for the search
- * @param maxSize maximium number of entries to be returned
- * @param timeLimt timeout value
- * @return a list of private key records
- * @exception EBaseException failed to search keys
- */
- public Enumeration<IKeyRecord> searchKeys(String filter, int maxSize, int timeLimt)
- throws EBaseException;
-
- /**
- * Deletes a key record.
- *
- * @param serialno key identifier
- * @exception EBaseException failed to delete key record
- */
- public void deleteKeyRecord(BigInteger serialno)
- throws EBaseException;
-
- /**
- * Modifies key record in this repository.
- *
- * @param serialNo key identifier
- * @param mods modification of key records
- * @exception EBaseException failed to modify key record
- */
- public void modifyKeyRecord(BigInteger serialNo,
- ModificationSet mods) throws EBaseException;
-
- /**
- * Searchs for a list of key records.
- * Here is a list of supported filter attributes:
- *
- * <pre>
- * keySerialNumber
- * keyState
- * algorithm
- * keySize
- * keyOwnerName
- * privateKey
- * publicKey
- * dateOfRecovery
- * keyCreateTime
- * keyModifyTime
- * keyMetaInfo
- * </pre>
- *
- * @param filter search filter
- * @param attrs list of attributes to be returned
- * @param pageSize virtual list page size
- * @return list of key records
- * @exception EBaseException failed to search key records
- */
- public IKeyRecordList findKeyRecordsInList(String filter,
- String attrs[], int pageSize) throws EBaseException;
-
- /**
- * Searchs for a list of key records.
- *
- * @param filter search filter
- * @param attrs list of attributes to be returned
- * @param sortKey name of attribute that the list should be sorted by
- * @param pageSize virtual list page size
- * @return list of key records
- * @exception EBaseException failed to search key records
- */
- public IKeyRecordList findKeyRecordsInList(String filter,
- String attrs[], String sortKey, int pageSize)
- throws EBaseException;
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyId.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyId.java
deleted file mode 100644
index f998bf97a..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyId.java
+++ /dev/null
@@ -1,122 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.keydb;
-
-import java.math.BigInteger;
-
-/**
- * The KeyId class represents the identifier for a particular
- * key record. This identifier may be used to retrieve the key record
- * from the database.
- * <p>
- *
- * @author Endi S. Dewata
- * @version $Revision$ $Date$
- */
-public class KeyId {
-
- protected BigInteger value;
-
- /**
- * Creates a new KeyId from its string representation.
- * <p>
- *
- * @param id
- * a string containing the decimal or hex value for the identifier.
- */
- public KeyId(String id) {
- if (id != null) {
- id = id.trim();
- if (id.startsWith("0x")) { // hex
- value = new BigInteger(id.substring(2), 16);
- } else { // decimal
- value = new BigInteger(id);
- }
- }
- }
-
- /**
- * Creates a new KeyId from its BigInteger representation.
- * <p>
- *
- * @param id
- * a BigInteger containing the identifier.
- */
- public KeyId(BigInteger id) {
- value = id;
- }
-
- /**
- * Creates a new KeyId from its integer representation.
- * <p>
- *
- * @param id
- * an integer containing the identifier.
- */
- public KeyId(int id) {
- value = BigInteger.valueOf(id);
- }
-
- /**
- * Converts the KeyId into its BigInteger representation.
- * <p>
- *
- * @return
- * a BigInteger containing the identifier.
- */
- public BigInteger toBigInteger() {
- return value;
- }
-
- /**
- * Converts the KeyId into its string representation. The string
- * form can be stored in a database (such as the LDAP directory)
- * <p>
- *
- * @return
- * a string containing the decimal (base 10) value for the identifier.
- */
- public String toString() {
- return value.toString();
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((value == null) ? 0 : value.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- KeyId other = (KeyId) obj;
- if (value == null) {
- if (other.value != null)
- return false;
- } else if (!value.equals(other.value))
- return false;
- return true;
- }
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java
deleted file mode 100644
index 3232999fd..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.keydb;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-/**
- * The KeyIdAdapter class provides custom marshaling for KeyId.
- *
- * @author Endi S. Dewata
- * @version $Revision$ $Date$
- */
-public class KeyIdAdapter extends XmlAdapter<String, KeyId> {
-
- public KeyId unmarshal(String value) throws Exception {
- return new KeyId(value);
- }
-
- public String marshal(KeyId value) throws Exception {
- return value.toString();
- }
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java
deleted file mode 100644
index fa8a0d768..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java
+++ /dev/null
@@ -1,106 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.keydb;
-
-import java.io.Serializable;
-
-/**
- * A class represents key state. This object is to
- * encapsulate the life cycle of a key.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public final class KeyState implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 5452723730414730579L;
- private int mStateCode;
-
- /**
- * Constructs a key state.
- */
- private KeyState(int code) {
- mStateCode = code;
- }
-
- /**
- * Request state.
- */
- public final static KeyState ANY = new KeyState(-1);
- public final static KeyState VALID = new KeyState(0);
- public final static KeyState INVALID = new KeyState(1);
-
- /**
- * Checks if the given object equals to this object.
- *
- * @param other object to be compared
- * @return true if both objects are the same
- */
- public boolean equals(Object other) {
- if (this == other)
- return true;
- else if (other instanceof KeyState)
- return ((KeyState) other).mStateCode == mStateCode;
- else
- return false;
- }
-
- /**
- * Returns the hash code.
- *
- * @return hash code
- */
- public int hashCode() {
- return mStateCode;
- }
-
- /**
- * Return the string-representation of this object.
- *
- * @return string value
- */
- public String toString() {
- if (mStateCode == -1)
- return "ANY";
- if (mStateCode == 0)
- return "VALID";
- if (mStateCode == 1)
- return "INVAILD";
- return "[UNDEFINED]";
-
- }
-
- /**
- * Converts a string into a key state object.
- *
- * @param state state in string-representation
- * @return key state object
- */
- public static KeyState toKeyState(String state) {
- if (state.equalsIgnoreCase("ANY"))
- return ANY;
- if (state.equalsIgnoreCase("VALID"))
- return VALID;
- if (state.equalsIgnoreCase("INVALID"))
- return INVALID;
- return null;
- }
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java
deleted file mode 100644
index 574adfae9..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.replicadb;
-
-import com.netscape.certsrv.dbs.repository.IRepository;
-
-/**
- * An interface represents a ReplicaID Repository.
- * It provides unique managed replica IDs.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public interface IReplicaIDRepository extends IRepository {
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java
deleted file mode 100644
index 943d4a686..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.repository;
-
-import java.math.BigInteger;
-
-import com.netscape.certsrv.base.EBaseException;
-
-/**
- * An interface represents a generic repository. It maintains unique
- * serial number within repository.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public interface IRepository {
-
- /**
- * Retrieves the next serial number, and also increase the
- * serial number by one.
- *
- * @return serial number
- * @exception EBaseException failed to retrieve next serial number
- */
- public BigInteger getNextSerialNumber() throws EBaseException;
-
- /**
- * Resets serial number.
- */
- public void resetSerialNumber(BigInteger serial) throws EBaseException;
-
- /**
- * Retrieves the next serial number without increasing the serial number.
- *
- * @return serial number
- * @exception EBaseException failed to retrieve next serial number
- */
- public BigInteger getTheSerialNumber() throws EBaseException;
-
- /**
- * Set the maximum serial number.
- *
- * @param serial maximum number
- * @exception EBaseException failed to set maximum serial number
- */
- public void setMaxSerial(String serial) throws EBaseException;
-
- /**
- * Set the maximum serial number in next range.
- *
- * @param serial maximum number
- * @exception EBaseException failed to set maximum serial number in next range
- */
- public void setNextMaxSerial(String serial) throws EBaseException;
-
- /**
- * Checks to see if a new range is needed, or if we have reached the end of the
- * current range, or if a range conflict has occurred.
- *
- * @exception EBaseException failed to check next range for conflicts
- */
- public void checkRanges() throws EBaseException;
-
- /**
- * Sets whether serial number management is enabled for certs
- * and requests.
- *
- * @param value true/false
- * @exception EBaseException failed to set
- */
- public void setEnableSerialMgmt(boolean value) throws EBaseException;
-
-}
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java
deleted file mode 100644
index c46e8419c..000000000
--- a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.dbs.repository;
-
-import java.math.BigInteger;
-
-import com.netscape.certsrv.dbs.IDBObj;
-
-/**
- * An interface represents a generic repository record.
- * It maintains unique serial number within repository.
- * <P>
- *
- * @version $Revision$, $Date$
- */
-public interface IRepositoryRecord extends IDBObj {
-
- public final static String ATTR_SERIALNO = "serialNo";
- public final static String ATTR_PUB_STATUS = "publishingStatus";
-
- /**
- * Retrieves serial number.
- *
- * @return serial number
- */
- public BigInteger getSerialNumber();
-
- public String getPublishingStatus();
-}