Author: ebourg-guest
Date: 2013-07-05 14:27:14 +0000 (Fri, 05 Jul 2013)
New Revision: 16997
Added:
trunk/jakarta-jmeter/debian/jmeter.1
trunk/jakarta-jmeter/debian/manpages
trunk/jakarta-jmeter/debian/patches/01_improve_cli_help.patch
Modified:
trunk/jakarta-jmeter/debian/changelog
trunk/jakarta-jmeter/debian/patches/series
Log:
Added a patch improving the help on the command line
Added a manpage
Modified: trunk/jakarta-jmeter/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog 2013-07-05 13:26:54 UTC (rev
16996)
+++ trunk/jakarta-jmeter/debian/changelog 2013-07-05 14:27:14 UTC (rev
16997)
@@ -2,6 +2,8 @@
* New upstream release
* Refreshed the patches
+ * Added a patch improving the help on the command line
+ * Added a manpage
* Added new dependencies on libcommons-jexl2-java and libcommons-lang3-java
* Locate the JRE in the Java wrapper to avoid the
"No JAVA_CMD set for run_java" warning.
Added: trunk/jakarta-jmeter/debian/jmeter.1
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter.1 (rev 0)
+++ trunk/jakarta-jmeter/debian/jmeter.1 2013-07-05 14:27:14 UTC (rev
16997)
@@ -0,0 +1,138 @@
+.TH JMETER "1" "July 2013" "" "User Commands"
+.SH NAME
+jmeter \- Apache JMeter - Load testing tool
+.SH SYNOPSIS
+.B jmeter
+[\fIoptions\fR]
+
+.SH DESCRIPTION
+
+Apache JMeter is a Java application designed to load test functional behavior
and measure performance. It was originally designed for testing Web
Applications but has since expanded to other test functions.
+
+Apache JMeter may be used to test performance both on static and dynamic
resources (files, Servlets, Perl scripts, Java Objects, Data Bases and Queries,
FTP Servers and more). It can be used to simulate a heavy load on a server,
network or object to test its strength or to analyze overall performance under
different load types. You can use it to make a graphical analysis of
performance or to test your server/script/object behavior under heavy
concurrent load.
+
+.SH OPTIONS
+.HP
+\fB\-h\fR, \fB\-\-help\fR
+.IP
+print usage information and exit
+.HP
+\fB\-v\fR, \fB\-\-version\fR
+.IP
+print the version information and exit
+.HP
+\fB\-p\fR, \fB\-\-propfile\fR <argument>
+.IP
+the jmeter property file to use
+.HP
+\fB\-q\fR, \fB\-\-addprop\fR <argument>
+.IP
+additional JMeter property file(s)
+.HP
+\fB\-t\fR, \fB\-\-testfile\fR <argument>
+.IP
+the jmeter test(.jmx) file to run
+.HP
+\fB\-l\fR, \fB\-\-logfile\fR <argument>
+.IP
+the file to log samples to
+.HP
+\fB\-j\fR, \fB\-\-jmeterlogfile\fR <argument>
+.IP
+jmeter run log file (jmeter.log)
+.HP
+\fB\-n\fR, \fB\-\-nongui\fR
+.IP
+run JMeter in nongui mode
+.HP
+\fB\-s\fR, \fB\-\-server\fR
+.IP
+run the JMeter server
+.HP
+\fB\-H\fR, \fB\-\-proxyHost\fR <argument>
+.IP
+Set a proxy server for JMeter to use
+.HP
+\fB\-P\fR, \fB\-\-proxyPort\fR <argument>
+.IP
+Set proxy server port for JMeter to use
+.HP
+\fB\-N\fR, \fB\-\-nonProxyHosts\fR <argument>
+.IP
+Set nonproxy host list (e.g. *.apache.org|localhost)
+.HP
+\fB\-u\fR, \fB\-\-username\fR <argument>
+.IP
+Set username for proxy server that JMeter is to use
+.HP
+\fB\-a\fR, \fB\-\-password\fR <argument>
+.IP
+Set password for proxy server that JMeter is to use
+.HP
+\fB\-J\fR, \fB\-\-jmeterproperty\fR <argument>=<value>
+.IP
+Define additional JMeter properties
+.HP
+\fB\-G\fR, \fB\-\-globalproperty\fR <argument>=<value>
+.IP
+Define Global properties (sent to servers)
+e.g. \fB\-Gport\fR=\fI123\fR
+.IP
+or \fB\-Gglobal\fR.properties
+.HP
+\fB\-D\fR, \fB\-\-systemproperty\fR <argument>=<value>
+.IP
+Define additional system properties
+.HP
+\fB\-S\fR, \fB\-\-systemPropertyFile\fR <argument>
+.IP
+additional system property file(s)
+.HP
+\fB\-L\fR, \fB\-\-loglevel\fR <argument>=<value>
+.IP
+[category=]level e.g. jorphan=INFO or jmeter.util=DEBUG
+.HP
+\fB\-r\fR, \fB\-\-runremote\fR
+.IP
+Start remote servers (as defined in remote_hosts)
+.HP
+\fB\-R\fR, \fB\-\-remotestart\fR <argument>
+.IP
+Start these remote servers (overrides remote_hosts)
+.HP
+\fB\-d\fR, \fB\-\-homedir\fR <argument>
+.IP
+the jmeter home directory to use
+.HP
+\fB\-X\fR, \fB\-\-remoteexit\fR
+.IP
+Exit the remote servers at end of test (non\-GUI)
+
+.SH EXAMPLES
+.HP
+Run Apache JMeter in GUI mode:
+.IP
+jmeter [\-p property\-file]
+
+.HP
+Run Apache JMeter in NON_GUI mode:
+.IP
+jmeter \-n \-t test\-file [\-p property\-file] [\-l log\-file]
+
+.HP
+Tell Apache JMeter to use a proxy server:
+.IP
+jmeter \-H [your.proxy.server] \-P [your proxy server port]
+
+.HP
+Run Apache JMeter in server mode:
+.IP
+jmeter \-s
+.TP
+or
+jmeter\-server
+.PP
+
+.SH HOMEPAGE
+
+http://jmeter.apache.org
Added: trunk/jakarta-jmeter/debian/manpages
===================================================================
--- trunk/jakarta-jmeter/debian/manpages (rev 0)
+++ trunk/jakarta-jmeter/debian/manpages 2013-07-05 14:27:14 UTC (rev
16997)
@@ -0,0 +1 @@
+debian/jmeter.1
Added: trunk/jakarta-jmeter/debian/patches/01_improve_cli_help.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/01_improve_cli_help.patch
(rev 0)
+++ trunk/jakarta-jmeter/debian/patches/01_improve_cli_help.patch
2013-07-05 14:27:14 UTC (rev 16997)
@@ -0,0 +1,79 @@
+Description: Improves the help displayed on the command line
+Author: Emmanuel Bourg <[email protected]>
+Forwarded: no
+--- a/src/core/org/apache/jmeter/JMeter.java
++++ b/src/core/org/apache/jmeter/JMeter.java
+@@ -283,8 +283,7 @@
+ }
+ if (null != error) {
+ System.err.println("Error: " + error);
+- System.out.println("Usage");
+- System.out.println(CLUtil.describeOptions(options).toString());
++ System.out.println("Try 'jmeter --help' for more information.");
+ return;
+ }
+ try {
+@@ -352,7 +351,10 @@
+ System.out.println(JMeterUtils.getJMeterCopyright());
+ 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$
++ System.out.println("Usage: jmeter [options]");
++ System.out.println("Options:");
++
System.out.println(CLUtil.describeOptions(options).toString());
++
System.out.println(JMeterUtils.getResourceFileAsText("org/apache/jmeter/examples.txt"));//
$NON-NLS-1$
+ } else if (parser.getArgumentById(SERVER_OPT) != null) {
+ // Start the server
+ try {
+@@ -388,9 +390,8 @@
+ }
+ }
+ } catch (IllegalUserActionException e) {
+- System.out.println(e.getMessage());
+- System.out.println("Incorrect Usage");
+- System.out.println(CLUtil.describeOptions(options).toString());
++ System.out.println("Incorrect Usage: " + e.getMessage());
++ System.out.println("Try 'jmeter --help' for more information.");
+ } catch (Throwable e) {
+ log.fatalError("An error occurred: ",e);
+ System.out.println("An error occurred: " + e.getMessage());
+@@ -1151,4 +1152,4 @@
+
+ return socket;
+ }
+-}
+\ No newline at end of file
++}
+--- /dev/null
++++ b/src/core/org/apache/jmeter/examples.txt
+@@ -0,0 +1,19 @@
++Examples:
++
++ Run Apache JMeter in GUI mode:
++
++ jmeter [-p property-file]
++
++ Run Apache JMeter in NON_GUI mode:
++
++ jmeter -n -t test-file [-p property-file] [-l log-file]
++
++ Tell Apache JMeter to use a proxy server:
++
++ jmeter -H [your.proxy.server] -P [your proxy server port]
++
++ Run Apache JMeter in server mode:
++
++ jmeter -s
++
++ or jmeter-server
+--- a/build.xml
++++ b/build.xml
+@@ -937,7 +937,7 @@
+ <exclude name="*eucJP*"/>
+ </fileset>
+ <!-- This file is used by the jmeter -h option -->
+- <fileset dir="${src.core}" includes="org/apache/jmeter/help.txt"/>
++ <fileset dir="${src.core}" includes="org/apache/jmeter/examples.txt"/>
+ </jar>
+
+ <!-- components -->
Modified: trunk/jakarta-jmeter/debian/patches/series
===================================================================
--- trunk/jakarta-jmeter/debian/patches/series 2013-07-05 13:26:54 UTC (rev
16996)
+++ trunk/jakarta-jmeter/debian/patches/series 2013-07-05 14:27:14 UTC (rev
16997)
@@ -1,2 +1,3 @@
+01_improve_cli_help.patch
02_disable_components.patch
03_bouncycastle_update.patch
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
