[pkg-java] r13543 - in trunk/jakarta-jmeter/debian: . patches source wrappers
Onkar Shinde
onkarshinde-guest at alioth.debian.org
Sun Apr 17 09:15:45 UTC 2011
Author: onkarshinde-guest
Date: 2011-04-17 09:15:41 +0000 (Sun, 17 Apr 2011)
New Revision: 13543
Added:
trunk/jakarta-jmeter/debian/source/
trunk/jakarta-jmeter/debian/source/format
Removed:
trunk/jakarta-jmeter/debian/README.source
trunk/jakarta-jmeter/debian/jmeter.properties
trunk/jakarta-jmeter/debian/patches/01_fix_batik_imports.patch
trunk/jakarta-jmeter/debian/patches/03_fix_jtidy_call.patch
trunk/jakarta-jmeter/debian/patches/04_files_from_upstream.patch
Modified:
trunk/jakarta-jmeter/debian/changelog
trunk/jakarta-jmeter/debian/control
trunk/jakarta-jmeter/debian/jmeter.install
trunk/jakarta-jmeter/debian/patches/02_disable_components.patch
trunk/jakarta-jmeter/debian/patches/series
trunk/jakarta-jmeter/debian/rules
trunk/jakarta-jmeter/debian/wrappers/jmeter
Log:
Prepared 2.4-1 release
Deleted: trunk/jakarta-jmeter/debian/README.source
===================================================================
--- trunk/jakarta-jmeter/debian/README.source 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/README.source 2011-04-17 09:15:41 UTC (rev 13543)
@@ -1,35 +0,0 @@
-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
Modified: trunk/jakarta-jmeter/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/changelog 2011-04-17 09:15:41 UTC (rev 13543)
@@ -1,3 +1,29 @@
+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
Modified: trunk/jakarta-jmeter/debian/control
===================================================================
--- trunk/jakarta-jmeter/debian/control 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/control 2011-04-17 09:15:41 UTC (rev 13543)
@@ -4,8 +4,8 @@
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, libjboss-j2ee-java, libgnumail-java, libhtmlparser-java, libjcharts-java, libjdom1-java, libjtidy-java, libexcalibur-logkit-java, libexcalibur-logger-java, liboro-java, libxalan2-java, libxmlgraphics-commons-java, libxstream-java, rhino, velocity
-Standards-Version: 3.8.3
+Build-Depends-Indep: default-jdk, default-jdk-doc, junit4, 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, libjboss-j2ee-java, libgnumail-java, libhtmlparser-java, libjcharts-java, libjdom1-java, libjtidy-java, libexcalibur-logkit-java, libexcalibur-logger-java, liboro-java, libxalan2-java, libxmlgraphics-commons-java, libxstream-java, rhino, velocity
+Standards-Version: 3.9.1
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/
@@ -15,7 +15,7 @@
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, libxmlgraphics-commons-java, libxstream-java, rhino
Recommends: jmeter-http (= ${binary:Version}), jmeter-help (= ${binary:Version})
-Description: Load testing and performance measurement application
+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.
@@ -25,7 +25,7 @@
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
+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.
@@ -35,7 +35,7 @@
Package: jmeter-http
Architecture: all
Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-httpclient-java, libcommons-io-java, libcommons-lang-java, libcommons-logging-java, libexcalibur-logkit-java, libhtmlparser-java, libjtidy-java, liboro-java, libxstream-java
-Description: Load testing and performance measurement application
+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.
@@ -45,7 +45,7 @@
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
+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.
@@ -55,7 +55,7 @@
Package: jmeter-jms
Architecture: all
Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libgeronimo-jms-1.1-spec-java | libjboss-j2ee-java, libexcalibur-logkit-java
-Description: Load testing and performance measurement application
+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.
@@ -64,8 +64,8 @@
Package: jmeter-junit
Architecture: all
-Depends: ${misc:Depends}, jmeter (= ${binary:Version}), junit, libexcalibur-logkit-java
-Description: Load testing and performance measurement application
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), junit4, libexcalibur-logkit-java
+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.
@@ -75,7 +75,7 @@
Package: jmeter-ldap
Architecture: all
Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-lang-java, libexcalibur-logkit-java
-Description: Load testing and performance measurement application
+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.
@@ -85,7 +85,7 @@
Package: jmeter-mail
Architecture: all
Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libgnumail-java, libexcalibur-logkit-java
-Description: Load testing and performance measurement application
+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.
@@ -95,7 +95,7 @@
Package: jmeter-tcp
Architecture: all
Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-io-java, libexcalibur-logkit-java
-Description: Load testing and performance measurement application
+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.
@@ -106,7 +106,7 @@
Architecture: all
Depends: ${misc:Depends}
Suggests: jmeter (= ${binary:Version})
-Description: Load testing and performance measurement application
+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.
@@ -117,7 +117,7 @@
Architecture: all
Depends: ${misc:Depends}
Suggests: jmeter (= ${binary:Version})
-Description: Load testing and performance measurement application
+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.
Modified: trunk/jakarta-jmeter/debian/jmeter.install
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter.install 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/jmeter.install 2011-04-17 09:15:41 UTC (rev 13543)
@@ -1,4 +1,3 @@
-debian/jmeter.properties usr/share/jmeter/bin/
bin/*.properties usr/share/jmeter/bin/
bin/ApacheJMeter.jar usr/share/jmeter/bin/
lib/*.jar usr/share/jmeter/lib/
Deleted: trunk/jakarta-jmeter/debian/jmeter.properties
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter.properties 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/jmeter.properties 2011-04-17 09:15:41 UTC (rev 13543)
@@ -1 +0,0 @@
-# Blank properties file. Jmeter does not start without this.
Deleted: trunk/jakarta-jmeter/debian/patches/01_fix_batik_imports.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/01_fix_batik_imports.patch 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/patches/01_fix_batik_imports.patch 2011-04-17 09:15:41 UTC (rev 13543)
@@ -1,18 +0,0 @@
-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;
-
Modified: trunk/jakarta-jmeter/debian/patches/02_disable_components.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/02_disable_components.patch 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/patches/02_disable_components.patch 2011-04-17 09:15:41 UTC (rev 13543)
@@ -1,18 +1,34 @@
-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 @@
+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 2011-04-16 23:48:31.000000000 +0530
++++ b/build.xml 2011-04-17 00:23:03.000000000 +0530
+@@ -497,9 +497,10 @@
+
+ <target name="compile-components" depends="compile-jorphan,compile-core" description="Compile generic (protocol-independent) components.">
+ <mkdir dir="${build.components}"/>
+- <javac srcdir="${src.components}" destdir="${build.components}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}"
++ <javac sourcepath="" srcdir="${src.components}" destdir="${build.components}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}"
+ includeAntRuntime="${includeAntRuntime}" deprecation="${deprecation}" encoding="${encoding}">
+ <include name="**/*.java"/>
++ <exclude name="**/SMIMEAssertion*.java"/>
+ <classpath>
+ <pathelement location="${build.jorphan}"/>
+ <pathelement location="${build.core}"/>
+@@ -524,9 +525,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}" 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}">
+- <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}"/>
-@@ -647,7 +648,7 @@
+@@ -673,7 +675,7 @@
</javac>
</target>
@@ -21,7 +37,7 @@
<target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components.">
<mkdir dir="${build.examples}"/>
-@@ -848,11 +849,11 @@
+@@ -879,11 +881,11 @@
</jar>
<!-- jdbc -->
@@ -35,3 +51,12 @@
<!-- java -->
<jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
+@@ -1564,7 +1566,7 @@
+ packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
+ excludepackagenames="org.apache.jorphan.timer">
+ <classpath refid="classpath"/>
+- <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
++ <link href="file:///usr/share/doc/default-jdk-doc/api/"/>
+ </javadoc>
+ </target>
+
Deleted: trunk/jakarta-jmeter/debian/patches/03_fix_jtidy_call.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/03_fix_jtidy_call.patch 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/patches/03_fix_jtidy_call.patch 2011-04-17 09:15:41 UTC (rev 13543)
@@ -1,59 +0,0 @@
-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()) {
Deleted: trunk/jakarta-jmeter/debian/patches/04_files_from_upstream.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/04_files_from_upstream.patch 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/patches/04_files_from_upstream.patch 2011-04-17 09:15:41 UTC (rev 13543)
@@ -1,441 +0,0 @@
-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-09-30 10:48:16.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/saveservice.properties jakarta-jmeter-2.3.4.new/bin/saveservice.properties
---- jakarta-jmeter-2.3.4/bin/saveservice.properties 1970-01-01 05:30:00.000000000 +0530
-+++ jakarta-jmeter-2.3.4.new/bin/saveservice.properties 2009-09-30 10:48:30.000000000 +0530
-@@ -0,0 +1,317 @@
-+#---------------------------------------------------------
-+# SAVESERVICE PROPERTIES
-+#---------------------------------------------------------
-+
-+## 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.
-+
-+#---------------------------------------------------------
-+# N.B. To ensure backward compatibility, please do not
-+# change or delete any entries that have been used.
-+# New entries can be added as necessary.
-+#
-+# Note that keys starting with an underscore are special,
-+# and are not used as aliases.
-+#
-+# Please keep the entries in alphabetical order within the sections
-+# to reduce the likelihood of duplicates
-+#
-+# version number of this file (automatically generated by SVN)
-+_file_version=$Revision: 697317 $
-+#
-+# Conversion version (for JMX output files)
-+# Must be updated if the file has been changed since the previous release
-+#
-+# 1.7 = 2.1.1
-+# 1.8 = 2.1.2
-+# (Some version updates were missed here...)
-+# 2.0 = 2.3.1
-+# 2.1 = 2.3.2
-+#
-+_version=2.1
-+#
-+#
-+# Character set encoding used to read and write JMeter XML files
-+#
-+_file_encoding=UTF-8
-+#
-+#---------------------------------------------------------
-+#
-+# The following properties are used to create aliases
-+# [Must all start with capital letter]
-+#
-+AccessLogSampler=org.apache.jmeter.protocol.http.sampler.AccessLogSampler
-+AjpSampler=org.apache.jmeter.protocol.http.sampler.AjpSampler
-+AjpSamplerGui=org.apache.jmeter.protocol.http.control.gui.AjpSamplerGui
-+AnchorModifier=org.apache.jmeter.protocol.http.modifier.AnchorModifier
-+AnchorModifierGui=org.apache.jmeter.protocol.http.modifier.gui.AnchorModifierGui
-+Argument=org.apache.jmeter.config.Argument
-+Arguments=org.apache.jmeter.config.Arguments
-+ArgumentsPanel=org.apache.jmeter.config.gui.ArgumentsPanel
-+AssertionGui=org.apache.jmeter.assertions.gui.AssertionGui
-+AssertionVisualizer=org.apache.jmeter.visualizers.AssertionVisualizer
-+AuthManager=org.apache.jmeter.protocol.http.control.AuthManager
-+Authorization=org.apache.jmeter.protocol.http.control.Authorization
-+AuthPanel=org.apache.jmeter.protocol.http.gui.AuthPanel
-+BarChart=org.apache.jmeter.testelement.BarChart
-+BarChartGui=org.apache.jmeter.report.gui.BarChartGui
-+BeanShellAssertion=org.apache.jmeter.assertions.BeanShellAssertion
-+BeanShellAssertionGui=org.apache.jmeter.assertions.gui.BeanShellAssertionGui
-+BeanShellListener=org.apache.jmeter.visualizers.BeanShellListener
-+BeanShellPostProcessor=org.apache.jmeter.extractor.BeanShellPostProcessor
-+BeanShellPreProcessor=org.apache.jmeter.modifiers.BeanShellPreProcessor
-+BeanShellSampler=org.apache.jmeter.protocol.java.sampler.BeanShellSampler
-+BeanShellSamplerGui=org.apache.jmeter.protocol.java.control.gui.BeanShellSamplerGui
-+BeanShellTimer=org.apache.jmeter.timers.BeanShellTimer
-+BSFAssertion=org.apache.jmeter.assertions.BSFAssertion
-+BSFListener=org.apache.jmeter.visualizers.BSFListener
-+BSFPreProcessor=org.apache.jmeter.modifiers.BSFPreProcessor
-+BSFPostProcessor=org.apache.jmeter.extractor.BSFPostProcessor
-+BSFSampler=org.apache.jmeter.protocol.java.sampler.BSFSampler
-+BSFSamplerGui=org.apache.jmeter.protocol.java.control.gui.BSFSamplerGui
-+CacheManager=org.apache.jmeter.protocol.http.control.CacheManager
-+CacheManagerGui=org.apache.jmeter.protocol.http.gui.CacheManagerGui
-+ConfigTestElement=org.apache.jmeter.config.ConfigTestElement
-+ConstantThroughputTimer=org.apache.jmeter.timers.ConstantThroughputTimer
-+ConstantTimer=org.apache.jmeter.timers.ConstantTimer
-+ConstantTimerGui=org.apache.jmeter.timers.gui.ConstantTimerGui
-+Cookie=org.apache.jmeter.protocol.http.control.Cookie
-+CookieManager=org.apache.jmeter.protocol.http.control.CookieManager
-+CookiePanel=org.apache.jmeter.protocol.http.gui.CookiePanel
-+CounterConfig=org.apache.jmeter.modifiers.CounterConfig
-+CounterConfigGui=org.apache.jmeter.modifiers.gui.CounterConfigGui
-+CSVDataSet=org.apache.jmeter.config.CSVDataSet
-+DebugPostProcessor=org.apache.jmeter.extractor.DebugPostProcessor
-+DebugSampler=org.apache.jmeter.sampler.DebugSampler
-+DistributionGraphVisualizer=org.apache.jmeter.visualizers.DistributionGraphVisualizer
-+DurationAssertion=org.apache.jmeter.assertions.DurationAssertion
-+DurationAssertionGui=org.apache.jmeter.assertions.gui.DurationAssertionGui
-+# Should really have been defined as floatProp to agree with other properties
-+# No point changing this now
-+FloatProperty=org.apache.jmeter.testelement.property.FloatProperty
-+ForeachController=org.apache.jmeter.control.ForeachController
-+ForeachControlPanel=org.apache.jmeter.control.gui.ForeachControlPanel
-+FtpConfigGui=org.apache.jmeter.protocol.ftp.config.gui.FtpConfigGui
-+FTPSampler=org.apache.jmeter.protocol.ftp.sampler.FTPSampler
-+FtpTestSamplerGui=org.apache.jmeter.protocol.ftp.control.gui.FtpTestSamplerGui
-+GaussianRandomTimer=org.apache.jmeter.timers.GaussianRandomTimer
-+GaussianRandomTimerGui=org.apache.jmeter.timers.gui.GaussianRandomTimerGui
-+GenericController=org.apache.jmeter.control.GenericController
-+GraphAccumVisualizer=org.apache.jmeter.visualizers.GraphAccumVisualizer
-+GraphVisualizer=org.apache.jmeter.visualizers.GraphVisualizer
-+Header=org.apache.jmeter.protocol.http.control.Header
-+HeaderManager=org.apache.jmeter.protocol.http.control.HeaderManager
-+HeaderPanel=org.apache.jmeter.protocol.http.gui.HeaderPanel
-+HTMLAssertion=org.apache.jmeter.assertions.HTMLAssertion
-+HTMLAssertionGui=org.apache.jmeter.assertions.gui.HTMLAssertionGui
-+HTMLReportWriter=org.apache.jmeter.report.writers.HTMLReportWriter
-+HTMLReportWriterGui=org.apache.jmeter.report.writers.gui.HTMLReportWriterGui
-+HTTPArgument=org.apache.jmeter.protocol.http.util.HTTPArgument
-+HTTPArgumentsPanel=org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel
-+HTTPFileArg=org.apache.jmeter.protocol.http.util.HTTPFileArg
-+HTTPFileArgs=org.apache.jmeter.protocol.http.util.HTTPFileArgs
-+HttpDefaultsGui=org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui
-+HttpGenericSampler=org.apache.jmeter.protocol.http.sampler.HttpGenericSampler
-+HttpGenericSamplerGui=org.apache.jmeter.protocol.http.control.gui.HttpGenericSamplerGui
-+HTTPSampler=org.apache.jmeter.protocol.http.sampler.HTTPSampler
-+HttpMirrorControl=org.apache.jmeter.protocol.http.control.HttpMirrorControl
-+HttpMirrorControlGui=org.apache.jmeter.protocol.http.control.gui.HttpMirrorControlGui
-+HTTPSampler2=org.apache.jmeter.protocol.http.sampler.HTTPSampler2
-+HttpTestSampleGui=org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui
-+HttpTestSampleGui2=org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui2
-+IfController=org.apache.jmeter.control.IfController
-+IfControllerPanel=org.apache.jmeter.control.gui.IfControllerPanel
-+IncludeController=org.apache.jmeter.control.IncludeController
-+IncludeControllerGui=org.apache.jmeter.control.gui.IncludeControllerGui
-+InterleaveControl=org.apache.jmeter.control.InterleaveControl
-+InterleaveControlGui=org.apache.jmeter.control.gui.InterleaveControlGui
-+JavaConfig=org.apache.jmeter.protocol.java.config.JavaConfig
-+JavaConfigGui=org.apache.jmeter.protocol.java.config.gui.JavaConfigGui
-+JavaSampler=org.apache.jmeter.protocol.java.sampler.JavaSampler
-+JavaTestSamplerGui=org.apache.jmeter.protocol.java.control.gui.JavaTestSamplerGui
-+JDBCDataSource=org.apache.jmeter.protocol.jdbc.config.DataSourceElement
-+JDBCSampler=org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler
-+JMSConfigGui=org.apache.jmeter.protocol.jms.control.gui.JMSConfigGui
-+JMSPublisherGui=org.apache.jmeter.protocol.jms.control.gui.JMSPublisherGui
-+JMSSampler=org.apache.jmeter.protocol.jms.sampler.JMSSampler
-+JMSSubscriberGui=org.apache.jmeter.protocol.jms.control.gui.JMSSubscriberGui
-+JUnitSampler=org.apache.jmeter.protocol.java.sampler.JUnitSampler
-+JUnitTestSamplerGui=org.apache.jmeter.protocol.java.control.gui.JUnitTestSamplerGui
-+LDAPArgument=org.apache.jmeter.protocol.ldap.config.gui.LDAPArgument
-+LDAPArguments=org.apache.jmeter.protocol.ldap.config.gui.LDAPArguments
-+LDAPArgumentsPanel=org.apache.jmeter.protocol.ldap.config.gui.LDAPArgumentsPanel
-+LdapConfigGui=org.apache.jmeter.protocol.ldap.config.gui.LdapConfigGui
-+LdapExtConfigGui=org.apache.jmeter.protocol.ldap.config.gui.LdapExtConfigGui
-+LDAPExtSampler=org.apache.jmeter.protocol.ldap.sampler.LDAPExtSampler
-+LdapExtTestSamplerGui=org.apache.jmeter.protocol.ldap.control.gui.LdapExtTestSamplerGui
-+LDAPSampler=org.apache.jmeter.protocol.ldap.sampler.LDAPSampler
-+LdapTestSamplerGui=org.apache.jmeter.protocol.ldap.control.gui.LdapTestSamplerGui
-+LineChart=org.apache.jmeter.testelement.LineChart
-+LineGraphGui=org.apache.jmeter.report.gui.LineGraphGui
-+LogicControllerGui=org.apache.jmeter.control.gui.LogicControllerGui
-+LoginConfig=org.apache.jmeter.config.LoginConfig
-+LoginConfigGui=org.apache.jmeter.config.gui.LoginConfigGui
-+LoopController=org.apache.jmeter.control.LoopController
-+LoopControlPanel=org.apache.jmeter.control.gui.LoopControlPanel
-+MailerModel=org.apache.jmeter.reporters.MailerModel
-+MailerResultCollector=org.apache.jmeter.reporters.MailerResultCollector
-+MailerVisualizer=org.apache.jmeter.visualizers.MailerVisualizer
-+MailReaderSampler=org.apache.jmeter.protocol.mail.sampler.MailReaderSampler
-+MailReaderSamplerGui=org.apache.jmeter.protocol.mail.sampler.gui.MailReaderSamplerGui
-+MD5HexAssertion=org.apache.jmeter.assertions.MD5HexAssertion
-+MD5HexAssertionGUI=org.apache.jmeter.assertions.gui.MD5HexAssertionGUI
-+ModuleController=org.apache.jmeter.control.ModuleController
-+ModuleControllerGui=org.apache.jmeter.control.gui.ModuleControllerGui
-+MonitorHealthVisualizer=org.apache.jmeter.visualizers.MonitorHealthVisualizer
-+NamePanel=org.apache.jmeter.gui.NamePanel
-+OnceOnlyController=org.apache.jmeter.control.OnceOnlyController
-+OnceOnlyControllerGui=org.apache.jmeter.control.gui.OnceOnlyControllerGui
-+ParamMask=org.apache.jmeter.protocol.http.modifier.ParamMask
-+ParamModifier=org.apache.jmeter.protocol.http.modifier.ParamModifier
-+ParamModifierGui=org.apache.jmeter.protocol.http.modifier.gui.ParamModifierGui
-+PropertyControlGui=org.apache.jmeter.visualizers.PropertyControlGui
-+ProxyControl=org.apache.jmeter.protocol.http.proxy.ProxyControl
-+ProxyControlGui=org.apache.jmeter.protocol.http.proxy.gui.ProxyControlGui
-+PublisherSampler=org.apache.jmeter.protocol.jms.sampler.PublisherSampler
-+RandomControlGui=org.apache.jmeter.control.gui.RandomControlGui
-+RandomController=org.apache.jmeter.control.RandomController
-+RandomOrderController=org.apache.jmeter.control.RandomOrderController
-+RandomOrderControllerGui=org.apache.jmeter.control.gui.RandomOrderControllerGui
-+RandomVariableConfig=org.apache.jmeter.config.RandomVariableConfig
-+RecordController=org.apache.jmeter.protocol.http.control.gui.RecordController
-+RecordingController=org.apache.jmeter.protocol.http.control.RecordingController
-+ReflectionThreadGroup=org.apache.jmeter.threads.ReflectionThreadGroup
-+RegexExtractor=org.apache.jmeter.extractor.RegexExtractor
-+RegexExtractorGui=org.apache.jmeter.extractor.gui.RegexExtractorGui
-+RemoteListenerWrapper=org.apache.jmeter.samplers.RemoteListenerWrapper
-+RemoteSampleListenerWrapper=org.apache.jmeter.samplers.RemoteSampleListenerWrapper
-+RemoteTestListenerWrapper=org.apache.jmeter.samplers.RemoteTestListenerWrapper
-+ReportGui=org.apache.jmeter.control.gui.ReportGui
-+ReportPage=org.apache.jmeter.testelement.ReportPage
-+ReportPageGui=org.apache.jmeter.report.gui.ReportPageGui
-+ReportPlan=org.apache.jmeter.testelement.ReportPlan
-+ResponseAssertion=org.apache.jmeter.assertions.ResponseAssertion
-+ResultAction=org.apache.jmeter.reporters.ResultAction
-+ResultActionGui=org.apache.jmeter.reporters.gui.ResultActionGui
-+ResultCollector=org.apache.jmeter.reporters.ResultCollector
-+ResultSaver=org.apache.jmeter.reporters.ResultSaver
-+ResultSaverGui=org.apache.jmeter.reporters.gui.ResultSaverGui
-+RunTime=org.apache.jmeter.control.RunTime
-+RunTimeGui=org.apache.jmeter.control.gui.RunTimeGui
-+SampleSaveConfiguration=org.apache.jmeter.samplers.SampleSaveConfiguration
-+SimpleConfigGui=org.apache.jmeter.config.gui.SimpleConfigGui
-+SimpleDataWriter=org.apache.jmeter.visualizers.SimpleDataWriter
-+SizeAssertion=org.apache.jmeter.assertions.SizeAssertion
-+SizeAssertionGui=org.apache.jmeter.assertions.gui.SizeAssertionGui
-+SoapSampler=org.apache.jmeter.protocol.http.sampler.SoapSampler
-+SoapSamplerGui=org.apache.jmeter.protocol.http.control.gui.SoapSamplerGui
-+SplineVisualizer=org.apache.jmeter.visualizers.SplineVisualizer
-+StatGraphVisualizer=org.apache.jmeter.visualizers.StatGraphVisualizer
-+StatVisualizer=org.apache.jmeter.visualizers.StatVisualizer
-+SubscriberSampler=org.apache.jmeter.protocol.jms.sampler.SubscriberSampler
-+Summariser=org.apache.jmeter.reporters.Summariser
-+SummariserGui=org.apache.jmeter.reporters.gui.SummariserGui
-+SummaryReport=org.apache.jmeter.visualizers.SummaryReport
-+SwitchController=org.apache.jmeter.control.SwitchController
-+SwitchControllerGui=org.apache.jmeter.control.gui.SwitchControllerGui
-+SyncTimer=org.apache.jmeter.timers.SyncTimer
-+Table=org.apache.jmeter.testelement.Table
-+TableGui=org.apache.jmeter.report.gui.TableGui
-+TableVisualizer=org.apache.jmeter.visualizers.TableVisualizer
-+TCPConfigGui=org.apache.jmeter.protocol.tcp.config.gui.TCPConfigGui
-+TCPSampler=org.apache.jmeter.protocol.tcp.sampler.TCPSampler
-+TCPSamplerGui=org.apache.jmeter.protocol.tcp.control.gui.TCPSamplerGui
-+TestAction=org.apache.jmeter.sampler.TestAction
-+TestActionGui=org.apache.jmeter.sampler.gui.TestActionGui
-+TestBeanGUI=org.apache.jmeter.testbeans.gui.TestBeanGUI
-+TestPlan=org.apache.jmeter.testelement.TestPlan
-+TestPlanGui=org.apache.jmeter.control.gui.TestPlanGui
-+ThreadGroup=org.apache.jmeter.threads.ThreadGroup
-+ThreadGroupGui=org.apache.jmeter.threads.gui.ThreadGroupGui
-+ThroughputController=org.apache.jmeter.control.ThroughputController
-+ThroughputControllerGui=org.apache.jmeter.control.gui.ThroughputControllerGui
-+TransactionController=org.apache.jmeter.control.TransactionController
-+TransactionControllerGui=org.apache.jmeter.control.gui.TransactionControllerGui
-+UniformRandomTimer=org.apache.jmeter.timers.UniformRandomTimer
-+UniformRandomTimerGui=org.apache.jmeter.timers.gui.UniformRandomTimerGui
-+URLRewritingModifier=org.apache.jmeter.protocol.http.modifier.URLRewritingModifier
-+URLRewritingModifierGui=org.apache.jmeter.protocol.http.modifier.gui.URLRewritingModifierGui
-+UserParameterModifier=org.apache.jmeter.protocol.http.modifier.UserParameterModifier
-+UserParameterModifierGui=org.apache.jmeter.protocol.http.modifier.gui.UserParameterModifierGui
-+UserParameters=org.apache.jmeter.modifiers.UserParameters
-+UserParametersGui=org.apache.jmeter.modifiers.gui.UserParametersGui
-+ViewResultsFullVisualizer=org.apache.jmeter.visualizers.ViewResultsFullVisualizer
-+WebServiceSampler=org.apache.jmeter.protocol.http.sampler.WebServiceSampler
-+WebServiceSamplerGui=org.apache.jmeter.protocol.http.control.gui.WebServiceSamplerGui
-+WhileController=org.apache.jmeter.control.WhileController
-+WhileControllerGui=org.apache.jmeter.control.gui.WhileControllerGui
-+WorkBench=org.apache.jmeter.testelement.WorkBench
-+WorkBenchGui=org.apache.jmeter.control.gui.WorkBenchGui
-+XMLAssertion=org.apache.jmeter.assertions.XMLAssertion
-+XMLAssertionGui=org.apache.jmeter.assertions.gui.XMLAssertionGui
-+XMLSchemaAssertion=org.apache.jmeter.assertions.XMLSchemaAssertion
-+XMLSchemaAssertionGUI=org.apache.jmeter.assertions.gui.XMLSchemaAssertionGUI
-+XPathAssertion=org.apache.jmeter.assertions.XPathAssertion
-+XPathAssertionGui=org.apache.jmeter.assertions.gui.XPathAssertionGui
-+XPathExtractor=org.apache.jmeter.extractor.XPathExtractor
-+XPathExtractorGui=org.apache.jmeter.extractor.gui.XPathExtractorGui
-+#
-+# Properties - all start with lower case letter and end with Prop
-+#
-+boolProp=org.apache.jmeter.testelement.property.BooleanProperty
-+collectionProp=org.apache.jmeter.testelement.property.CollectionProperty
-+doubleProp=org.apache.jmeter.testelement.property.DoubleProperty
-+elementProp=org.apache.jmeter.testelement.property.TestElementProperty
-+# see above - already defined as FloatProperty
-+#floatProp=org.apache.jmeter.testelement.property.FloatProperty
-+intProp=org.apache.jmeter.testelement.property.IntegerProperty
-+longProp=org.apache.jmeter.testelement.property.LongProperty
-+mapProp=org.apache.jmeter.testelement.property.MapProperty
-+objProp=org.apache.jmeter.testelement.property.ObjectProperty
-+stringProp=org.apache.jmeter.testelement.property.StringProperty
-+#
-+# Other - must start with a lower case letter (and not end with Prop)
-+# (otherwise they could clash with the initial set of aliases)
-+#
-+hashTree=org.apache.jorphan.collections.ListedHashTree
-+jmeterTestPlan=org.apache.jmeter.save.ScriptWrapper
-+sample=org.apache.jmeter.samplers.SampleResult
-+httpSample=org.apache.jmeter.protocol.http.sampler.HTTPSampleResult
-+testResults=org.apache.jmeter.save.TestResultWrapper
-+assertionResult=org.apache.jmeter.assertions.AssertionResult
-+monitorStats=org.apache.jmeter.visualizers.MonitorStats
-+sampleEvent=org.apache.jmeter.samplers.SampleEvent
-+#
-+# Converters to register. Must start line with '_'
-+# If the converter is a collection of subitems, set equal to "collection"
-+# If the converter needs to know the class mappings but is not a collection of
-+# subitems, set it equal to "mapping"
-+_org.apache.jmeter.protocol.http.util.HTTPResultConverter=collection
-+_org.apache.jmeter.save.converters.BooleanPropertyConverter=
-+_org.apache.jmeter.save.converters.IntegerPropertyConverter=
-+_org.apache.jmeter.save.converters.LongPropertyConverter=
-+_org.apache.jmeter.save.converters.MultiPropertyConverter=collection
-+_org.apache.jmeter.save.converters.SampleEventConverter=
-+_org.apache.jmeter.save.converters.SampleResultConverter=collection
-+_org.apache.jmeter.save.converters.SampleSaveConfigurationConverter=collection
-+_org.apache.jmeter.save.converters.StringPropertyConverter=
-+_org.apache.jmeter.save.converters.HashTreeConverter=collection
-+_org.apache.jmeter.save.converters.TestElementConverter=collection
-+_org.apache.jmeter.save.converters.TestElementPropertyConverter=collection
-+_org.apache.jmeter.save.converters.TestResultWrapperConverter=collection
-+_org.apache.jmeter.save.ScriptWrapperConverter=mapping
-+#
-+# Remember to update the _version entry
-+#
-\ No newline at end of file
-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-09-30 10:48:16.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
Modified: trunk/jakarta-jmeter/debian/patches/series
===================================================================
--- trunk/jakarta-jmeter/debian/patches/series 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/patches/series 2011-04-17 09:15:41 UTC (rev 13543)
@@ -1,3 +1 @@
02_disable_components.patch
-03_fix_jtidy_call.patch
-04_files_from_upstream.patch
Modified: trunk/jakarta-jmeter/debian/rules
===================================================================
--- trunk/jakarta-jmeter/debian/rules 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/rules 2011-04-17 09:15:41 UTC (rev 13543)
@@ -5,9 +5,9 @@
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 js jtidy junit libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons xstream velocity
+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 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_OPTS := -Djmeter.version=$(DEB_UPSTREAM_VERSION)
+ANT_ARGS := -Dlib.api=/usr/share/java -Djmeter.version=$(DEB_UPSTREAM_VERSION)
install/jmeter::
mkdir -p debian/jmeter/usr/share/jmeter/bin
Added: trunk/jakarta-jmeter/debian/source/format
===================================================================
--- trunk/jakarta-jmeter/debian/source/format (rev 0)
+++ trunk/jakarta-jmeter/debian/source/format 2011-04-17 09:15:41 UTC (rev 13543)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: trunk/jakarta-jmeter/debian/wrappers/jmeter
===================================================================
--- trunk/jakarta-jmeter/debian/wrappers/jmeter 2011-04-17 07:40:32 UTC (rev 13542)
+++ trunk/jakarta-jmeter/debian/wrappers/jmeter 2011-04-17 09:15:41 UTC (rev 13543)
@@ -3,12 +3,12 @@
# Include the wrappers utility script
. /usr/lib/java-wrappers/java-wrappers.sh
-find_jars avalon-framework batik bsf bsh commons-collections3
+find_jars activation avalon-framework batik bsf bsh commons-collections3
find_jars commons-httpclient commons-io commons-jexl commons-lang
find_jars commons-logging commons-net
find_jars excalibur-logger excalibur-logkit geronimo-jms-1.1-spec gnumail
-find_jars jboss-j2ee jcharts jdom1 jtidy js
-find_jars junit libhtmlparser oro xalan2 xmlgraphics-commons xstream
+find_jars gnumail-providers jboss-j2ee jcharts jdom1 jtidy js
+find_jars junit4 libhtmlparser oro xalan2 xmlgraphics-commons xstream
find_jars /usr/share/jmeter/lib/jorphan.jar
find_jars /usr/share/jmeter/bin/ApacheJMeter.jar
More information about the pkg-java-commits
mailing list