diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/certsrv')
8 files changed, 31 insertions, 27 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/apps/CMS.java b/pki/base/common/src/com/netscape/certsrv/apps/CMS.java index 137a609f..f093bb74 100644 --- a/pki/base/common/src/com/netscape/certsrv/apps/CMS.java +++ b/pki/base/common/src/com/netscape/certsrv/apps/CMS.java @@ -468,7 +468,7 @@ public final class CMS { * * @return a list of string-based subsystem names */ - public static Enumeration getSubsystemNames() { + public static Enumeration<String> getSubsystemNames() { return _engine.getSubsystemNames(); } @@ -481,7 +481,7 @@ public final class CMS { * * @return a list of ISubsystem-based subsystems */ - public static Enumeration getSubsystems() { + public static Enumeration<ISubsystem> getSubsystems() { return _engine.getSubsystems(); } @@ -1042,7 +1042,7 @@ public final class CMS { * @param params configuration parameters */ public static void getSubjAltNameConfigDefaultParams(String name, - Vector params) { + Vector<String> params) { _engine.getSubjAltNameConfigDefaultParams(name, params); } @@ -1053,7 +1053,7 @@ public final class CMS { * @param params configuration parameters */ public static void getSubjAltNameConfigExtendedPluginInfo(String name, - Vector params) { + Vector<String> params) { _engine.getSubjAltNameConfigExtendedPluginInfo(name, params); } @@ -1079,7 +1079,7 @@ public final class CMS { * @exception EBaseException failed to create subject alt name configuration */ public static void getGeneralNameConfigDefaultParams(String name, - boolean isValueConfigured, Vector params) { + boolean isValueConfigured, Vector<String> params) { _engine.getGeneralNameConfigDefaultParams(name, isValueConfigured, params); } @@ -1093,7 +1093,7 @@ public final class CMS { * @exception EBaseException failed to create subject alt name configuration */ public static void getGeneralNamesConfigDefaultParams(String name, - boolean isValueConfigured, Vector params) { + boolean isValueConfigured, Vector<String> params) { _engine.getGeneralNamesConfigDefaultParams(name, isValueConfigured, params); } @@ -1107,7 +1107,7 @@ public final class CMS { * @exception EBaseException failed to create subject alt name configuration */ public static void getGeneralNameConfigExtendedPluginInfo(String name, - boolean isValueConfigured, Vector info) { + boolean isValueConfigured, Vector<String> info) { _engine.getGeneralNameConfigExtendedPluginInfo(name, isValueConfigured, info); } @@ -1121,7 +1121,7 @@ public final class CMS { * @exception EBaseException failed to create subject alt name configuration */ public static void getGeneralNamesConfigExtendedPluginInfo(String name, - boolean isValueConfigured, Vector info) { + boolean isValueConfigured, Vector<String> info) { _engine.getGeneralNamesConfigExtendedPluginInfo(name, isValueConfigured, info); } @@ -1594,11 +1594,11 @@ public final class CMS { return _engine.createArgBlock(); } - public static IArgBlock createArgBlock(String realm, Hashtable httpReq) { + public static IArgBlock createArgBlock(String realm, Hashtable<String, String> httpReq) { return _engine.createArgBlock(realm, httpReq); } - public static IArgBlock createArgBlock(Hashtable httpReq) { + public static IArgBlock createArgBlock(Hashtable<String, String> httpReq) { return _engine.createArgBlock(httpReq); } diff --git a/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java index 506a5e33..7f5e4605 100644 --- a/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java +++ b/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java @@ -158,14 +158,14 @@ public interface ICMSEngine extends ISubsystem { * * @return a list of string-based subsystem names */ - public Enumeration getSubsystemNames(); + public Enumeration<String> getSubsystemNames(); /** * Returns all the registered subsystems. * * @return a list of ISubsystem-based subsystems */ - public Enumeration getSubsystems(); + public Enumeration<ISubsystem> getSubsystems(); /** * Retrieves the registered subsytem with the given name. @@ -890,7 +890,7 @@ public interface ICMSEngine extends ISubsystem { * @exception EBaseException failed to create subject alt name configuration */ public void getGeneralNameConfigDefaultParams(String name, - boolean isValueConfigured, Vector params); + boolean isValueConfigured, Vector<String> params); /** * Retrieves default general names configuration. @@ -901,7 +901,7 @@ public interface ICMSEngine extends ISubsystem { * @exception EBaseException failed to create subject alt name configuration */ public void getGeneralNamesConfigDefaultParams(String name, - boolean isValueConfigured, Vector params); + boolean isValueConfigured, Vector<String> params); /** * Retrieves extended plugin info for general name configuration. @@ -912,7 +912,7 @@ public interface ICMSEngine extends ISubsystem { * @exception EBaseException failed to create subject alt name configuration */ public void getGeneralNameConfigExtendedPluginInfo(String name, - boolean isValueConfigured, Vector info); + boolean isValueConfigured, Vector<String> info); /** * Retrieves extended plugin info for general name configuration. @@ -923,7 +923,7 @@ public interface ICMSEngine extends ISubsystem { * @exception EBaseException failed to create subject alt name configuration */ public void getGeneralNamesConfigExtendedPluginInfo(String name, - boolean isValueConfigured, Vector info); + boolean isValueConfigured, Vector<String> info); /** * Created general names configuration. @@ -968,7 +968,7 @@ public interface ICMSEngine extends ISubsystem { * @param name configuration name * @param params configuration parameters */ - public void getSubjAltNameConfigDefaultParams(String name, Vector params); + public void getSubjAltNameConfigDefaultParams(String name, Vector<String> params); /** * Get extended plugin info for subject alt name configuration. @@ -976,7 +976,7 @@ public interface ICMSEngine extends ISubsystem { * @param name configuration name * @param params configuration parameters */ - public void getSubjAltNameConfigExtendedPluginInfo(String name, Vector params); + public void getSubjAltNameConfigExtendedPluginInfo(String name, Vector<String> params); /** * Creates subject alt name configuration. @@ -1064,12 +1064,12 @@ public interface ICMSEngine extends ISubsystem { /** * Creates argument block. */ - public IArgBlock createArgBlock(String realm, Hashtable httpReq); + public IArgBlock createArgBlock(String realm, Hashtable<String, String> httpReq); /** * Creates argument block. */ - public IArgBlock createArgBlock(Hashtable httpReq); + public IArgBlock createArgBlock(Hashtable<String, String> httpReq); /** * Checks against the local certificate repository to see diff --git a/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java b/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java index 5e223192..f41b2989 100644 --- a/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java +++ b/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java @@ -17,6 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.apps; +import javax.servlet.Servlet; + +import com.netscape.cms.servlet.common.CMSRequest; + @@ -34,7 +38,7 @@ public interface ICommandQueue { * @param currentRequest request object * @param currentServlet servlet that serves the request object */ - public boolean registerProcess(Object currentRequest, Object currentServlet); + public boolean registerProcess(CMSRequest currentRequest, Servlet currentServlet); /** * UnRegisters a thread from the command queue. * diff --git a/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java b/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java index 83c8f85f..65ca140e 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java @@ -212,7 +212,7 @@ public interface IArgBlock extends Serializable { * * @return a list of string-based keys */ - public Enumeration elements(); + public Enumeration<String> elements(); /** * Adds long-type arguments to this block. @@ -279,5 +279,5 @@ public interface IArgBlock extends Serializable { * * @return a list of string-based keys */ - public Enumeration getElements(); + public Enumeration<String> getElements(); } diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java index ff30dc11..757780d3 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java @@ -42,7 +42,7 @@ public interface IGeneralNameAsConstraintsConfig { * * @param params parameters */ - public void getInstanceParams(Vector params); + public void getInstanceParams(Vector<String> params); /** * Retrieves the general name. diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java index 1f93719d..0d44be08 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java @@ -64,5 +64,5 @@ public interface IGeneralNameConfig { * * @param params parameters */ - public void getInstanceParams(Vector params); + public void getInstanceParams(Vector<String> params); } diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java index e64187b8..c461efd3 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java @@ -49,6 +49,6 @@ public interface IGeneralNamesAsConstraintsConfig { * * @param params instance parameters */ - public void getInstanceParams(Vector params); + public void getInstanceParams(Vector<String> params); } diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java index 64425856..4c2330df 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java @@ -49,5 +49,5 @@ public interface IGeneralNamesConfig { * * @param params instance parameters */ - public void getInstanceParams(Vector params); + public void getInstanceParams(Vector<String> params); } |