From 626a4a4b25e374bbcf83984ff10239c15bba5a47 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 2 Dec 2016 02:35:12 +0100 Subject: Revert "Replaced deprecated ProxyParser." Commit f9ddb2e875355e882b14529979f6c9ae03cf720e has been reverted due to build issue on RHEL/CentOS. https://fedorahosted.org/pki/ticket/2535 --- base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java | 4 ++-- .../src/com/netscape/cms/servlet/test/ConfigurationTest.java | 8 ++++---- base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java | 4 ++-- base/java-tools/src/com/netscape/cmstools/OCSPClient.java | 4 ++-- base/java-tools/src/com/netscape/cmstools/cli/CLI.java | 4 ++-- .../kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java | 4 ++-- .../com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'base') diff --git a/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java b/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java index f036fc2be..92c776d17 100644 --- a/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java +++ b/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java @@ -22,10 +22,10 @@ import java.util.List; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.crypto.AlreadyInitializedException; import org.mozilla.jss.crypto.CryptoToken; @@ -76,7 +76,7 @@ public class CATest { options.addOption("c", true, "Optional SSL Client cert Nickname"); try { - CommandLineParser parser = new DefaultParser(); + CommandLineParser parser = new PosixParser(); CommandLine cmd = parser.parse(options, args); if (cmd.hasOption("h")) { diff --git a/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java b/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java index 897c486fd..69994fa38 100644 --- a/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java +++ b/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java @@ -28,12 +28,14 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import netscape.security.x509.X500Name; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.asn1.ASN1Util; import org.mozilla.jss.asn1.BIT_STRING; @@ -62,8 +64,6 @@ import com.netscape.certsrv.system.SystemCertData; import com.netscape.certsrv.system.SystemConfigClient; import com.netscape.cmsutil.util.Utils; -import netscape.security.x509.X500Name; - /** * @author alee * @@ -101,7 +101,7 @@ public class ConfigurationTest { options.addOption("x", true, "Test number"); try { - CommandLineParser parser = new DefaultParser(); + CommandLineParser parser = new PosixParser(); CommandLine cmd = parser.parse(options, args); if (cmd.hasOption("t")) { diff --git a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java index 44e098f8e..6044b7aac 100644 --- a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java +++ b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java @@ -31,9 +31,9 @@ import java.security.PublicKey; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; +import org.apache.commons.cli.PosixParser; import org.apache.commons.io.FileUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -270,7 +270,7 @@ public class CRMFPopClient { CommandLine cmd = null; try { - CommandLineParser parser = new DefaultParser(); + CommandLineParser parser = new PosixParser(); cmd = parser.parse(options, args); } catch (Exception e) { diff --git a/base/java-tools/src/com/netscape/cmstools/OCSPClient.java b/base/java-tools/src/com/netscape/cmstools/OCSPClient.java index 07aed3a44..67f7b6ef3 100644 --- a/base/java-tools/src/com/netscape/cmstools/OCSPClient.java +++ b/base/java-tools/src/com/netscape/cmstools/OCSPClient.java @@ -27,9 +27,9 @@ import java.net.UnknownHostException; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; +import org.apache.commons.cli.PosixParser; import org.mozilla.jss.CryptoManager; import com.netscape.cmsutil.ocsp.BasicOCSPResponse; @@ -127,7 +127,7 @@ public class OCSPClient { CommandLine cmd = null; try { - CommandLineParser parser = new DefaultParser(); + CommandLineParser parser = new PosixParser(); cmd = parser.parse(options, args); } catch (Exception e) { diff --git a/base/java-tools/src/com/netscape/cmstools/cli/CLI.java b/base/java-tools/src/com/netscape/cmstools/cli/CLI.java index 52130a19b..13387495b 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/CLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/CLI.java @@ -25,9 +25,9 @@ import java.util.List; import java.util.Map; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; +import org.apache.commons.cli.PosixParser; import org.apache.commons.lang.StringUtils; import com.netscape.certsrv.client.PKIClient; @@ -40,7 +40,7 @@ public class CLI { public static boolean verbose; - public static CommandLineParser parser = new DefaultParser(); + public static CommandLineParser parser = new PosixParser(); public static HelpFormatter formatter = new HelpFormatter(); public String name; diff --git a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java index b2d45ea24..720bba2b9 100644 --- a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java +++ b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java @@ -36,10 +36,10 @@ import java.util.Random; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.crypto.AlreadyInitializedException; import org.mozilla.jss.crypto.IVParameterSpec; @@ -97,7 +97,7 @@ public class DRMTest { options.addOption("c", true, "Optional SSL Client cert Nickname"); try { - CommandLineParser parser = new DefaultParser(); + CommandLineParser parser = new PosixParser(); CommandLine cmd = parser.parse(options, args); if (cmd.hasOption("h")) { diff --git a/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java b/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java index c415f98d0..03a0729e7 100644 --- a/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java +++ b/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java @@ -18,10 +18,10 @@ import java.security.cert.CertificateEncodingException; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.asn1.InvalidBERException; import org.mozilla.jss.crypto.AlreadyInitializedException; @@ -123,7 +123,7 @@ public class GeneratePKIArchiveOptions { options.addOption("k", true, "Key file"); try { - CommandLineParser parser = new DefaultParser(); + CommandLineParser parser = new PosixParser(); CommandLine cmd = parser.parse(options, args); if (cmd.hasOption("p")) { -- cgit