svn commit: r1722157 - in /jmeter/trunk: src/core/org/apache/jmeter/JMeter.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Tue Dec 29 15:41:19 2015
New Revision: 1722157

URL: http://svn.apache.org/viewvc?rev=1722157&view=rev
Log:
Bug 58781 - Command line option "-?" shows Unknown option
Bugzilla Id: 58781

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1722157&r1=1722156&r2=1722157&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Tue Dec 29 15:41:19 2015
@@ -119,6 +119,7 @@ public class JMeter implements JMeterPlu
     private static final int PROXY_PASSWORD     = 'a';// $NON-NLS-1$
     private static final int JMETER_HOME_OPT    = 'd';// $NON-NLS-1$
     private static final int HELP_OPT           = 'h';// $NON-NLS-1$
+    private static final int OPTIONS_OPT        = '?';// $NON-NLS-1$
     // jmeter.log
     private static final int JMLOGFILE_OPT      = 'j';// $NON-NLS-1$
     // sample result log file
@@ -157,6 +158,8 @@ public class JMeter implements JMeterPlu
      * </ul>
      */
     private static final CLOptionDescriptor[] options = new CLOptionDescriptor[] {
+            new CLOptionDescriptor("?", CLOptionDescriptor.ARGUMENT_DISALLOWED, OPTIONS_OPT,
+                "print command line options and exit"),
             new CLOptionDescriptor("help", CLOptionDescriptor.ARGUMENT_DISALLOWED, HELP_OPT,
                     "print usage information and exit"),
             new CLOptionDescriptor("version", CLOptionDescriptor.ARGUMENT_DISALLOWED, VERSION_OPT,
@@ -371,6 +374,8 @@ public class JMeter implements JMeterPlu
                 System.out.println("Version " + JMeterUtils.getJMeterVersion());
             } else if (parser.getArgumentById(HELP_OPT) != null) {
                 System.out.println(JMeterUtils.getResourceFileAsText("org/apache/jmeter/help.txt"));// $NON-NLS-1$
+            } else if (parser.getArgumentById(OPTIONS_OPT) != null) {
+                System.out.println(CLUtil.describeOptions(options).toString());
             } else if (parser.getArgumentById(SERVER_OPT) != null) {
                 // Start the server
                 try {

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1722157&r1=1722156&r2=1722157&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Dec 29 15:41:19 2015
@@ -239,6 +239,7 @@ Summary
     <li><bug>58293</bug>SOAP/XML-RPC Sampler file browser generates NullPointerException</li>
     <li><bug>58685</bug>JDatefield : Make the modification of the date with up/down arrow work.Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
     <li><bug>58693</bug>Fix "Cannot nest output folder 'jmeter/build/components' inside output folder 'jmeter/build' when setting up eclipse</li>
+    <li><bug>58781</bug>Command line option "-?" shows Unknown option</li>
 </ul>
 
  <!--  =================== Thanks =================== -->