[utilities COMMIT] in /xmlsectool/trunk: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/security/XmlSec...

[noreply at shibboleth.net]

Author: iay
Date: Mon Mar  4 03:39:43 2013
New Revision: 328

URL: http://svn.shibboleth.net/view/utilities?rev=328&view=rev
Log:
[XSTJ-17] - multiple errors in --help documentation

Modified:
    xmlsectool/trunk/doc/RELEASE-NOTES.txt
    xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java

Modified: xmlsectool/trunk/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/utilities/xmlsectool/trunk/doc/RELEASE-NOTES.txt?rev=328&r1=327&r2=328&view=diff
==============================================================================
--- xmlsectool/trunk/doc/RELEASE-NOTES.txt (original)
+++ xmlsectool/trunk/doc/RELEASE-NOTES.txt Mon Mar  4 03:39:43 2013
@@ -1,3 +1,7 @@
+Changes in Release 1.2.0
+=============================================
+[XSTJ-17] - multiple errors in --help documentation
+
 Changes in Release 1.1.4
 =============================================
 [XTSJ-10] - Correct class and command name

Modified: xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java
URL: http://svn.shibboleth.net/view/utilities/xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java?rev=328&r1=327&r2=328&view=diff
==============================================================================
--- xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java (original)
+++ xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java Mon Mar  4 03:39:43 2013
@@ -494,7 +494,7 @@
      * @param out location where to print the output
      */
     public void printHelp(PrintStream out) {
-        out.println("XML Tool");
+        out.println("XML Security Tool");
         out.println("Provides a command line interface for schema validating, signing, and signature validating an XML file.");
         out.println();
         out.println("==== Command Line Options ====");
@@ -504,16 +504,16 @@
         out.println("Action Options - '" + SIGN_ARG.longForm() + "' and '" + V_SIG_ARG.longForm()
                 + "' are mutually exclusive.  At least one option is required.");
         out.println(String.format("  --%-20s %s", V_SCHEMA_ARG.longForm(), "Schema validate the document."));
-        out.println(String.format("  --%-20s %s", SIGN_ARG.longForm(), "Sign the SAML document."));
+        out.println(String.format("  --%-20s %s", SIGN_ARG.longForm(), "Sign the XML document."));
         out.println(String.format("  --%-20s %s", V_SIG_ARG.longForm(), "Check the signature on a signed document."));
 
         out.println();
         out.println("Data Input Options - '" + IN_FILE_ARG.longForm() + "' and '" + IN_URL_ARG.longForm()
                 + "' are mutually exclusive, one is required.");
         out.println(String.format("  --%-20s %s", IN_FILE_ARG.longForm(),
-                "Specifies the file from which the SAML document will be read."));
+                "Specifies the file from which the XML document will be read."));
         out.println(String.format("  --%-20s %s", IN_URL_ARG.longForm(),
-                "Specifies the URL from which the SAML document will be read. HTTPS certificates are not validated."));
+                "Specifies the URL from which the XML document will be read. HTTPS certificates are not validated."));
         out.println(String.format("  --%-20s %s", BASE64_IN_ARG.longForm(),
                 "Base64 decodes input.  Useful when reading in data produced with the " + BASE64_OUT_ARG.longForm()
                         + " option"));
@@ -532,7 +532,7 @@
         out.println(String.format("  --%-20s %s", HTTP_PROXY_USERNAME_ARG.longForm(),
                 "Username used to authenticate to the HTTP proxy."));
         out.println(String.format("  --%-20s %s", HTTP_PROXY_PASSWORD_ARG.longForm(),
-                "Password used to authenticated to the HTTP proxy."));
+                "Password used to authenticate to the HTTP proxy."));
 
         out.println();
         out.println("Schema Validation Option - '" + SCHEMA_XSD_LANG_ARG.longForm() + "' (default) and '"
@@ -546,12 +546,12 @@
 
         out.println();
         out.println("Signature Creation Options");
-        out.println(String.format("  --%-20s %s", SIG_REQUIRED_ARG.longForm(),
-                "Specifies that the document being verified is required to contain a signature."));
         out.println(String.format(
                 "  --%-20s %s",
                 SIG_REF_ID_ATT_ARG.longForm(),
-                "Specifies that the name of the attribute, on the document element, whose value is used as the URI reference of the signature"));
+                "Specifies the name of the attribute on the document element "
+                        + "whose value is used as the URI reference of the signature.  If omitted, "
+                        + "a null reference URI is used."));
         out.println(String.format("  --%-20s %s", SIG_POS_ARG.longForm(),

[... 26 lines stripped ...]