diff options
Diffstat (limited to 'base/common')
18 files changed, 40 insertions, 25 deletions
diff --git a/base/common/src/com/netscape/certsrv/request/IRequest.java b/base/common/src/com/netscape/certsrv/request/IRequest.java index ded0145ab..3459af602 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequest.java +++ b/base/common/src/com/netscape/certsrv/request/IRequest.java @@ -19,6 +19,7 @@ package com.netscape.certsrv.request; //import java.io.Serializable; +import java.io.Serializable; import java.math.BigInteger; import java.util.Date; import java.util.Enumeration; @@ -40,7 +41,7 @@ import com.netscape.certsrv.base.IAttrSet; * * @version $Revision$, $Date$ */ -public interface IRequest { +public interface IRequest extends Serializable { public static final String REQ_VERSION = "requestVersion"; diff --git a/base/common/src/com/netscape/certsrv/request/RequestId.java b/base/common/src/com/netscape/certsrv/request/RequestId.java index 8cd8c5711..8e67ca481 100644 --- a/base/common/src/com/netscape/certsrv/request/RequestId.java +++ b/base/common/src/com/netscape/certsrv/request/RequestId.java @@ -17,6 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.request; +import java.io.Serializable; import java.math.BigInteger; /** @@ -27,7 +28,7 @@ import java.math.BigInteger; * * @version $Revision$ $Date$ */ -public class RequestId { +public class RequestId implements Serializable { protected BigInteger value; diff --git a/base/common/src/com/netscape/certsrv/request/RequestStatus.java b/base/common/src/com/netscape/certsrv/request/RequestStatus.java index fd501ef0f..4aec1b56a 100644 --- a/base/common/src/com/netscape/certsrv/request/RequestStatus.java +++ b/base/common/src/com/netscape/certsrv/request/RequestStatus.java @@ -17,6 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.request; +import java.io.Serializable; + /** * The RequestStatus class represents the current state of a request * in a request queue. The state of the request changes as actions @@ -33,7 +35,9 @@ package com.netscape.certsrv.request; * * @version $Revision$ $Date$ */ -public final class RequestStatus { +public final class RequestStatus implements Serializable { + + private static final long serialVersionUID = -8176052970922133411L; public static String BEGIN_STRING = "begin"; public static String PENDING_STRING = "pending"; public static String APPROVED_STRING = "approved"; diff --git a/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java b/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java index d5d37614e..db9c1539f 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java @@ -17,6 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.usrgrp; +import java.io.Serializable; + import netscape.ldap.LDAPException; /** @@ -25,7 +27,7 @@ import netscape.ldap.LDAPException; * * @version $Revision$, $Date$ */ -public interface IUsrGrp extends IIdEvaluator { +public interface IUsrGrp extends IIdEvaluator , Serializable { /** * Retrieves usr/grp manager identifier. diff --git a/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java index 14e06aeb3..2d3dead75 100644 --- a/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java +++ b/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java @@ -1042,7 +1042,7 @@ public class CertificateRepository extends Repository /** * temp solution... */ - public class RenewableCertificateCollection { + public static class RenewableCertificateCollection { Vector<Object> mToRenew = null; Vector<Object> mToNotify = null; diff --git a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java index ab99b4f06..50ed7c3c2 100644 --- a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -443,8 +443,9 @@ public class PublisherProcessor implements //mLdapRequestListener.shutdown(); mAuthority.removeRequestListener(mLdapRequestListener); } - } catch (Exception e) { + } catch (ELdapException e) { // ignore + CMS.debug(e); } } diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java index 38651d0ba..4d9e60251 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java @@ -102,7 +102,7 @@ public class LdapJssSSLSocketFactory implements LDAPSSLSocketFactoryExt { public void log(int level, String msg) { } - class ClientHandshakeCB implements SSLHandshakeCompletedListener { + static class ClientHandshakeCB implements SSLHandshakeCompletedListener { Object sc; public ClientHandshakeCB(Object sc) { diff --git a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java index 0a156b003..446c3b18d 100644 --- a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java +++ b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java @@ -750,8 +750,10 @@ public abstract class ARequestQueue // Request - implementation of the IRequest interface. This // version is returned by ARequestQueue (and its derivatives) // -class Request - implements IRequest { +class Request implements IRequest { + + private static final long serialVersionUID = -1510479502681392568L; + // IRequest.getRequestId public RequestId getRequestId() { return mRequestId; @@ -1460,9 +1462,10 @@ class RequestIAttrSetWrapper implements IAttrSet { /** * Example of a specialized request class. */ -class EnrollmentRequest - extends Request - implements IEnrollmentRequest { +class EnrollmentRequest extends Request implements IEnrollmentRequest { + + private static final long serialVersionUID = 8214498908217267555L; + EnrollmentRequest(RequestId id) { super(id); } diff --git a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java index ee53708ec..0489fa30a 100644 --- a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java +++ b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java @@ -63,6 +63,7 @@ import com.netscape.cmscore.util.Debug; */ public final class UGSubsystem implements IUGSubsystem { + private static final long serialVersionUID = 8080165044652629774L; public static final String ID = "usrgrp"; private String mId = ID; @@ -77,11 +78,11 @@ public final class UGSubsystem implements IUGSubsystem { protected static final String PROP_BASEDN = "basedn"; protected IConfigStore mConfig = null; - protected LdapBoundConnFactory mLdapConnFactory = null; + protected transient LdapBoundConnFactory mLdapConnFactory = null; protected String mBaseDN = null; protected static UGSubsystem mUG = null; - private ILogger mLogger = null; + private transient ILogger mLogger = null; // singleton enforcement diff --git a/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java index 40499577e..296aadea5 100644 --- a/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java +++ b/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java @@ -48,9 +48,6 @@ import com.netscape.certsrv.base.ISubsystem; */ public class ProfileSubsystem extends Frame implements ISubsystem, Runnable { - /** - * - */ private static final long serialVersionUID = -7411549542009497317L; private String mId = null; private Thread mMonitoring = new Thread(this); @@ -207,7 +204,8 @@ public class ProfileSubsystem extends Frame implements ISubsystem, Runnable { updateThreadPanel(); // update every second Thread.sleep(1000); - } catch (Exception e) { + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); } } } diff --git a/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java b/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java index 370973f0a..1a5d999f6 100644 --- a/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java +++ b/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java @@ -255,7 +255,7 @@ public class AuthTokenTest extends CMSBaseTestCase { * getting a value out. It assumes BtoA is always called first, stores * the value passed in, and then returns that value for BtoA. */ - class CMSMemoryStub extends CMSEngineDefaultStub { + static class CMSMemoryStub extends CMSEngineDefaultStub { boolean bToACalled = false; byte[] bToACalledWith = null; diff --git a/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java b/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java index d3177f62c..d9c24106c 100644 --- a/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java +++ b/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java @@ -80,7 +80,7 @@ public class CertRecordListTest extends CMSBaseTestCase { } } - public class ElementProcessorStub implements IElementProcessor { + public static class ElementProcessorStub implements IElementProcessor { public void process(Object o) throws EBaseException { } } diff --git a/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java b/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java index c74f66ba1..4a52bbcef 100644 --- a/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java +++ b/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java @@ -118,7 +118,7 @@ public class DBRegistryTest extends CMSBaseTestCase { } } - class DBDynAttrMapperStub extends DBDynAttrMapperDefaultStub { + static class DBDynAttrMapperStub extends DBDynAttrMapperDefaultStub { boolean mapObjectCalled = false; Object mapObjectCalledWithObject = null; boolean mapLDAPAttrsCalled = false; diff --git a/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java b/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java index a0ad0a8a3..35f999de7 100644 --- a/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java +++ b/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java @@ -259,7 +259,7 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { } - class RequestRecordStub extends RequestRecordDefaultStub { + static class RequestRecordStub extends RequestRecordDefaultStub { private static final long serialVersionUID = 4106967075497999274L; Hashtable<String, Object> extAttrData = new Hashtable<String, Object>(); int setCallCounter = 0; diff --git a/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java b/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java index fd53c2ea9..7a6bde408 100644 --- a/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java +++ b/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java @@ -23,6 +23,8 @@ import com.netscape.certsrv.request.RequestStatus; * Default testing stub for the IRequest interface. */ public class RequestDefaultStub implements IRequest { + private static final long serialVersionUID = -8466522941927034614L; + public RequestId getRequestId() { return null; } diff --git a/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java b/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java index a66326d03..6a0527572 100644 --- a/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java +++ b/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java @@ -40,7 +40,9 @@ public class RequestQueueTest extends CMSBaseTestCase { assertTrue(request.getExtDataKeysCalled); } - class RequestStub extends RequestDefaultStub { + static class RequestStub extends RequestDefaultStub { + private static final long serialVersionUID = -9058189963961484835L; + String[] keys = new String[] { "key1", "key2" }; boolean getExtDataKeysCalled = false; diff --git a/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java b/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java index 0ebf3beab..025684853 100644 --- a/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java +++ b/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java @@ -138,7 +138,7 @@ public class RequestRecordTest extends CMSBaseTestCase { } } - class DBRegistryStub extends DBRegistryDefaultStub { + static class DBRegistryStub extends DBRegistryDefaultStub { boolean registerCalledWithExtAttr = false; IDBAttrMapper extAttrMapper = null; diff --git a/base/common/test/com/netscape/cmscore/request/RequestTest.java b/base/common/test/com/netscape/cmscore/request/RequestTest.java index 1de96a203..b3a8c6ee5 100644 --- a/base/common/test/com/netscape/cmscore/request/RequestTest.java +++ b/base/common/test/com/netscape/cmscore/request/RequestTest.java @@ -667,7 +667,7 @@ public class RequestTest extends CMSBaseTestCase { } - class RevokedCertImplStub extends RevokedCertImpl { + static class RevokedCertImplStub extends RevokedCertImpl { /** * */ |