diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/publish')
10 files changed, 30 insertions, 38 deletions
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java index abdc770ba..bbf641540 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java @@ -264,11 +264,6 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { "organizationalPerson", "inetOrgPerson" }; - String oOc[] = { "top", - "organization" }; - String oiOc[] = { "top", - "organizationalunit" }; - DN dnobj = new DN(dn); String attrval[] = dnobj.explodeDN(true); diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java index 4451706a3..654de5d30 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java @@ -83,15 +83,15 @@ public class LdapCrlIssuerCompsMap return "LdapCrlIssuerCompsMap"; } - public Vector getDefaultParams() { - Vector v = super.getDefaultParams(); + public Vector<String> getDefaultParams() { + Vector<String> v = super.getDefaultParams(); //v.addElement("crlAttr=" + LdapCrlPublisher.LDAP_CRL_ATTR); return v; } - public Vector getInstanceParams() { - Vector v = super.getInstanceParams(); + public Vector<String> getInstanceParams() { + Vector<String> v = super.getInstanceParams(); return v; } diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java index cddc589bd..155c54ce0 100644 --- a/pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java +++ b/pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java @@ -91,13 +91,13 @@ public class NoMap implements ILdapMapper, IExtendedPluginInfo { return "NoMap"; } - public Vector getDefaultParams() { - Vector v = new Vector(); + public Vector<String> getDefaultParams() { + Vector<String> v = new Vector<String>(); return v; } - public Vector getInstanceParams() { - Vector v = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> v = new Vector<String>(); return v; } diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java index 5e8ad1282..cb13b2452 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java @@ -181,7 +181,6 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { public void init(IConfigStore config) { mConfig = config; String dir = null; - String ext = null; try { dir = mConfig.getString(PROP_DIR, null); @@ -366,8 +365,6 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { if (encodedArray == null) encodedArray = crl.getEncoded(); - ByteArrayOutputStream os = new ByteArrayOutputStream(); - fos = new FileOutputStream(tempFile); fos.write(Utils.base64encode(encodedArray).getBytes()); fos.close(); diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java index 29b874a94..e47318b76 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java @@ -93,16 +93,16 @@ public class LdapCaCertPublisher return "LdapCaCertPublisher"; } - public Vector getInstanceParams() { - Vector v = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> v = new Vector<String>(); v.addElement("caCertAttr=" + mCaCertAttr); v.addElement("caObjectClass=" + mCaObjectclass); return v; } - public Vector getDefaultParams() { - Vector v = new Vector(); + public Vector<String> getDefaultParams() { + Vector<String> v = new Vector<String>(); v.addElement("caCertAttr=" + mCaCertAttr); v.addElement("caObjectClass=" + mCaObjectclass); diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java index 5975872ff..9000f6834 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java @@ -74,16 +74,16 @@ public class LdapCertSubjPublisher implements ILdapPublisher { return "LdapCertSubjPublisher"; } - public Vector getInstanceParams() { - Vector v = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> v = new Vector<String>(); v.addElement("certAttr=" + mCertAttr); v.addElement("subjectNameAttr=" + mSubjNameAttr); return v; } - public Vector getDefaultParams() { - Vector v = new Vector(); + public Vector<String> getDefaultParams() { + Vector<String> v = new Vector<String>(); v.addElement("certAttr=" + mCertAttr); v.addElement("subjectNameAttr=" + mSubjNameAttr); diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java index 624cb1478..c65ff79d5 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java @@ -91,20 +91,20 @@ public class LdapCertificatePairPublisher return "LdapCertificatePairPublisher"; } - public Vector getInstanceParams() { - Vector v = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> v = new Vector<String>(); v.addElement("crossCertPairAttr=" + mCrossCertPairAttr); v.addElement("caObjectClass=" + mCaObjectclass); return v; } - public Vector getInstanceParamsWithExtras() { + public Vector<String> getInstanceParamsWithExtras() { return getInstanceParams(); } - public Vector getDefaultParams() { - Vector v = new Vector(); + public Vector<String> getDefaultParams() { + Vector<String> v = new Vector<String>(); v.addElement("crossCertPairAttr=" + mCrossCertPairAttr); v.addElement("caObjectClass=" + mCaObjectclass); diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java index 7c069f398..6826cc801 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java @@ -93,16 +93,16 @@ public class LdapCrlPublisher implements ILdapPublisher, IExtendedPluginInfo { return params; } - public Vector getInstanceParams() { - Vector v = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> v = new Vector<String>(); v.addElement("crlAttr=" + mCrlAttr); v.addElement("crlObjectClass=" + mCrlObjectClass); return v; } - public Vector getDefaultParams() { - Vector v = new Vector(); + public Vector<String> getDefaultParams() { + Vector<String> v = new Vector<String>(); v.addElement("crlAttr=" + mCrlAttr); v.addElement("crlObjectClass=" + mCrlObjectClass); diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java index 0eba679ad..e31ce674c 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java @@ -79,15 +79,15 @@ public class LdapUserCertPublisher implements ILdapPublisher, IExtendedPluginInf } - public Vector getInstanceParams() { - Vector v = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> v = new Vector<String>(); v.addElement("certAttr=" + mCertAttr); return v; } - public Vector getDefaultParams() { - Vector v = new Vector(); + public Vector<String> getDefaultParams() { + Vector<String> v = new Vector<String>(); v.addElement("certAttr=" + mCertAttr); return v; diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java b/pki/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java index 314e87e63..af8d283dd 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java @@ -126,7 +126,7 @@ public class PublisherUtils { * there'll be trouble if the Vector contains something other * than just Strings */ - public static String[] getStringArrayFromVector(Vector v) { + public static String[] getStringArrayFromVector(Vector<String> v) { String s[] = new String[v.size()]; v.copyInto(s); |