[jakarta-jmeter] 02/06: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Mar 29 23:51:40 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 cb18934db239de87a09fb548a38ebc2d83f1fe6a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Mar 30 00:48:59 2016 +0200
Refreshed the patches
---
debian/changelog | 2 +-
debian/patches/01_improve_cli_help.patch | 8 ++++----
debian/patches/02_disable-soap-sampler.patch | 2 +-
debian/patches/03_disable-jdbc-module.patch | 6 +++---
debian/patches/05_ignore-jodd.patch | 18 +++++++++---------
debian/patches/06_link-to-system-javadoc.patch | 2 +-
debian/patches/07_ignore-tika.patch | 4 ++--
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 95b5844..ad60f8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jakarta-jmeter (2.12-1) UNRELEASED; urgency=medium
+jakarta-jmeter (2.13-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
diff --git a/debian/patches/01_improve_cli_help.patch b/debian/patches/01_improve_cli_help.patch
index 76411ff..92d05df 100644
--- a/debian/patches/01_improve_cli_help.patch
+++ b/debian/patches/01_improve_cli_help.patch
@@ -3,7 +3,7 @@ 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
-@@ -286,8 +286,7 @@
+@@ -291,8 +291,7 @@
}
if (null != error) {
System.err.println("Error: " + error);
@@ -13,7 +13,7 @@ Forwarded: no
return;
}
try {
-@@ -356,7 +355,10 @@
+@@ -361,7 +360,10 @@
System.out.println(JMeterUtils.getJMeterCopyright());
System.out.println("Version " + JMeterUtils.getJMeterVersion());
} else if (parser.getArgumentById(HELP_OPT) != null) {
@@ -25,7 +25,7 @@ Forwarded: no
} else if (parser.getArgumentById(SERVER_OPT) != null) {
// Start the server
try {
-@@ -392,9 +394,8 @@
+@@ -397,9 +399,8 @@
}
}
} catch (IllegalUserActionException e) {
@@ -61,7 +61,7 @@ Forwarded: no
+ or jmeter-server
--- a/build.xml
+++ b/build.xml
-@@ -988,7 +988,7 @@
+@@ -949,7 +949,7 @@
<exclude name="*eucJP*"/>
</fileset>
<!-- This file is used by the jmeter -h option -->
diff --git a/debian/patches/02_disable-soap-sampler.patch b/debian/patches/02_disable-soap-sampler.patch
index 2ad290f..46ca9c3 100644
--- a/debian/patches/02_disable-soap-sampler.patch
+++ b/debian/patches/02_disable-soap-sampler.patch
@@ -5,7 +5,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -607,9 +607,10 @@
+@@ -606,9 +606,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 -->
diff --git a/debian/patches/03_disable-jdbc-module.patch b/debian/patches/03_disable-jdbc-module.patch
index 266c675..83cd829 100644
--- a/debian/patches/03_disable-jdbc-module.patch
+++ b/debian/patches/03_disable-jdbc-module.patch
@@ -4,7 +4,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -757,7 +757,7 @@
+@@ -740,7 +740,7 @@
</javac>
</target>
@@ -13,7 +13,7 @@ Forwarded: not-needed
<target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components.">
<mkdir dir="${build.examples}"/>
-@@ -1033,6 +1033,7 @@
+@@ -994,6 +994,7 @@
</jar>
<!-- jdbc -->
@@ -21,7 +21,7 @@ Forwarded: not-needed
<jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
<zipfileset file="${resources.meta-inf}/default.notice"
fullpath="META-INF/NOTICE" />
-@@ -1041,6 +1042,7 @@
+@@ -1002,6 +1003,7 @@
<fileset dir="${build.jdbc}" includes="**/*.class" />
<fileset dir="${src.jdbc}" includes="**/*.properties" />
</jar>
diff --git a/debian/patches/05_ignore-jodd.patch b/debian/patches/05_ignore-jodd.patch
index 992ce19..9010c90 100644
--- a/debian/patches/05_ignore-jodd.patch
+++ b/debian/patches/05_ignore-jodd.patch
@@ -3,16 +3,16 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
+++ b/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
-@@ -44,7 +44,7 @@
- public static final String EXTRACTOR_JODD = "JODD"; //$NON-NLS-1$
-
+@@ -48,7 +48,7 @@
+ * @return Array containing the names of the possible extractors.
+ */
public static String[] getImplementations(){
- return new String[]{EXTRACTOR_JSOUP,EXTRACTOR_JODD};
+ return new String[]{EXTRACTOR_JSOUP};
}
public static final String DEFAULT_EXTRACTOR = ""; // $NON-NLS-1$
-@@ -213,8 +213,8 @@
+@@ -217,8 +217,8 @@
boolean useDefaultExtractor = DEFAULT_EXTRACTOR.equals(impl);
if (useDefaultExtractor || EXTRACTOR_JSOUP.equals(impl)) {
return new JSoupExtractor();
@@ -201,9 +201,9 @@ Forwarded: not-needed
- private Stack<Boolean> enabled = new Stack<Boolean>();
-
- /**
-- * @param baseUrl
-- * @param urls
-- * @param ieVersion
+- * @param baseUrl base url to add possibly missing information to urls found in <code>urls</code>
+- * @param urls collection of urls to consider
+- * @param ieVersion version number of IE to emulate
- */
- public JMeterTagVisitor(final URLPointer baseUrl, URLCollection urls, Float ieVersion) {
- this.urls = urls;
@@ -225,7 +225,7 @@ Forwarded: not-needed
- */
- @Override
- public void script(Tag tag, CharSequence body) {
-- if (!enabled.peek()) {
+- if (!enabled.peek().booleanValue()) {
- return;
- }
- extractAttribute(tag, ATT_SRC);
@@ -238,7 +238,7 @@ Forwarded: not-needed
- */
- @Override
- public void tag(Tag tag) {
-- if (!enabled.peek()) {
+- if (!enabled.peek().booleanValue()) {
- return;
- }
- TagType tagType = tag.getType();
diff --git a/debian/patches/06_link-to-system-javadoc.patch b/debian/patches/06_link-to-system-javadoc.patch
index 7e29535..54d6a27 100644
--- a/debian/patches/06_link-to-system-javadoc.patch
+++ b/debian/patches/06_link-to-system-javadoc.patch
@@ -3,7 +3,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -2248,7 +2248,7 @@
+@@ -2198,7 +2198,7 @@
packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
excludepackagenames="org.apache.jorphan.timer">
<classpath refid="classpath"/>
diff --git a/debian/patches/07_ignore-tika.patch b/debian/patches/07_ignore-tika.patch
index e8da5b8..7b4ff19 100644
--- a/debian/patches/07_ignore-tika.patch
+++ b/debian/patches/07_ignore-tika.patch
@@ -17,7 +17,7 @@ Forwarded: not-needed
import org.xml.sax.ContentHandler;
public class Document {
-@@ -49,6 +51,7 @@
+@@ -51,6 +53,7 @@
public static String getTextFromDocument(byte[] document) {
String errMissingTika = JMeterUtils.getResString("view_results_response_missing_tika"); // $NON-NLS-1$
String response = errMissingTika;
@@ -25,7 +25,7 @@ Forwarded: not-needed
Parser parser = new AutoDetectParser();
ContentHandler handler = new BodyContentHandler(MAX_DOCUMENT_SIZE > 0 ? MAX_DOCUMENT_SIZE : -1); // -1 to disable the write limit
Metadata metadata = new Metadata();
-@@ -74,7 +77,7 @@
+@@ -76,7 +79,7 @@
log.warn("Error closing document stream", ioe);// $NON-NLS-1$
}
}
--
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