[jakarta-jmeter] 01/60: jmeter 2.3.4-1
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Mar 29 22:43:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jakarta-jmeter.
commit 5a6e01a73fdc408ee905d04a0fdd20f07aa2a35d
Author: Onkar Shinde <onkarshinde at ubuntu.com>
Date: Wed Sep 23 05:39:56 2009 +0000
jmeter 2.3.4-1
---
debian/README.Debian | 4 +
debian/README.source | 35 ++++++++
debian/changelog | 32 +++++++
debian/compat | 1 +
debian/control | 125 ++++++++++++++++++++++++++++
debian/copyright | 16 ++++
debian/jmeter-apidoc.install | 1 +
debian/jmeter-ftp.install | 1 +
debian/jmeter-help.install | 3 +
debian/jmeter-http.install | 1 +
debian/jmeter-java.install | 1 +
debian/jmeter-jms.install | 1 +
debian/jmeter-junit.install | 1 +
debian/jmeter-ldap.install | 1 +
debian/jmeter-mail.install | 1 +
debian/jmeter-tcp.install | 1 +
debian/jmeter.desktop | 8 ++
debian/jmeter.install | 11 +++
debian/jmeter.links | 2 +
debian/jmeter.properties | 1 +
debian/patches/01_fix_batik_imports.patch | 18 ++++
debian/patches/02_disable_components.patch | 37 ++++++++
debian/patches/03_fix_jtidy_call.patch | 59 +++++++++++++
debian/patches/04_files_from_upstream.patch | 119 ++++++++++++++++++++++++++
debian/patches/series | 4 +
debian/rules | 15 ++++
debian/watch | 2 +
debian/wrappers/jmeter | 13 +++
28 files changed, 514 insertions(+)
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..18016ef
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,4 @@
+JDBC and SOAP testing modules are not built because their build dependencies
+are not yet in archives.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Tue, 28 Jul 2009 21:55:59 +0530
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..85880c2
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,35 @@
+This package uses CDBS (and therefore simple-patchsys.mk) in order to
+apply patches to the upstream source. Patches are stored in
+debian/patches and their filenames usually end in .patch or .diff .
+For further details, see the man page for cdbs-edit-patch.
+
+All commands described below should be run from the top directory of the
+package source tree, unless otherwise stated.
+
+ * To generate the fully patched source, in a form ready for
+ editing, that would be built to create Debian packages, run:
+
+ make -f debian/rules apply-patches
+
+ Note: It has been proposed that, in future, this should happen
+ automatically when you run dpkg-source -x on a CDBS
+ simple-patchsys.mk source package. However, this proposal has
+ apparently not yet been implemented, so for now you have to do
+ it yourself like this.
+
+ * To modify the source and save those modifications so that
+ they will be applied when building the package, pick a
+ suitably informative patch file name, for example
+ 01_add_README.source_file.patch, and then run:
+
+ cdbs-edit-patch 01_add_README.source_file.patch
+
+ This will place you in a new shell in a temporary copy of the
+ source tree. Make your desired modifications to it, and then
+ exit the shell to create the patch file containing them (this
+ file will appear in debian/patches).
+
+ * To remove source modifications that are currently being
+ applied when building the package, run:
+
+ make -f debian/rules reverse-patches
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..df8e784
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,32 @@
+jakarta-jmeter (2.3.4-1) unstable; urgency=low
+
+ * Merge from Ubuntu. (Closes: #505877)
+ * debian/control
+ - Set maintainer to Debian Java Maintainers. Add myself as uploader.
+ - Add build dependency quilt.
+ - Add alternate build and runtime dependency on libjboss-j2ee-java as the
+ geronimo package is not present in Debian yet.
+ - Change section to java.
+ - Set standard version to 3.8.3. No changed needed.
+ - Add Vcs-* fields.
+ - Add 'DM-Upload-Allowed: yes'.
+ * debian/rules
+ - Change patch system to quilt.
+ - Add jboss-j2ee to DEB_JARS.
+ * debian/patches/series
+ - Add for use with quilt.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Wed, 23 Sep 2009 00:47:41 +0530
+
+jakarta-jmeter (2.3.4-0ubuntu1) karmic; urgency=low
+
+ * Initial release.
+ * debian/patches
+ - 01_fix_batik_imports.patch: Fix import statements for batik version 1.7.
+ - 02_disable_components.patch: Disable build of some components whose
+ dependencies are not yet packaged in Ubuntu.
+ - 03_fix_jtidy_call.patch: Fix PAI calls for the jtidy version in archives.
+ - 04_files_from_upstream.patch: Copy some important files from upstream
+ binary distribution.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Thu, 30 Jul 2009 10:15:07 +0530
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..4d54602
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,125 @@
+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>
+Build-Depends: debhelper (>=5), cdbs, ant, ant-optional, quilt
+Build-Depends-Indep: default-jdk, junit, libbatik-java, libbsf-java, libavalon-framework-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-jexl-java (>= 1.1), libcommons-lang-java, libcommons-net-java, libgeronimo-jms-1.1-spec-java | libjboss-j2ee-java, libgnumail-java, libhtmlparser-java, libjcharts-java, libjdom1-java, libjtidy-java, libexcalibur-logkit-java, libexcalibur-logger-java, liboro-java, libxalan2-java, libxstream-java, velocity
+Standards-Version: 3.8.3
+Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/jakarta-jmeter/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jakarta-jmeter/
+Homepage: http://jakarta.apache.org/jmeter/
+DM-Upload-Allowed: yes
+
+Package: jmeter
+Architecture: all
+Depends: ${misc:Depends}, default-jre | java2-runtime, java-wrappers (>= 0.1.14), bsh, libavalon-framework-java, libbatik-java, libbsf-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-jexl-java (>= 1.1), libcommons-lang-java, libexcalibur-logger-java, libexcalibur-logkit-java, libgnumail-java, libjcharts-java, libjtidy-java, liboro-java, libxalan2-java, libxstream-java, rhino
+Recommends: jmeter-http (= ${binary:Version}), jmeter-help (= ${binary:Version})
+Description: Load testing and performance measurement 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: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-io-java, libcommons-lang-java, libcommons-net-java, libexcalibur-logkit-java
+Description: Load testing and performance measurement 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 ftp testing module.
+
+Package: jmeter-http
+Architecture: all
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-httpclient-java, libcommons-io-java, libcommons-lang-java, libexcalibur-logkit-java, libhtmlparser-java, libjtidy-java, liboro-java, libxstream-java
+Description: Load testing and performance measurement 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 http testing module.
+
+Package: jmeter-java
+Architecture: all
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libbsf-java, libcommons-io-java, libexcalibur-logkit-java
+Description: Load testing and performance measurement 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 java testing module.
+
+Package: jmeter-jms
+Architecture: all
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libgeronimo-jms-1.1-spec-java, libexcalibur-logkit-java
+Description: Load testing and performance measurement 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 jms testing module.
+
+Package: jmeter-junit
+Architecture: all
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), junit, libexcalibur-logkit-java
+Description: Load testing and performance measurement 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 junit testing module.
+
+Package: jmeter-ldap
+Architecture: all
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-lang-java, libexcalibur-logkit-java
+Description: Load testing and performance measurement 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 ldap testing module.
+
+Package: jmeter-mail
+Architecture: all
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libgnumail-java, libexcalibur-logkit-java
+Description: Load testing and performance measurement 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 mail testing module.
+
+Package: jmeter-tcp
+Architecture: all
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-io-java, libexcalibur-logkit-java
+Description: Load testing and performance measurement 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 tcp testing module.
+
+Package: jmeter-help
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: jmeter (= ${binary:Version})
+Description: Load testing and performance measurement 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 user manual.
+
+Package: jmeter-apidoc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: jmeter (= ${binary:Version})
+Description: Load testing and performance measurement 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 API documentation.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..a03cd50
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,16 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: jakarta-jmeter
+Maintainer: The Apache Software Foundation
+Source: http://jakarta.apache.org/jmeter/
+
+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.
diff --git a/debian/jmeter-apidoc.install b/debian/jmeter-apidoc.install
new file mode 100644
index 0000000..0243c69
--- /dev/null
+++ b/debian/jmeter-apidoc.install
@@ -0,0 +1 @@
+docs/api/ usr/share/jmeter/docs/
diff --git a/debian/jmeter-ftp.install b/debian/jmeter-ftp.install
new file mode 100644
index 0000000..ce09a1f
--- /dev/null
+++ b/debian/jmeter-ftp.install
@@ -0,0 +1 @@
+lib/ext/ApacheJMeter_ftp.jar usr/share/jmeter/lib/ext/
diff --git a/debian/jmeter-help.install b/debian/jmeter-help.install
new file mode 100644
index 0000000..3529d59
--- /dev/null
+++ b/debian/jmeter-help.install
@@ -0,0 +1,3 @@
+docs/css/ usr/share/jmeter/docs/
+docs/images/ usr/share/jmeter/docs/
+printable_docs/ usr/share/jmeter/
diff --git a/debian/jmeter-http.install b/debian/jmeter-http.install
new file mode 100644
index 0000000..a52a1e1
--- /dev/null
+++ b/debian/jmeter-http.install
@@ -0,0 +1 @@
+lib/ext/ApacheJMeter_http.jar usr/share/jmeter/lib/ext/
diff --git a/debian/jmeter-java.install b/debian/jmeter-java.install
new file mode 100644
index 0000000..46ae986
--- /dev/null
+++ b/debian/jmeter-java.install
@@ -0,0 +1 @@
+lib/ext/ApacheJMeter_java.jar usr/share/jmeter/lib/ext/
diff --git a/debian/jmeter-jms.install b/debian/jmeter-jms.install
new file mode 100644
index 0000000..0dcd14c
--- /dev/null
+++ b/debian/jmeter-jms.install
@@ -0,0 +1 @@
+lib/ext/ApacheJMeter_jms.jar usr/share/jmeter/lib/ext/
diff --git a/debian/jmeter-junit.install b/debian/jmeter-junit.install
new file mode 100644
index 0000000..c3fca9c
--- /dev/null
+++ b/debian/jmeter-junit.install
@@ -0,0 +1 @@
+lib/ext/ApacheJMeter_junit.jar usr/share/jmeter/lib/ext/
diff --git a/debian/jmeter-ldap.install b/debian/jmeter-ldap.install
new file mode 100644
index 0000000..43ca23d
--- /dev/null
+++ b/debian/jmeter-ldap.install
@@ -0,0 +1 @@
+lib/ext/ApacheJMeter_ldap.jar usr/share/jmeter/lib/ext/
diff --git a/debian/jmeter-mail.install b/debian/jmeter-mail.install
new file mode 100644
index 0000000..33e78c1
--- /dev/null
+++ b/debian/jmeter-mail.install
@@ -0,0 +1 @@
+lib/ext/ApacheJMeter_mail.jar usr/share/jmeter/lib/ext/
diff --git a/debian/jmeter-tcp.install b/debian/jmeter-tcp.install
new file mode 100644
index 0000000..8e0e5f1
--- /dev/null
+++ b/debian/jmeter-tcp.install
@@ -0,0 +1 @@
+lib/ext/ApacheJMeter_tcp.jar usr/share/jmeter/lib/ext/
diff --git a/debian/jmeter.desktop b/debian/jmeter.desktop
new file mode 100644
index 0000000..65b3687
--- /dev/null
+++ b/debian/jmeter.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=JMeter
+Comment=Load testing application
+Exec=jmeter
+Icon=/usr/share/pixmaps/jmeter.jpg
+Terminal=false
+Type=Application
+Categories=Development;
diff --git a/debian/jmeter.install b/debian/jmeter.install
new file mode 100644
index 0000000..1698514
--- /dev/null
+++ b/debian/jmeter.install
@@ -0,0 +1,11 @@
+debian/jmeter.properties usr/share/jmeter/bin/
+bin/upgrade.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/
diff --git a/debian/jmeter.links b/debian/jmeter.links
new file mode 100644
index 0000000..d31fc5b
--- /dev/null
+++ b/debian/jmeter.links
@@ -0,0 +1,2 @@
+usr/share/jmeter/bin/jmeter usr/bin/jmeter
+usr/share/jmeter/bin/jmeter-server usr/bin/jmeter-server
diff --git a/debian/jmeter.properties b/debian/jmeter.properties
new file mode 100644
index 0000000..bd920d8
--- /dev/null
+++ b/debian/jmeter.properties
@@ -0,0 +1 @@
+# Blank properties file. Jmeter does not start without this.
diff --git a/debian/patches/01_fix_batik_imports.patch b/debian/patches/01_fix_batik_imports.patch
new file mode 100644
index 0000000..8987a6d
--- /dev/null
+++ b/debian/patches/01_fix_batik_imports.patch
@@ -0,0 +1,18 @@
+diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/src/core/org/apache/jmeter/save/SaveGraphicsService.java jakarta-jmeter-2.3.4.new/src/core/org/apache/jmeter/save/SaveGraphicsService.java
+--- jakarta-jmeter-2.3.4/src/core/org/apache/jmeter/save/SaveGraphicsService.java 2009-06-17 20:59:28.000000000 +0530
++++ jakarta-jmeter-2.3.4.new/src/core/org/apache/jmeter/save/SaveGraphicsService.java 2009-07-22 01:49:16.000000000 +0530
+@@ -28,10 +28,10 @@
+
+ import javax.swing.JComponent;
+
+-import org.apache.xmlgraphics.image.codec.png.PNGEncodeParam;
+-import org.apache.xmlgraphics.image.codec.png.PNGImageEncoder;
+-import org.apache.xmlgraphics.image.codec.tiff.TIFFEncodeParam;
+-import org.apache.xmlgraphics.image.codec.tiff.TIFFImageEncoder;
++import org.apache.batik.ext.awt.image.codec.png.PNGEncodeParam;
++import org.apache.batik.ext.awt.image.codec.png.PNGImageEncoder;
++import org.apache.batik.ext.awt.image.codec.tiff.TIFFEncodeParam;
++import org.apache.batik.ext.awt.image.codec.tiff.TIFFImageEncoder;
+ import org.apache.jmeter.util.JMeterUtils;
+ import org.apache.jorphan.util.JOrphanUtils;
+
diff --git a/debian/patches/02_disable_components.patch b/debian/patches/02_disable_components.patch
new file mode 100644
index 0000000..ad962b8
--- /dev/null
+++ b/debian/patches/02_disable_components.patch
@@ -0,0 +1,37 @@
+diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/build.xml jakarta-jmeter-2.3.4.new/build.xml
+--- jakarta-jmeter-2.3.4/build.xml 2009-06-17 20:58:58.000000000 +0530
++++ jakarta-jmeter-2.3.4.new/build.xml 2009-07-28 00:40:07.000000000 +0530
+@@ -508,8 +508,9 @@
+ <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}" deprecation="${deprecation}" encoding="${encoding}">
++ <javac sourcepath="" srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}" deprecation="${deprecation}" encoding="${encoding}">
+ <include name="**/*.java"/>
++ <exclude name="**/WebServiceSampler*.java"/>
+ <classpath>
+ <pathelement location="${build.jorphan}"/>
+ <pathelement location="${build.core}"/>
+@@ -647,7 +648,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}"/>
+@@ -848,11 +849,11 @@
+ </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">
+ <fileset dir="${build.jdbc}" includes="**/*.class" />
+ <fileset dir="${src.jdbc}" includes="**/*.properties" />
+ <metainf dir="." includes="LICENSE,NOTICE"/>
+- </jar>
++ </jar-->
+
+ <!-- java -->
+ <jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
diff --git a/debian/patches/03_fix_jtidy_call.patch b/debian/patches/03_fix_jtidy_call.patch
new file mode 100644
index 0000000..29868b6
--- /dev/null
+++ b/debian/patches/03_fix_jtidy_call.patch
@@ -0,0 +1,59 @@
+diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/src/components/org/apache/jmeter/assertions/HTMLAssertion.java jakarta-jmeter-2.3.4.new/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
+--- jakarta-jmeter-2.3.4/src/components/org/apache/jmeter/assertions/HTMLAssertion.java 2009-06-17 20:58:59.000000000 +0530
++++ jakarta-jmeter-2.3.4.new/src/components/org/apache/jmeter/assertions/HTMLAssertion.java 2009-07-24 02:33:36.000000000 +0530
+@@ -96,7 +96,8 @@
+ log.debug("xhtml mode: " + isXHTML());
+ log.debug("xml mode: " + isXML());
+ tidy = new Tidy();
+- tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
++ tidy.setInputEncoding("UTF-8");
++ tidy.setOutputEncoding("UTF-8");
+ tidy.setQuiet(false);
+ tidy.setShowWarnings(true);
+ tidy.setOnlyErrors(isErrorsOnly());
+diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/src/core/org/apache/jmeter/util/XPathUtil.java jakarta-jmeter-2.3.4.new/src/core/org/apache/jmeter/util/XPathUtil.java
+--- jakarta-jmeter-2.3.4/src/core/org/apache/jmeter/util/XPathUtil.java 2009-06-17 20:59:36.000000000 +0530
++++ jakarta-jmeter-2.3.4.new/src/core/org/apache/jmeter/util/XPathUtil.java 2009-07-24 02:33:36.000000000 +0530
+@@ -208,7 +208,8 @@
+ */
+ public static Tidy makeTidyParser(boolean quiet, boolean showWarnings, boolean isXml, StringWriter stringWriter) {
+ Tidy tidy = new Tidy();
+- tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
++ tidy.setInputEncoding("UTF-8");
++ tidy.setOutputEncoding("UTF-8");
+ tidy.setQuiet(quiet);
+ tidy.setShowWarnings(showWarnings);
+ tidy.setMakeClean(true);
+@@ -251,4 +252,4 @@
+ }
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java jakarta-jmeter-2.3.4.new/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
+--- jakarta-jmeter-2.3.4/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java 2009-06-17 20:59:52.000000000 +0530
++++ jakarta-jmeter-2.3.4.new/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java 2009-07-24 02:34:18.000000000 +0530
+@@ -208,7 +208,8 @@
+ public static Tidy getParser() {
+ log.debug("Start : getParser1");
+ Tidy tidy = new Tidy();
+- tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
++ tidy.setInputEncoding("UTF-8");
++ tidy.setOutputEncoding("UTF-8");
+ tidy.setQuiet(true);
+ tidy.setShowWarnings(false);
+
+diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java jakarta-jmeter-2.3.4.new/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
+--- jakarta-jmeter-2.3.4/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java 2009-06-17 20:59:52.000000000 +0530
++++ jakarta-jmeter-2.3.4.new/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java 2009-07-24 02:35:00.000000000 +0530
+@@ -194,7 +194,8 @@
+ private static Tidy getTidyParser() {
+ log.debug("Start : getParser");
+ Tidy tidy = new Tidy();
+- tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
++ tidy.setInputEncoding("UTF-8");
++ tidy.setOutputEncoding("UTF-8");
+ tidy.setQuiet(true);
+ tidy.setShowWarnings(false);
+ if (log.isDebugEnabled()) {
diff --git a/debian/patches/04_files_from_upstream.patch b/debian/patches/04_files_from_upstream.patch
new file mode 100644
index 0000000..b706147
--- /dev/null
+++ b/debian/patches/04_files_from_upstream.patch
@@ -0,0 +1,119 @@
+diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/bin/jmeter-server jakarta-jmeter-2.3.4.new/bin/jmeter-server
+--- jakarta-jmeter-2.3.4/bin/jmeter-server 1970-01-01 05:30:00.000000000 +0530
++++ jakarta-jmeter-2.3.4.new/bin/jmeter-server 2009-07-28 00:14:11.000000000 +0530
+@@ -0,0 +1,32 @@
++#!/bin/sh
++
++## Licensed to the Apache Software Foundation (ASF) under one or more
++## contributor license agreements. See the NOTICE file distributed with
++## this work for additional information regarding copyright ownership.
++## The ASF licenses this file to You under the Apache License, Version 2.0
++## (the "License"); you may not use this file except in compliance with
++## the License. You may obtain a copy of the License at
++##
++## http://www.apache.org/licenses/LICENSE-2.0
++##
++## Unless required by applicable law or agreed to in writing, software
++## distributed under the License is distributed on an "AS IS" BASIS,
++## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++## See the License for the specific language governing permissions and
++## limitations under the License.
++
++## To change the RMI/Server port:
++##
++## SERVER_PORT=1234 jmeter-server
++##
++
++DIRNAME=`dirname $0`
++
++# If the client fails with:
++# ERROR - jmeter.engine.ClientJMeterEngine: java.rmi.ConnectException: Connection refused to host: 127.0.0.1
++# then it may be due to the server host returning 127.0.0.1 as its address
++
++# One way to fix this is to define RMI_HOST_DEF below
++#RMI_HOST_DEF=-Djava.rmi.server.hostname=xxx.xxx.xxx.xxx
++
++${DIRNAME}/jmeter ${RMI_HOST_DEF} -Dserver_port=${SERVER_PORT:-1099} -s -j jmeter-server.log "$@"
+diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/bin/upgrade.properties jakarta-jmeter-2.3.4.new/bin/upgrade.properties
+--- jakarta-jmeter-2.3.4/bin/upgrade.properties 1970-01-01 05:30:00.000000000 +0530
++++ jakarta-jmeter-2.3.4.new/bin/upgrade.properties 2009-07-28 00:13:58.000000000 +0530
+@@ -0,0 +1,78 @@
++# Class, property and value upgrade equivalences.
++
++## Licensed to the Apache Software Foundation (ASF) under one or more
++## contributor license agreements. See the NOTICE file distributed with
++## this work for additional information regarding copyright ownership.
++## The ASF licenses this file to You under the Apache License, Version 2.0
++## (the "License"); you may not use this file except in compliance with
++## the License. You may obtain a copy of the License at
++##
++## http://www.apache.org/licenses/LICENSE-2.0
++##
++## Unless required by applicable law or agreed to in writing, software
++## distributed under the License is distributed on an "AS IS" BASIS,
++## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++## See the License for the specific language governing permissions and
++## limitations under the License.
++
++#
++# Format is as follows --
++# for renamed test element & GUI classes:
++# old.class.Name=new.class.Name
++# old.class.Name|guiClassName=new.class.Name
++# (e.g. for ConfigTestElement)
++#
++# for renamed / deleted properties:
++# class.Name/Old.propertyName=newPropertyName
++# if newPropertyName is omitted, then property is deleted
++#
++# for renamed values:
++# old.class.Name.old.propertyName/oldValue=newValue
++#
++
++org.apache.jmeter.protocol.http.config.gui.UrlConfigGui=org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui
++org.apache.jmeter.assertions.Assertion=org.apache.jmeter.assertions.ResponseAssertion
++org.apache.jmeter.protocol.http.sampler.HTTPSamplerFull=org.apache.jmeter.protocol.http.sampler.HTTPSampler
++org.apache.jmeter.control.gui.RecordController=org.apache.jmeter.protocol.http.control.gui.RecordController
++
++org.apache.jmeter.timers.gui.ConstantThroughputTimerGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
++org.apache.jmeter.timers.ConstantThroughputTimer/ConstantThroughputTimer.throughput=throughput
++
++org.apache.jmeter.protocol.jdbc.control.gui.JdbcTestSampleGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
++org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler/JDBCSampler.query=query
++#org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler.JDBCSampler.dataSource/NULL=
++
++# Convert DBconfig
++org.apache.jmeter.protocol.jdbc.config.gui.DbConfigGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
++org.apache.jmeter.config.ConfigTestElement|org.apache.jmeter.protocol.jdbc.config.gui.DbConfigGui=org.apache.jmeter.protocol.jdbc.config.DataSourceElement
++org.apache.jmeter.protocol.jdbc.config.DataSourceElement/JDBCSampler.url=dbUrl
++org.apache.jmeter.protocol.jdbc.config.DataSourceElement/JDBCSampler.driver=driver
++org.apache.jmeter.protocol.jdbc.config.DataSourceElement/JDBCSampler.query=query
++org.apache.jmeter.protocol.jdbc.config.DataSourceElement/ConfigTestElement.username=username
++org.apache.jmeter.protocol.jdbc.config.DataSourceElement/ConfigTestElement.password=password
++
++# Convert PoolConfig
++org.apache.jmeter.protocol.jdbc.config.gui.PoolConfigGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
++org.apache.jmeter.config.ConfigTestElement|org.apache.jmeter.protocol.jdbc.config.gui.PoolConfigGui=org.apache.jmeter.protocol.jdbc.config.DataSourceElement
++org.apache.jmeter.protocol.jdbc.config.DataSourceElement/JDBCSampler.connections=
++org.apache.jmeter.protocol.jdbc.config.DataSourceElement/JDBCSampler.connPoolClass=
++org.apache.jmeter.protocol.jdbc.config.DataSourceElement/JDBCSampler.maxuse=poolMax
++
++# SQL Config
++org.apache.jmeter.config.ConfigTestElement/JDBCSampler.query=query
++org.apache.jmeter.protocol.http.control.Header/TestElement.name=Header.name
++
++# Upgrade AccessLogSampler
++org.apache.jmeter.protocol.http.control.gui.AccessLogSamplerGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
++org.apache.jmeter.protocol.http.sampler.AccessLogSampler/AccessLogSampler.log_file=logFile
++org.apache.jmeter.protocol.http.sampler.AccessLogSampler/HTTPSampler.port=portString
++#Is the following used now?
++#org.apache.jmeter.protocol.http.sampler.AccessLogSampler/AccessLogSampler.generator_class_name=
++#Looks to be a new field
++#filterClassName
++org.apache.jmeter.protocol.http.sampler.AccessLogSampler/HTTPSampler.domain=domain
++org.apache.jmeter.protocol.http.sampler.AccessLogSampler/AccessLogSampler.parser_class_name=parserClassName
++org.apache.jmeter.protocol.http.sampler.AccessLogSampler/HTTPSampler.image_parser=imageParsing
++
++# This class has been deleted
++org.apache.jmeter.protocol.jdbc.config.gui.SqlConfigGui=org.apache.jmeter.config.gui.ObsoleteGui
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2688c7c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01_fix_batik_imports.patch
+02_disable_components.patch
+03_fix_jtidy_call.patch
+04_files_from_upstream.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..0d4a30e
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME_DIRS := /usr/lib/jvm/default-java
+DEB_JARS := ant-nodeps avalon-framework batik bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-lang commons-net geronimo-jms-1.1-spec gnumail jboss-j2ee jcharts jdom0 jdom1 jtidy junit libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xstream velocity
+DEB_ANT_BUILD_TARGET := install docs-printable docs-api
+ANT_OPTS := -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
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..0474b6d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://www.apache.org/dist/jakarta/jmeter/source/jakarta-jmeter-([\d\.]+)_src\.tgz
diff --git a/debian/wrappers/jmeter b/debian/wrappers/jmeter
new file mode 100644
index 0000000..cbf6d28
--- /dev/null
+++ b/debian/wrappers/jmeter
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Include the wrappers utility script
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+find_jars avalon-framework batik bsf bsh commons-collections3
+find_jars commons-httpclient commons-io commons-jexl commons-lang commons-net
+find_jars excalibur-logger excalibur-logkit gnumail jcharts jdom1 jtidy js
+find_jars junit libhtmlparser oro xalan2 xstream
+find_jars /usr/share/jmeter/lib/jorphan.jar
+find_jars /usr/share/jmeter/bin/ApacheJMeter.jar
+
+run_java -Djmeter.home=/usr/share/jmeter org.apache.jmeter.NewDriver "$@"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-jmeter.git
More information about the pkg-java-commits
mailing list