Use ObjectBuilder statically (this was generating warnings for me)

git-svn-id: https://svn.verisignlabs.com/jdnssec/tools/trunk@123 4cbd57fe-54e5-0310-bd9a-f30fe5ea5e6e

src/com/verisignlabs/dnssec/cl/DSTool.java

@@ -74,23 +74,23 @@ public class DSTool
       // boolean options
       opts.addOption("h", "help", false, "Print this message.");
 
-      opts.addOption(OptionBuilder.withLongOpt("dlv")
+      OptionBuilder.withLongOpt("dlv");
-          .withDescription("Generate a DLV record instead.")
+      OptionBuilder.withDescription("Generate a DLV record instead.");
-          .create());
+      opts.addOption(OptionBuilder.create());
 
+      OptionBuilder.hasOptionalArg();
+      OptionBuilder.withLongOpt("verbose");
+      OptionBuilder.withArgName("level");
+      OptionBuilder.withDescription("verbosity level -- 0 is silence, 5 is debug information, 6 is trace information.\n"
+          + "default is level 5.");
       // Argument options
-      opts.addOption(OptionBuilder.hasOptionalArg()
+      opts.addOption(OptionBuilder.create('v'));
-          .withLongOpt("verbose")
-          .withArgName("level")
-          .withDescription("verbosity level -- 0 is silence, 5 is debug information, 6 is trace information.\n"
-                           + "default is level 5.")
-          .create('v'));
 
-      opts.addOption(OptionBuilder.hasArg()
+      OptionBuilder.hasArg();
-          .withLongOpt("digest")
+      OptionBuilder.withLongOpt("digest");
-          .withArgName("id")
+      OptionBuilder.withArgName("id");
-          .withDescription("The Digest ID to use (numerically): either 1 for SHA1 or 2 for SHA256")
+      OptionBuilder.withDescription("The Digest ID to use (numerically): either 1 for SHA1 or 2 for SHA256");
-          .create('d'));
+      opts.addOption(OptionBuilder.create('d'));
     }
 
     public void parseCommandLine(String[] args)

src/com/verisignlabs/dnssec/cl/KeyGen.java

@@ -93,22 +93,21 @@ public class KeyGen
       OptionBuilder.withLongOpt("verbose");
       OptionBuilder.withArgName("level");
       OptionBuilder.withDescription("verbosity level -- 0 is silence, "
-          + "5 is debug information, " + "6 is trace information.\n"
+          + "5 is debug information, 6 is trace information.\n"
           + "default is level 5.");
       opts.addOption(OptionBuilder.create('v'));
 
       OptionBuilder.hasArg();
       OptionBuilder.withArgName("algorithm");
-      OptionBuilder.withDescription("RSA | RSASHA1 | RSAMD5 | DH | DSA | alias, "
+      OptionBuilder.withDescription("RSA | RSASHA1 | RSAMD5 | DH | DSA "
-          + "RSASHA1 is default.");
+          + "| RSA-NSEC3-SHA1 | DSA-NSEC3-SHA1 "
+          + "| RSASHA256 | RSASHA512 | alias, RSASHA1 is default.");
       opts.addOption(OptionBuilder.create('a'));
 
       OptionBuilder.hasArg();
       OptionBuilder.withArgName("size");
       OptionBuilder.withDescription("key size, in bits. (default = 1024)\n"
-          + "RSA|RSASHA1|RSAMD5: [512..4096]\n"
+          + "RSA: [512..4096]\n" + "DSA: [512..1024]\n" + "DH:  [128..4096]");
-          + "DSA:                [512..1024]\n"
-          + "DH:                 [128..4096]");
       opts.addOption(OptionBuilder.create('b'));
 
       OptionBuilder.hasArg();

src/com/verisignlabs/dnssec/cl/KeyInfoTool.java

@@ -32,7 +32,7 @@ import com.verisignlabs.dnssec.security.DnsKeyAlgorithm;
 import com.verisignlabs.dnssec.security.DnsKeyPair;
 
 /**
- * This class forms the command line implementation of a DNSSEC DS/DLV generator
+ * This class forms the command line implementation of a key introspection tool.
  * 
  * @author David Blacka (original)
  * @author $Author: davidb $
@@ -67,16 +67,14 @@ public class KeyInfoTool
       // boolean options
       opts.addOption("h", "help", false, "Print this message.");
 
+      OptionBuilder.hasOptionalArg();
+      OptionBuilder.withLongOpt("verbose");
+      OptionBuilder.withArgName("level");
+      OptionBuilder.withDescription("verbosity level -- 0 is silence, "
+          + "5 is debug information, 6 is trace information.\n"
+          + "default is level 5.");
       // Argument options
-      opts.addOption(OptionBuilder.hasOptionalArg()
+      opts.addOption(OptionBuilder.create('v'));
-          .withLongOpt("verbose")
-          .withArgName("level")
-          .withDescription(
-                           "verbosity level -- 0 is silence, "
-                               + "5 is debug information, "
-                               + "6 is trace information.\n"
-                               + "default is level 5.")
-          .create('v'));
 
       OptionBuilder.hasArg();
       OptionBuilder.withLongOpt("alg-alias");

src/com/verisignlabs/dnssec/cl/VerifyZone.java

@@ -79,27 +79,25 @@ public class VerifyZone
                          + "signatures could be cryptographically verified");
 
       // Argument options
-      opts.addOption(OptionBuilder.hasArg()
+      OptionBuilder.hasArg();
-          .withLongOpt("keydir")
+      OptionBuilder.withLongOpt("keydir");
-          .withArgName("dir")
+      OptionBuilder.withArgName("dir");
-          .withDescription("directory to find " + "trusted key files")
+      OptionBuilder.withDescription("directory to find " + "trusted key files");
-          .create('d'));
+      opts.addOption(OptionBuilder.create('d'));
 
-      opts.addOption(OptionBuilder.hasOptionalArg()
+      OptionBuilder.hasOptionalArg();
-          .withLongOpt("verbose")
+      OptionBuilder.withLongOpt("verbose");
-          .withArgName("level")
+      OptionBuilder.withArgName("level");
-          .withDescription(
+      OptionBuilder.withDescription("verbosity level -- 0 is silence, "
-                           "verbosity level -- 0 is silence, "
           + "5 is debug information, 6 is trace information.\n"
-                               + "default is level 5.")
+          + "default is level 5.");
-          .create('v'));
+      opts.addOption(OptionBuilder.create('v'));
-
-      opts.addOption(OptionBuilder.hasArg()
-          .withArgName("alias:original:mnemonic")
-          .withLongOpt("alg-alias")
-          .withDescription("Define an alias for an algorithm")
-          .create('A'));
 
+      OptionBuilder.hasArg();
+      OptionBuilder.withArgName("alias:original:mnemonic");
+      OptionBuilder.withLongOpt("alg-alias");
+      OptionBuilder.withDescription("Define an alias for an algorithm");
+      opts.addOption(OptionBuilder.create('A'));
     }
 
     public void parseCommandLine(String[] args)
@@ -191,7 +189,7 @@ public class VerifyZone
       PrintWriter out = new PrintWriter(System.err);
 
       // print our own usage statement:
-      f.printHelp(out, 75, "verifyZone.sh [..options..] zonefile "
+      f.printHelp(out, 75, "jdnssec-verifyzone [..options..] zonefile "
           + "[keyfile [keyfile...]]", null, opts,
                   HelpFormatter.DEFAULT_LEFT_PAD,
                   HelpFormatter.DEFAULT_DESC_PAD, null);

src/com/verisignlabs/dnssec/cl/ZoneFormat.java

@@ -45,6 +45,14 @@ import org.xbill.DNS.Section;
 
 import com.verisignlabs.dnssec.security.RecordComparator;
 
+/**
+ * This class forms the command line implementation of a zone file normalizer.
+ * That is, a tool to rewrite zones in a consistent, comparable format.
+ * 
+ * @author David Blacka (original)
+ * @author $Author: davidb $
+ * @version $Revision: 2218 $
+ */
 public class ZoneFormat
 {
   // private static Logger log;