[pkg-java] r16999 - in tags/jakarta-jmeter: . 2.8-1/debian 2.8-1/debian/patches 2.8-1/debian/wrappers
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Fri Jul 5 15:01:59 UTC 2013
Author: ebourg-guest
Date: 2013-07-05 15:01:58 +0000 (Fri, 05 Jul 2013)
New Revision: 16999
Added:
tags/jakarta-jmeter/2.8-1/
tags/jakarta-jmeter/2.8-1/debian/changelog
tags/jakarta-jmeter/2.8-1/debian/control
tags/jakarta-jmeter/2.8-1/debian/copyright
tags/jakarta-jmeter/2.8-1/debian/jmeter-ftp.classpath
tags/jakarta-jmeter/2.8-1/debian/jmeter-http.classpath
tags/jakarta-jmeter/2.8-1/debian/jmeter-ldap.classpath
tags/jakarta-jmeter/2.8-1/debian/jmeter.1
tags/jakarta-jmeter/2.8-1/debian/jmeter.classpath
tags/jakarta-jmeter/2.8-1/debian/jmeter.install
tags/jakarta-jmeter/2.8-1/debian/manpages
tags/jakarta-jmeter/2.8-1/debian/orig-tar.sh
tags/jakarta-jmeter/2.8-1/debian/patches/01_improve_cli_help.patch
tags/jakarta-jmeter/2.8-1/debian/patches/02_disable_components.patch
tags/jakarta-jmeter/2.8-1/debian/patches/03_bouncycastle_update.patch
tags/jakarta-jmeter/2.8-1/debian/patches/series
tags/jakarta-jmeter/2.8-1/debian/rules
tags/jakarta-jmeter/2.8-1/debian/wrappers/jmeter
Removed:
tags/jakarta-jmeter/2.8-1/debian/changelog
tags/jakarta-jmeter/2.8-1/debian/control
tags/jakarta-jmeter/2.8-1/debian/copyright
tags/jakarta-jmeter/2.8-1/debian/jmeter-ftp.classpath
tags/jakarta-jmeter/2.8-1/debian/jmeter-http.classpath
tags/jakarta-jmeter/2.8-1/debian/jmeter-ldap.classpath
tags/jakarta-jmeter/2.8-1/debian/jmeter.classpath
tags/jakarta-jmeter/2.8-1/debian/jmeter.install
tags/jakarta-jmeter/2.8-1/debian/orig-tar.sh
tags/jakarta-jmeter/2.8-1/debian/patches/02_disable_components.patch
tags/jakarta-jmeter/2.8-1/debian/patches/03_bouncycastle_update.patch
tags/jakarta-jmeter/2.8-1/debian/patches/series
tags/jakarta-jmeter/2.8-1/debian/rules
tags/jakarta-jmeter/2.8-1/debian/wrappers/jmeter
Log:
[svn-buildpackage] Tagging jakarta-jmeter 2.8-1
Deleted: tags/jakarta-jmeter/2.8-1/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/changelog 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1,106 +0,0 @@
-jakarta-jmeter (2.5.1-2) unstable; urgency=low
-
- * Patched to compile against Bouncy Castle 1.48 (Closes: #713151)
- * debian/watch: Updated the location of the archives following
- the graduation of JMeter to a top level project.
- * Removed the DMUA flag
- * Bump standards version to 3.9.4. No changes needed.
- * Use canonical URLs for the Vcs-* fields
- * debian/rules: Added a clean target to allow rebuilds
-
- -- Emmanuel Bourg <ebourg at apache.org> Wed, 03 Jul 2013 13:02:38 +0200
-
-jakarta-jmeter (2.5.1-1) unstable; urgency=low
-
- * New upstream release. (Closes: #641546, LP: #879463)
- * Change home page URL everywhere.
- * Add new build dependencies libhttpclient-java, libhttpmime-java for http
- module. Update build and runtime classpath accordingly.
- * Refreshed 02_disable_components.patch as per latest source.
- * Update 'Format' value in debian/copyright.
- * Point watch file to archive area until we used renamed upstream source.
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Thu, 03 May 2012 20:19:04 +0530
-
-jakarta-jmeter (2.4-3) unstable; urgency=low
-
- * Merge Ubuntu changes (gnumail -> geronimo-javamail).
- * Use javahelper, *.classpath files to set classpath and runtime
- dependencies.
- * Add libbcmail-java, libbcprov-java build dependencies for SMIMEAssetion.
- * Update 02_disable_components.patch to build SMIMEAssertion* again.
- * Remove few unneeded/unused dependencies - batik, bsh, gnumail, jboss-j2ee.
- * Minimize jar lookup in launcher script because classpath has been set in
- all jar files.
- * Bump standards version to 3.9.3. No changes needed.
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Sat, 21 Apr 2012 16:17:45 +0530
-
-jakarta-jmeter (2.4-2) unstable; urgency=low
-
- * Team upload.
- * debian/control
- - Remove build unnecessary build dependency on quilt.
- - Update Section of jmeter-apidoc and jmeter-help to be 'doc'
- - Bump standards version to 3.9.2. No changes needed.
- * debian/rules
- - Remove patchsys-quilt.mk.
- * debian/copyright
- - Freshen DEP5 fields to address lintian warnings.
-
- -- tony mancill <tmancill at debian.org> Sat, 17 Sep 2011 20:27:46 -0700
-
-jakarta-jmeter (2.4-1) unstable; urgency=low
-
- * New upstream version.
- * debian/control
- - Add default-jdk-doc to build depends to link against java api docs.
- - Change build-dep junit -> junit4 as application supports junit4 features
- now. Change runtime dependency accordingly.
- - Update short description of all modules.
- - Standards version 3.9.1. No change needed.
- * debian/rules, debian/wrappers/jmeter
- - Updates and fixes for build dependencies/properties and runtime
- dependencies.
- * debian/jmeter.install, debian/jmeter.properties
- - Use upstream provided file. So our own blank file removed.
- * debian/patches/
- - 01_fix_batik_imports.patch - Remove. Not used since last version.
- - 02_disable_components.patch - Refreshed as per current source.
- - 03_fix_jtidy_call.patch - Remove. No needed anymore.
- - 04_files_from_upstream.patch - Remove. Not needed anymore.
- * debian/source/format
- - Source format 3.0 (quilt).
- * debian/README.source
- - Not needed anymore with source format 3.0.
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Sat, 16 Apr 2011 20:27:21 +0530
-
-jakarta-jmeter (2.3.4-2) unstable; urgency=low
-
- * debian/control
- - Remove libgeronimo-jms-1.1-spec-java from build dependencies.
- The package does not exist in Debian archive.
- - Add build dependencies libxmlgraphics-commons-java, rhino. Helps backport
- of the package to Lenny.
- - Add libxmlgraphics-commons-java dependency.
- - Add appropriate dependency to jmeter-jms package.
- * debian/rules
- - Add xmlgraphics-commons, js to DEB_JARS.
- * debian/patches/series
- - Drop 01_fix_batik_imports.patch from list. This patch is unnecessary with
- use of libxmlgraphics-commons-java build-dep.
- * debian/wrappers/jmeter
- - Add xmlgraphics-commons to classpath.
- - Add libraries needed by jmeter-jms to classpath.
- * Thanks to Jan Wagner for spotting most of the problems when doing backport
- to Lenny.
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Wed, 07 Oct 2009 14:17:01 +0530
-
-jakarta-jmeter (2.3.4-1) unstable; urgency=low
-
- * Initial version: Merge from Ubuntu. (Closes: #505877)
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Wed, 30 Sep 2009 10:49:06 +0530
-
Copied: tags/jakarta-jmeter/2.8-1/debian/changelog (from rev 16998, trunk/jakarta-jmeter/debian/changelog)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/changelog (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/changelog 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,119 @@
+jakarta-jmeter (2.8-1) unstable; urgency=low
+
+ * 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.
+ * Install test.jar in /usr/share/jmeter/lib/junit/
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 05 Jul 2013 16:48:12 +0200
+
+jakarta-jmeter (2.5.1-2) unstable; urgency=low
+
+ * Patched to compile against Bouncy Castle 1.48 (Closes: #713151)
+ * debian/watch: Updated the location of the archives following
+ the graduation of JMeter to a top level project.
+ * Removed the DMUA flag
+ * Bump standards version to 3.9.4. No changes needed.
+ * Use canonical URLs for the Vcs-* fields
+ * debian/rules: Added a clean target to allow rebuilds
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 03 Jul 2013 13:02:38 +0200
+
+jakarta-jmeter (2.5.1-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #641546, LP: #879463)
+ * Change home page URL everywhere.
+ * Add new build dependencies libhttpclient-java, libhttpmime-java for http
+ module. Update build and runtime classpath accordingly.
+ * Refreshed 02_disable_components.patch as per latest source.
+ * Update 'Format' value in debian/copyright.
+ * Point watch file to archive area until we used renamed upstream source.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Thu, 03 May 2012 20:19:04 +0530
+
+jakarta-jmeter (2.4-3) unstable; urgency=low
+
+ * Merge Ubuntu changes (gnumail -> geronimo-javamail).
+ * Use javahelper, *.classpath files to set classpath and runtime
+ dependencies.
+ * Add libbcmail-java, libbcprov-java build dependencies for SMIMEAssetion.
+ * Update 02_disable_components.patch to build SMIMEAssertion* again.
+ * Remove few unneeded/unused dependencies - batik, bsh, gnumail, jboss-j2ee.
+ * Minimize jar lookup in launcher script because classpath has been set in
+ all jar files.
+ * Bump standards version to 3.9.3. No changes needed.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Sat, 21 Apr 2012 16:17:45 +0530
+
+jakarta-jmeter (2.4-2) unstable; urgency=low
+
+ * Team upload.
+ * debian/control
+ - Remove build unnecessary build dependency on quilt.
+ - Update Section of jmeter-apidoc and jmeter-help to be 'doc'
+ - Bump standards version to 3.9.2. No changes needed.
+ * debian/rules
+ - Remove patchsys-quilt.mk.
+ * debian/copyright
+ - Freshen DEP5 fields to address lintian warnings.
+
+ -- tony mancill <tmancill at debian.org> Sat, 17 Sep 2011 20:27:46 -0700
+
+jakarta-jmeter (2.4-1) unstable; urgency=low
+
+ * New upstream version.
+ * debian/control
+ - Add default-jdk-doc to build depends to link against java api docs.
+ - Change build-dep junit -> junit4 as application supports junit4 features
+ now. Change runtime dependency accordingly.
+ - Update short description of all modules.
+ - Standards version 3.9.1. No change needed.
+ * debian/rules, debian/wrappers/jmeter
+ - Updates and fixes for build dependencies/properties and runtime
+ dependencies.
+ * debian/jmeter.install, debian/jmeter.properties
+ - Use upstream provided file. So our own blank file removed.
+ * debian/patches/
+ - 01_fix_batik_imports.patch - Remove. Not used since last version.
+ - 02_disable_components.patch - Refreshed as per current source.
+ - 03_fix_jtidy_call.patch - Remove. No needed anymore.
+ - 04_files_from_upstream.patch - Remove. Not needed anymore.
+ * debian/source/format
+ - Source format 3.0 (quilt).
+ * debian/README.source
+ - Not needed anymore with source format 3.0.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Sat, 16 Apr 2011 20:27:21 +0530
+
+jakarta-jmeter (2.3.4-2) unstable; urgency=low
+
+ * debian/control
+ - Remove libgeronimo-jms-1.1-spec-java from build dependencies.
+ The package does not exist in Debian archive.
+ - Add build dependencies libxmlgraphics-commons-java, rhino. Helps backport
+ of the package to Lenny.
+ - Add libxmlgraphics-commons-java dependency.
+ - Add appropriate dependency to jmeter-jms package.
+ * debian/rules
+ - Add xmlgraphics-commons, js to DEB_JARS.
+ * debian/patches/series
+ - Drop 01_fix_batik_imports.patch from list. This patch is unnecessary with
+ use of libxmlgraphics-commons-java build-dep.
+ * debian/wrappers/jmeter
+ - Add xmlgraphics-commons to classpath.
+ - Add libraries needed by jmeter-jms to classpath.
+ * Thanks to Jan Wagner for spotting most of the problems when doing backport
+ to Lenny.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Wed, 07 Oct 2009 14:17:01 +0530
+
+jakarta-jmeter (2.3.4-1) unstable; urgency=low
+
+ * Initial version: Merge from Ubuntu. (Closes: #505877)
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Wed, 30 Sep 2009 10:49:06 +0530
+
Deleted: tags/jakarta-jmeter/2.8-1/debian/control
===================================================================
--- trunk/jakarta-jmeter/debian/control 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/control 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1,155 +0,0 @@
-Source: jakarta-jmeter
-Section: net
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant, ant-optional, cdbs, debhelper (>=5), javahelper
-Build-Depends-Indep: default-jdk,
- default-jdk-doc,
- junit4,
- libavalon-framework-java,
- libbcmail-java,
- libbcprov-java (>= 1.48),
- libbcpkix-java (>= 1.48),
- libbsf-java,
- libcommons-collections3-java,
- libcommons-httpclient-java,
- libcommons-io-java,
- libcommons-jexl-java (>= 1.1),
- libcommons-lang-java,
- libcommons-net-java,
- libexcalibur-logger-java,
- libexcalibur-logkit-java,
- libgeronimo-javamail-1.4-spec-java,
- libgeronimo-jms-1.1-spec-java,
- libhtmlparser-java,
- libhttpclient-java,
- libhttpmime-java,
- libjcharts-java,
- libjdom1-java,
- libjtidy-java,
- liboro-java,
- librhino-java,
- libxalan2-java,
- libxmlgraphics-commons-java,
- libxstream-java,
- velocity
-Standards-Version: 3.9.4
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jakarta-jmeter/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jakarta-jmeter/
-Homepage: http://jmeter.apache.org
-
-Package: jmeter
-Architecture: all
-Depends: default-jre | java2-runtime, java-wrappers (>= 0.1.14), ${java:Depends}, ${misc:Depends}
-Recommends: jmeter-help (= ${binary:Version}), jmeter-http (= ${binary:Version})
-Description: Load testing and performance measurement application (main application)
- Apache JMeter is a 100% pure Java desktop 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.
- .
- This package contains the main application.
-
-Package: jmeter-ftp
-Architecture: all
-Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
-Description: Load testing and performance measurement application (ftp module)
- Apache JMeter is a 100% pure Java desktop 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.
- .
- This package contains the ftp testing module.
-
-Package: jmeter-http
-Architecture: all
-Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
-Description: Load testing and performance measurement application (http module)
- Apache JMeter is a 100% pure Java desktop 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.
- .
- This package contains the http testing module.
-
-Package: jmeter-java
-Architecture: all
-Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
-Description: Load testing and performance measurement application (java module)
- Apache JMeter is a 100% pure Java desktop 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.
- .
- This package contains the java testing module.
-
-Package: jmeter-jms
-Architecture: all
-Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
-Description: Load testing and performance measurement application (jms module)
- Apache JMeter is a 100% pure Java desktop 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.
- .
- This package contains the jms testing module.
-
-Package: jmeter-junit
-Architecture: all
-Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
-Description: Load testing and performance measurement application (junit module)
- Apache JMeter is a 100% pure Java desktop 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.
- .
- This package contains the junit testing module.
-
-Package: jmeter-ldap
-Architecture: all
-Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
-Description: Load testing and performance measurement application (ldap module)
- Apache JMeter is a 100% pure Java desktop 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.
- .
- This package contains the ldap testing module.
-
-Package: jmeter-mail
-Architecture: all
-Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
-Description: Load testing and performance measurement application (mail module)
- Apache JMeter is a 100% pure Java desktop 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.
- .
- This package contains the mail testing module.
-
-Package: jmeter-tcp
-Architecture: all
-Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
-Description: Load testing and performance measurement application (tcp module)
- Apache JMeter is a 100% pure Java desktop 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.
- .
- This package contains the tcp testing module.
-
-Package: jmeter-help
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: jmeter (= ${binary:Version})
-Description: Load testing and performance measurement application (user manual)
- Apache JMeter is a 100% pure Java desktop 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.
- .
- This package contains the user manual.
-
-Package: jmeter-apidoc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: jmeter (= ${binary:Version})
-Description: Load testing and performance measurement application (API doc)
- Apache JMeter is a 100% pure Java desktop 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.
- .
- This package contains the API documentation.
Copied: tags/jakarta-jmeter/2.8-1/debian/control (from rev 16993, trunk/jakarta-jmeter/debian/control)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/control (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/control 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,157 @@
+Source: jakarta-jmeter
+Section: net
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>, Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: ant, ant-optional, cdbs, debhelper (>=5), javahelper
+Build-Depends-Indep: default-jdk,
+ default-jdk-doc,
+ junit4,
+ libavalon-framework-java,
+ libbcmail-java,
+ libbcprov-java (>= 1.48),
+ libbcpkix-java (>= 1.48),
+ libbsf-java,
+ libcommons-collections3-java,
+ libcommons-httpclient-java,
+ libcommons-io-java,
+ libcommons-jexl-java (>= 1.1),
+ libcommons-jexl2-java,
+ libcommons-lang-java,
+ libcommons-lang3-java,
+ libcommons-net-java,
+ libexcalibur-logger-java,
+ libexcalibur-logkit-java,
+ libgeronimo-javamail-1.4-spec-java,
+ libgeronimo-jms-1.1-spec-java,
+ libhtmlparser-java,
+ libhttpclient-java,
+ libhttpmime-java,
+ libjcharts-java,
+ libjdom1-java,
+ libjtidy-java,
+ liboro-java,
+ librhino-java,
+ libxalan2-java,
+ libxmlgraphics-commons-java,
+ libxstream-java,
+ velocity
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jakarta-jmeter/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jakarta-jmeter/
+Homepage: http://jmeter.apache.org
+
+Package: jmeter
+Architecture: all
+Depends: default-jre | java2-runtime, java-wrappers (>= 0.1.14), ${java:Depends}, ${misc:Depends}
+Recommends: jmeter-help (= ${binary:Version}), jmeter-http (= ${binary:Version})
+Description: Load testing and performance measurement application (main application)
+ Apache JMeter is a 100% pure Java desktop 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.
+ .
+ This package contains the main application.
+
+Package: jmeter-ftp
+Architecture: all
+Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
+Description: Load testing and performance measurement application (ftp module)
+ Apache JMeter is a 100% pure Java desktop 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.
+ .
+ This package contains the ftp testing module.
+
+Package: jmeter-http
+Architecture: all
+Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
+Description: Load testing and performance measurement application (http module)
+ Apache JMeter is a 100% pure Java desktop 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.
+ .
+ This package contains the http testing module.
+
+Package: jmeter-java
+Architecture: all
+Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
+Description: Load testing and performance measurement application (java module)
+ Apache JMeter is a 100% pure Java desktop 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.
+ .
+ This package contains the java testing module.
+
+Package: jmeter-jms
+Architecture: all
+Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
+Description: Load testing and performance measurement application (jms module)
+ Apache JMeter is a 100% pure Java desktop 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.
+ .
+ This package contains the jms testing module.
+
+Package: jmeter-junit
+Architecture: all
+Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
+Description: Load testing and performance measurement application (junit module)
+ Apache JMeter is a 100% pure Java desktop 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.
+ .
+ This package contains the junit testing module.
+
+Package: jmeter-ldap
+Architecture: all
+Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
+Description: Load testing and performance measurement application (ldap module)
+ Apache JMeter is a 100% pure Java desktop 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.
+ .
+ This package contains the ldap testing module.
+
+Package: jmeter-mail
+Architecture: all
+Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
+Description: Load testing and performance measurement application (mail module)
+ Apache JMeter is a 100% pure Java desktop 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.
+ .
+ This package contains the mail testing module.
+
+Package: jmeter-tcp
+Architecture: all
+Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc:Depends}
+Description: Load testing and performance measurement application (tcp module)
+ Apache JMeter is a 100% pure Java desktop 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.
+ .
+ This package contains the tcp testing module.
+
+Package: jmeter-help
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: jmeter (= ${binary:Version})
+Description: Load testing and performance measurement application (user manual)
+ Apache JMeter is a 100% pure Java desktop 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.
+ .
+ This package contains the user manual.
+
+Package: jmeter-apidoc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: jmeter (= ${binary:Version})
+Description: Load testing and performance measurement application (API doc)
+ Apache JMeter is a 100% pure Java desktop 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.
+ .
+ This package contains the API documentation.
Deleted: tags/jakarta-jmeter/2.8-1/debian/copyright
===================================================================
--- trunk/jakarta-jmeter/debian/copyright 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/copyright 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1,15 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Apache JMeter
-Source: http://jmeter.apache.org/
-
-Files: *
-Copyright: 2009, The Apache Software Foundation
-License: Apache-2.0
-
-Files: debian/*
-Copyright: 2009, Onkar Shinde <onkarshinde at ubuntu.com>
-License: Apache-2.0
-
-License: Apache-2.0
- On Debian systems the full text of the Apache-2.0 license can be found in the
- `/usr/share/common-licenses/Apache-2.0' file.
Copied: tags/jakarta-jmeter/2.8-1/debian/copyright (from rev 16993, trunk/jakarta-jmeter/debian/copyright)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/copyright (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/copyright 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,15 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache JMeter
+Source: http://jmeter.apache.org
+
+Files: *
+Copyright: 2009-2012, The Apache Software Foundation
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2009, Onkar Shinde <onkarshinde at ubuntu.com>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems the full text of the Apache-2.0 license can be found in the
+ `/usr/share/common-licenses/Apache-2.0' file.
Deleted: tags/jakarta-jmeter/2.8-1/debian/jmeter-ftp.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter-ftp.classpath 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/jmeter-ftp.classpath 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1 +0,0 @@
-usr/share/jmeter/lib/ext/ApacheJMeter_ftp.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang.jar /usr/share/java/commons-net.jar /usr/share/java/excalibur-logkit.jar
Copied: tags/jakarta-jmeter/2.8-1/debian/jmeter-ftp.classpath (from rev 16993, trunk/jakarta-jmeter/debian/jmeter-ftp.classpath)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/jmeter-ftp.classpath (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/jmeter-ftp.classpath 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1 @@
+usr/share/jmeter/lib/ext/ApacheJMeter_ftp.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/commons-net.jar /usr/share/java/excalibur-logkit.jar
Deleted: tags/jakarta-jmeter/2.8-1/debian/jmeter-http.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter-http.classpath 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/jmeter-http.classpath 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1 +0,0 @@
-usr/share/jmeter/lib/ext/ApacheJMeter_http.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang.jar /usr/share/java/commons-logging.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/libhtmlparser.jar /usr/share/java/httpclient.jar /usr/share/java/httpcore.jar /usr/share/java/httpmime.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xstream.jar
Copied: tags/jakarta-jmeter/2.8-1/debian/jmeter-http.classpath (from rev 16993, trunk/jakarta-jmeter/debian/jmeter-http.classpath)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/jmeter-http.classpath (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/jmeter-http.classpath 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1 @@
+usr/share/jmeter/lib/ext/ApacheJMeter_http.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/commons-logging.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/libhtmlparser.jar /usr/share/java/httpclient.jar /usr/share/java/httpcore.jar /usr/share/java/httpmime.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xstream.jar
Deleted: tags/jakarta-jmeter/2.8-1/debian/jmeter-ldap.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter-ldap.classpath 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/jmeter-ldap.classpath 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1 +0,0 @@
-usr/share/jmeter/lib/ext/ApacheJMeter_ldap.jar /usr/share/java/commons-lang.jar /usr/share/java/excalibur-logkit.jar
Copied: tags/jakarta-jmeter/2.8-1/debian/jmeter-ldap.classpath (from rev 16993, trunk/jakarta-jmeter/debian/jmeter-ldap.classpath)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/jmeter-ldap.classpath (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/jmeter-ldap.classpath 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1 @@
+usr/share/jmeter/lib/ext/ApacheJMeter_ldap.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar
Copied: tags/jakarta-jmeter/2.8-1/debian/jmeter.1 (from rev 16997, trunk/jakarta-jmeter/debian/jmeter.1)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/jmeter.1 (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/jmeter.1 2013-07-05 15:01:58 UTC (rev 16999)
@@ -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
Deleted: tags/jakarta-jmeter/2.8-1/debian/jmeter.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter.classpath 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/jmeter.classpath 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1,6 +0,0 @@
-usr/share/jmeter/lib/jorphan.jar /usr/share/java/avalon-framework.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-lang.jar /usr/share/java/excalibur-logger.jar /usr/share/java/excalibur-logkit.jar
-usr/share/jmeter/lib/ext/ApacheJMeter_components.jar /usr/share/java/bcmail.jar /usr/share/java/bcprov.jar /usr/share/java/bsf.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/geronimo-javamail-1.4-spec.jar /usr/share/java/jcharts.jar /usr/share/java/jdom1.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar
-usr/share/jmeter/lib/ext/ApacheJMeter_core.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xmlgraphics-commons.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar
-usr/share/jmeter/lib/ext/ApacheJMeter_functions.jar /usr/share/java/commons-io.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-lang.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar
-usr/share/jmeter/lib/ext/ApacheJMeter_monitors.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar
-usr/share/jmeter/lib/ext/ApacheJMeter_report.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/jcharts.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar
Copied: tags/jakarta-jmeter/2.8-1/debian/jmeter.classpath (from rev 16993, trunk/jakarta-jmeter/debian/jmeter.classpath)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/jmeter.classpath (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/jmeter.classpath 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,6 @@
+usr/share/jmeter/lib/jorphan.jar /usr/share/java/avalon-framework.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logger.jar /usr/share/java/excalibur-logkit.jar
+usr/share/jmeter/lib/ext/ApacheJMeter_components.jar /usr/share/java/bcmail.jar /usr/share/java/bcprov.jar /usr/share/java/bsf.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/geronimo-javamail-1.4-spec.jar /usr/share/java/jcharts.jar /usr/share/java/jdom1.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar
+usr/share/jmeter/lib/ext/ApacheJMeter_core.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xmlgraphics-commons.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar
+usr/share/jmeter/lib/ext/ApacheJMeter_functions.jar /usr/share/java/commons-io.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar
+usr/share/jmeter/lib/ext/ApacheJMeter_monitors.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar
+usr/share/jmeter/lib/ext/ApacheJMeter_report.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/jcharts.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar
Deleted: tags/jakarta-jmeter/2.8-1/debian/jmeter.install
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter.install 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/jmeter.install 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1,10 +0,0 @@
-bin/*.properties usr/share/jmeter/bin/
-bin/ApacheJMeter.jar usr/share/jmeter/bin/
-lib/*.jar usr/share/jmeter/lib/
-lib/ext/ApacheJMeter_components.jar usr/share/jmeter/lib/ext/
-lib/ext/ApacheJMeter_core.jar usr/share/jmeter/lib/ext/
-lib/ext/ApacheJMeter_functions.jar usr/share/jmeter/lib/ext/
-lib/ext/ApacheJMeter_monitors.jar usr/share/jmeter/lib/ext/
-lib/ext/ApacheJMeter_report.jar usr/share/jmeter/lib/ext/
-debian/jmeter.desktop usr/share/applications/
-src/core/org/apache/jmeter/images/jmeter.jpg usr/share/pixmaps/
Copied: tags/jakarta-jmeter/2.8-1/debian/jmeter.install (from rev 16992, trunk/jakarta-jmeter/debian/jmeter.install)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/jmeter.install (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/jmeter.install 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,11 @@
+bin/*.properties usr/share/jmeter/bin/
+bin/ApacheJMeter.jar usr/share/jmeter/bin/
+lib/*.jar usr/share/jmeter/lib/
+lib/ext/ApacheJMeter_components.jar usr/share/jmeter/lib/ext/
+lib/ext/ApacheJMeter_core.jar usr/share/jmeter/lib/ext/
+lib/ext/ApacheJMeter_functions.jar usr/share/jmeter/lib/ext/
+lib/ext/ApacheJMeter_monitors.jar usr/share/jmeter/lib/ext/
+lib/ext/ApacheJMeter_report.jar usr/share/jmeter/lib/ext/
+lib/junit/test.jar usr/share/jmeter/lib/junit/
+debian/jmeter.desktop usr/share/applications/
+src/core/org/apache/jmeter/images/jmeter.jpg usr/share/pixmaps/
Copied: tags/jakarta-jmeter/2.8-1/debian/manpages (from rev 16997, trunk/jakarta-jmeter/debian/manpages)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/manpages (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/manpages 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1 @@
+debian/jmeter.1
Deleted: tags/jakarta-jmeter/2.8-1/debian/orig-tar.sh
===================================================================
--- trunk/jakarta-jmeter/debian/orig-tar.sh 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/orig-tar.sh 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-DIR=apache-jmeter-$2
-TAR=../apache-jmeter_$2.orig.tar.gz
-
-# clean up the upstream tarball
-tar zxvf $3
-rm $3
-tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $DIR
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
-fi
-
-exit 0
Copied: tags/jakarta-jmeter/2.8-1/debian/orig-tar.sh (from rev 16988, trunk/jakarta-jmeter/debian/orig-tar.sh)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/orig-tar.sh (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/orig-tar.sh 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=apache-jmeter-$2
+TAR=../jakarta-jmeter_$2.orig.tar.gz
+
+# clean up the upstream tarball
+tar zxvf $3
+rm $3
+tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
+
+exit 0
Copied: tags/jakarta-jmeter/2.8-1/debian/patches/01_improve_cli_help.patch (from rev 16997, trunk/jakarta-jmeter/debian/patches/01_improve_cli_help.patch)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/patches/01_improve_cli_help.patch (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/patches/01_improve_cli_help.patch 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,79 @@
+Description: Improves the help displayed on the command line
+Author: Emmanuel Bourg <ebourg at apache.org>
+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 -->
Deleted: tags/jakarta-jmeter/2.8-1/debian/patches/02_disable_components.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/02_disable_components.patch 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/patches/02_disable_components.patch 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1,53 +0,0 @@
-Description: Disable components which fail to build because of yet unpackaged
- build dependencies.
-Forwarded: not-needed
-Author: Onkar Shinde <onshinde at ubuntu.com>
---- a/build.xml 2012-05-01 17:37:52.000000000 +0530
-+++ b/build.xml 2012-05-01 17:39:04.000000000 +0530
-@@ -545,9 +545,10 @@
- <target name="compile-http" depends="compile-jorphan,compile-core,compile-components" description="Compile components specific to HTTP sampling.">
- <mkdir dir="${build.http}"/>
- <!-- Directory needs to exist, or jar will fail -->
-- <javac srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}"
-+ <javac sourcepath="" srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}"
- includeAntRuntime="${includeAntRuntime}" deprecation="${deprecation}" encoding="${encoding}">
- <include name="**/*.java"/>
-+ <exclude name="**/WebServiceSampler*.java"/>
- <classpath>
- <pathelement location="${build.jorphan}"/>
- <pathelement location="${build.core}"/>
-@@ -694,7 +695,7 @@
- </javac>
- </target>
-
-- <target name="compile-protocols" depends="compile-http,compile-ftp,compile-jdbc,compile-java,compile-ldap,compile-mail,compile-tcp" description="Compile all protocol-specific components."/>
-+ <target name="compile-protocols" depends="compile-http,compile-ftp,compile-java,compile-ldap,compile-mail,compile-tcp" description="Compile all protocol-specific components."/>
-
- <target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components.">
- <mkdir dir="${build.examples}"/>
-@@ -933,14 +934,14 @@
- </jar>
-
- <!-- jdbc -->
-- <jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
-+ <!--jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
- <zipfileset file="${resources.meta-inf}/default.notice"
- fullpath="META-INF/NOTICE" />
- <zipfileset file="${resources.meta-inf}/default.license"
- fullpath="META-INF/LICENSE" />
- <fileset dir="${build.jdbc}" includes="**/*.class" />
- <fileset dir="${src.jdbc}" includes="**/*.properties" />
-- </jar>
-+ </jar-->
-
- <!-- java -->
- <jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
-@@ -1690,7 +1691,7 @@
- packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
- excludepackagenames="org.apache.jorphan.timer">
- <classpath refid="classpath"/>
-- <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
-+ <link href="file:///usr/share/doc/default-jdk-doc/api/"/>
- </javadoc>
- </target>
-
Copied: tags/jakarta-jmeter/2.8-1/debian/patches/02_disable_components.patch (from rev 16993, trunk/jakarta-jmeter/debian/patches/02_disable_components.patch)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/patches/02_disable_components.patch (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/patches/02_disable_components.patch 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,53 @@
+Description: Disable components which fail to build because of yet unpackaged
+ build dependencies.
+Forwarded: not-needed
+Author: Onkar Shinde <onshinde at ubuntu.com>
+--- a/build.xml
++++ b/build.xml
+@@ -579,9 +579,10 @@
+ <target name="compile-http" depends="compile-jorphan,compile-core,compile-components" description="Compile components specific to HTTP sampling.">
+ <mkdir dir="${build.http}"/>
+ <!-- Directory needs to exist, or jar will fail -->
+- <javac srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}"
++ <javac sourcepath="" srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}"
+ includeAntRuntime="${includeAntRuntime}" deprecation="${deprecation}" encoding="${encoding}">
+ <include name="**/*.java"/>
++ <exclude name="**/WebServiceSampler*.java"/>
+ <classpath>
+ <pathelement location="${build.jorphan}"/>
+ <pathelement location="${build.core}"/>
+@@ -728,7 +729,7 @@
+ </javac>
+ </target>
+
+- <target name="compile-protocols" depends="compile-http,compile-ftp,compile-jdbc,compile-java,compile-ldap,compile-mail,compile-tcp" description="Compile all protocol-specific components."/>
++ <target name="compile-protocols" depends="compile-http,compile-ftp,compile-java,compile-ldap,compile-mail,compile-tcp" description="Compile all protocol-specific components."/>
+
+ <target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components.">
+ <mkdir dir="${build.examples}"/>
+@@ -981,14 +982,14 @@
+ </jar>
+
+ <!-- jdbc -->
+- <jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
++ <!--jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
+ <zipfileset file="${resources.meta-inf}/default.notice"
+ fullpath="META-INF/NOTICE" />
+ <zipfileset file="${resources.meta-inf}/default.license"
+ fullpath="META-INF/LICENSE" />
+ <fileset dir="${build.jdbc}" includes="**/*.class" />
+ <fileset dir="${src.jdbc}" includes="**/*.properties" />
+- </jar>
++ </jar-->
+
+ <!-- java -->
+ <jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
+@@ -1938,7 +1939,7 @@
+ packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
+ excludepackagenames="org.apache.jorphan.timer">
+ <classpath refid="classpath"/>
+- <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
++ <link href="file:///usr/share/doc/default-jdk-doc/api/"/>
+ </javadoc>
+ </target>
+
Deleted: tags/jakarta-jmeter/2.8-1/debian/patches/03_bouncycastle_update.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/03_bouncycastle_update.patch 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/patches/03_bouncycastle_update.patch 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1,24 +0,0 @@
-Description: Update to compile against the latest versions of Bouncy Castle
-Author: Emmanuel Bourg <ebourg at apache.org>
-Origin: vendor
-Forwarded: yes
-Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=54776
---- a/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
-+++ b/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
-@@ -48,6 +48,7 @@
- import org.bouncycastle.cms.CMSException;
- import org.bouncycastle.cms.SignerInformation;
- import org.bouncycastle.cms.SignerInformationStore;
-+import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
- import org.bouncycastle.jce.PrincipalUtil;
- import org.bouncycastle.jce.X509Principal;
- import org.bouncycastle.jce.provider.BouncyCastleProvider;
-@@ -148,7 +149,7 @@
- if (signerIt.hasNext()) {
-
- SignerInformation signer = (SignerInformation) signerIt.next();
-- Iterator<?> certIt = certs.getCertificates(signer.getSID()).iterator();
-+ Iterator<?> certIt = certs.getCertificates(new JcaX509CertSelectorConverter().getCertSelector(signer.getSID())).iterator();
-
- if (certIt.hasNext()) {
- // the signer certificate
Copied: tags/jakarta-jmeter/2.8-1/debian/patches/03_bouncycastle_update.patch (from rev 16993, trunk/jakarta-jmeter/debian/patches/03_bouncycastle_update.patch)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/patches/03_bouncycastle_update.patch (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/patches/03_bouncycastle_update.patch 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,24 @@
+Description: Update to compile against the latest versions of Bouncy Castle
+Author: Emmanuel Bourg <ebourg at apache.org>
+Origin: vendor
+Forwarded: yes
+Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=54776
+--- a/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
++++ b/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
+@@ -52,6 +52,7 @@
+ import org.bouncycastle.cms.CMSException;
+ import org.bouncycastle.cms.SignerInformation;
+ import org.bouncycastle.cms.SignerInformationStore;
++import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
+ import org.bouncycastle.jce.PrincipalUtil;
+ import org.bouncycastle.jce.X509Principal;
+ import org.bouncycastle.jce.provider.BouncyCastleProvider;
+@@ -152,7 +153,7 @@
+ if (signerIt.hasNext()) {
+
+ SignerInformation signer = (SignerInformation) signerIt.next();
+- Iterator<?> certIt = certs.getCertificates(signer.getSID()).iterator();
++ Iterator<?> certIt = certs.getCertificates(new JcaX509CertSelectorConverter().getCertSelector(signer.getSID())).iterator();
+
+ if (certIt.hasNext()) {
+ // the signer certificate
Deleted: tags/jakarta-jmeter/2.8-1/debian/patches/series
===================================================================
--- trunk/jakarta-jmeter/debian/patches/series 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/patches/series 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1,2 +0,0 @@
-02_disable_components.patch
-03_bouncycastle_update.patch
Copied: tags/jakarta-jmeter/2.8-1/debian/patches/series (from rev 16997, trunk/jakarta-jmeter/debian/patches/series)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/patches/series (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/patches/series 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,3 @@
+01_improve_cli_help.patch
+02_disable_components.patch
+03_bouncycastle_update.patch
Deleted: tags/jakarta-jmeter/2.8-1/debian/rules
===================================================================
--- trunk/jakarta-jmeter/debian/rules 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/rules 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1,22 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME_DIRS := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps avalon-framework bcmail bcpkix bcprov bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-lang commons-net geronimo-jms-1.1-spec geronimo-javamail-1.4-spec geronimo-jms_1.1_spec httpclient httpcore httpmime jcharts jdom1 js jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons xstream velocity
-DEB_ANT_BUILD_TARGET := install docs-printable docs-api
-ANT_ARGS := -Dlib.api=/usr/share/java -Djmeter.version=$(DEB_UPSTREAM_VERSION)
-
-install/jmeter::
- mkdir -p debian/jmeter/usr/share/jmeter/bin
- install -m 755 debian/wrappers/jmeter debian/jmeter/usr/share/jmeter/bin
- install -m 755 bin/jmeter-server debian/jmeter/usr/share/jmeter/bin
-
-clean::
- rm -Rf docs
- rm -f lib/junit/test.jar
-
-get-orig-source:
- uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
Copied: tags/jakarta-jmeter/2.8-1/debian/rules (from rev 16993, trunk/jakarta-jmeter/debian/rules)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/rules (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/rules 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME_DIRS := /usr/lib/jvm/default-java
+DEB_JARS := ant-nodeps avalon-framework bcmail bcpkix bcprov bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-jexl2 commons-lang commons-lang3 commons-net geronimo-jms-1.1-spec geronimo-javamail-1.4-spec geronimo-jms_1.1_spec httpclient httpcore httpmime jcharts jdom1 js jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons xstream velocity
+DEB_ANT_BUILD_TARGET := install docs-printable docs-api
+ANT_ARGS := -Dlib.api=/usr/share/java -Djmeter.version=$(DEB_UPSTREAM_VERSION)
+
+install/jmeter::
+ mkdir -p debian/jmeter/usr/share/jmeter/bin
+ install -m 755 debian/wrappers/jmeter debian/jmeter/usr/share/jmeter/bin
+ install -m 755 bin/jmeter-server debian/jmeter/usr/share/jmeter/bin
+
+clean::
+ rm -Rf docs
+ rm -f lib/junit/test.jar
+
+get-orig-source:
+ uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
Deleted: tags/jakarta-jmeter/2.8-1/debian/wrappers/jmeter
===================================================================
--- trunk/jakarta-jmeter/debian/wrappers/jmeter 2013-07-04 12:31:04 UTC (rev 16987)
+++ tags/jakarta-jmeter/2.8-1/debian/wrappers/jmeter 2013-07-05 15:01:58 UTC (rev 16999)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Include the wrappers utility script
-. /usr/lib/java-wrappers/java-wrappers.sh
-
-find_jars /usr/share/jmeter/bin/ApacheJMeter.jar
-
-run_java -Djmeter.home=/usr/share/jmeter org.apache.jmeter.NewDriver "$@"
Copied: tags/jakarta-jmeter/2.8-1/debian/wrappers/jmeter (from rev 16991, trunk/jakarta-jmeter/debian/wrappers/jmeter)
===================================================================
--- tags/jakarta-jmeter/2.8-1/debian/wrappers/jmeter (rev 0)
+++ tags/jakarta-jmeter/2.8-1/debian/wrappers/jmeter 2013-07-05 15:01:58 UTC (rev 16999)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Include the wrappers utility script
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+find_java_runtime
+
+find_jars /usr/share/jmeter/bin/ApacheJMeter.jar
+
+run_java -Djmeter.home=/usr/share/jmeter org.apache.jmeter.NewDriver "$@"
More information about the pkg-java-commits
mailing list