type safety certserv cms and cmscore

Re-added files IPublshRuleSet and ILdapCertMapper

4 files changed, 12 insertions, 12 deletions

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 0d44be081..953bb41ea 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java
+++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java
@@ -56,7 +56,7 @@ public interface IGeneralNameConfig {
      * @return a vector of general names
      * @exception EBaseException failed to form general name
      */
-    public Vector formGeneralNames(Object value)
+    public Vector<GeneralName> formGeneralNames(Object value)
         throws EBaseException;
 
     /**
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java
index 834d462e0..09f2415a1 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java
+++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java
@@ -73,7 +73,7 @@ public interface IPolicyProcessor extends ISubsystem,
      * 		   about policy implementations. Currently only the
      *		   the implementation id is expected.
      */
-    Enumeration getPolicyImplsInfo();
+    Enumeration<String> getPolicyImplsInfo();
 
     /**
      * Returns the rule implementations registered with this processor.
@@ -81,7 +81,7 @@ public interface IPolicyProcessor extends ISubsystem,
      * @return An Enumeration of uninitialized IPolicyRule 
      *					objects.
      */
-    Enumeration getPolicyImpls();
+    Enumeration<IPolicyRule> getPolicyImpls();
 
     /**
      * Returns an implementation identified by a given id.
@@ -98,7 +98,7 @@ public interface IPolicyProcessor extends ISubsystem,
      * @return A vector of name/value pairs in the form of
      *	name=value.
      */
-    Vector getPolicyImplConfig(String id);
+    Vector<String> getPolicyImplConfig(String id);
 
     /**
      * Deletes a policy implementation identified by an impl id.
@@ -129,14 +129,14 @@ public interface IPolicyProcessor extends ISubsystem,
      * @return An Enumeration of Strings describing the information 
      *			about policy rule instances.
      */
-    Enumeration getPolicyInstancesInfo();
+    Enumeration<String> getPolicyInstancesInfo();
 
     /**
      * Returns policy instances registered with this processor.
      *
      * @return An Enumeration of policy instances.
      */
-    Enumeration getPolicyInstances();
+    Enumeration<IPolicyRule>  getPolicyInstances();
 
     /**
      * Returns instance configuration for a given instance id.
@@ -145,7 +145,7 @@ public interface IPolicyProcessor extends ISubsystem,
      * @return A vector of name/value pairs in the form of
      *	name=value.
      */
-    Vector getPolicyInstanceConfig(String id);
+    Vector<String>  getPolicyInstanceConfig(String id);
 
     /**
      * Returns instance configuration for a given instance id.
@@ -172,7 +172,7 @@ public interface IPolicyProcessor extends ISubsystem,
      * @param ht a Hashtable of config params.
      * @exception EBaseException is thrown if an error occurs in addition.
      */
-    void addPolicyInstance(String id, Hashtable ht)
+    void addPolicyInstance(String id, Hashtable<String, String> ht)
         throws EBaseException;
 
     /**
@@ -183,7 +183,7 @@ public interface IPolicyProcessor extends ISubsystem,
      * @param ht a Hashtable of config params.
      * @exception EBaseException is thrown if an error occurs in addition.
      */
-    void modifyPolicyInstance(String id, Hashtable ht)
+    void modifyPolicyInstance(String id, Hashtable<String, String> ht)
         throws EBaseException;
 
     /**
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java
index d80a0d0c2..0babd48aa 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java
+++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java
@@ -110,7 +110,7 @@ public interface IPolicyRule
      * @return nvPairs A Vector of name/value pairs. Each name/value
      *				pair is constructed as a String in name=value format.
      */
-    public Vector getInstanceParams();
+    public Vector<String> getInstanceParams();
 
     /**
      * Return default parameters for a policy implementation.
@@ -118,7 +118,7 @@ public interface IPolicyRule
      * @return nvPairs A Vector of name/value pairs. Each name/value
      *		  		pair is constructed as a String in name=value.
      */
-    public Vector getDefaultParams();
+    public Vector<String>  getDefaultParams();
 
     public void setError(IRequest req, String format, Object[] params);
 
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java
index ea12f4b1b..dd5a36bca 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java
+++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java
@@ -90,7 +90,7 @@ public interface IPolicySet {
      *
      * @return An enumeration of rules.
      */
-    Enumeration getRules();
+    Enumeration<IPolicyRule> getRules();
 
     /**
      * Apply policy rules on a request. This call may modify