Commit 4b8ad3da88ebc4637189b0073ccc8c79c4937672 - jakarta-jmeter

+15

-9

debian/patches/01_improve_cli_help.patch less more

0	0	Description: Improves the help displayed on the command line
1	1	Author: Emmanuel Bourg <ebourg@apache.org>
2	2	Forwarded: no
3		--- a/src/core/org/apache/jmeter/JMeter.java
4		+++ b/src/core/org/apache/jmeter/JMeter.java
5		@@ -291,8 +291,7 @@
	3	Index: jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
	4	===================================================================
	5	--- jakarta-jmeter.orig/src/core/org/apache/jmeter/JMeter.java
	6	+++ jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
	7	@@ -291,8 +291,7 @@ public class JMeter implements JMeterPlu
6	8	}
7	9	if (null != error) {
8	10	System.err.println("Error: " + error);

12	14	return;
13	15	}
14	16	try {
15		@@ -361,7 +360,10 @@
	17	@@ -361,7 +360,10 @@ public class JMeter implements JMeterPlu
16	18	System.out.println(JMeterUtils.getJMeterCopyright());
17	19	System.out.println("Version " + JMeterUtils.getJMeterVersion());
18	20	} else if (parser.getArgumentById(HELP_OPT) != null) {

24	26	} else if (parser.getArgumentById(SERVER_OPT) != null) {
25	27	// Start the server
26	28	try {
27		@@ -397,9 +399,8 @@
	29	@@ -397,9 +399,8 @@ public class JMeter implements JMeterPlu
28	30	}
29	31	}
30	32	} catch (IllegalUserActionException e) {

36	38	} catch (Throwable e) {
37	39	log.fatalError("An error occurred: ",e);
38	40	System.out.println("An error occurred: " + e.getMessage());
	41	Index: jakarta-jmeter/src/core/org/apache/jmeter/examples.txt
	42	===================================================================
39	43	--- /dev/null
40		+++ b/src/core/org/apache/jmeter/examples.txt
	44	+++ jakarta-jmeter/src/core/org/apache/jmeter/examples.txt
41	45	@@ -0,0 +1,19 @@
42	46	+Examples:
43	47	+

58	62	+ jmeter -s
59	63	+
60	64	+ or jmeter-server
61		--- a/build.xml
62		+++ b/build.xml
63		@@ -949,7 +949,7 @@
	65	Index: jakarta-jmeter/build.xml
	66	===================================================================
	67	--- jakarta-jmeter.orig/build.xml
	68	+++ jakarta-jmeter/build.xml
	69	@@ -949,7 +949,7 @@ run JMeter unless all the JMeter jars ar
64	70	<exclude name="eucJP"/>
65	71	</fileset>
66	72	<!-- This file is used by the jmeter -h option -->

+4

-2

debian/patches/02_disable-soap-sampler.patch less more

2	2	http://archive.apache.org/dist/ws/soap/version-2.3.1/
3	3	Author: Onkar Shinde <onshinde@ubuntu.com>
4	4	Forwarded: not-needed
5		--- a/build.xml
6		+++ b/build.xml
	5	Index: jakarta-jmeter/build.xml
	6	===================================================================
	7	--- jakarta-jmeter.orig/build.xml
	8	+++ jakarta-jmeter/build.xml
7	9	@@ -606,9 +606,10 @@
8	10	<target name="compile-http" depends="compile-jorphan,compile-core,compile-components" description="Compile components specific to HTTP sampling.">
9	11	<mkdir dir="${build.http}"/>

+6

-4

debian/patches/03_disable-jdbc-module.patch less more

1	1	which is not packaged yet
2	2	Author: Onkar Shinde <onshinde@ubuntu.com>
3	3	Forwarded: not-needed
4		--- a/build.xml
5		+++ b/build.xml
	4	Index: jakarta-jmeter/build.xml
	5	===================================================================
	6	--- jakarta-jmeter.orig/build.xml
	7	+++ jakarta-jmeter/build.xml
6	8	@@ -740,7 +740,7 @@
7	9	</javac>
8	10	</target>

12	14
13	15	<target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components.">
14	16	<mkdir dir="${build.examples}"/>
15		@@ -994,6 +994,7 @@
	17	@@ -994,6 +994,7 @@ run JMeter unless all the JMeter jars ar
16	18	</jar>
17	19
18	20	<!-- jdbc -->

20	22	<jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
21	23	<zipfileset file="${resources.meta-inf}/default.notice"
22	24	fullpath="META-INF/NOTICE" />
23		@@ -1002,6 +1003,7 @@
	25	@@ -1002,6 +1003,7 @@ run JMeter unless all the JMeter jars ar
24	26	<fileset dir="${build.jdbc}" includes="*/.class" />
25	27	<fileset dir="${src.jdbc}" includes="*/.properties" />
26	28	</jar>

+12

-6

debian/patches/05_ignore-jodd.patch less more

0	0	Description: Disable the JoddExtractor since jodd isn't in Debian yet
1	1	Author: Emmanuel Bourg <ebourg@apache.org>
2	2	Forwarded: not-needed
3		--- a/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
4		+++ b/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
5		@@ -48,7 +48,7 @@
	3	Index: jakarta-jmeter/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
	4	===================================================================
	5	--- jakarta-jmeter.orig/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
	6	+++ jakarta-jmeter/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
	7	@@ -48,7 +48,7 @@ public class HtmlExtractor extends Abstr
6	8	* @return Array containing the names of the possible extractors.
7	9	*/
8	10	public static String[] getImplementations(){

11	13	}
12	14
13	15	public static final String DEFAULT_EXTRACTOR = ""; // $NON-NLS-1$
14		@@ -217,8 +217,8 @@
	16	@@ -217,8 +217,8 @@ public class HtmlExtractor extends Abstr
15	17	boolean useDefaultExtractor = DEFAULT_EXTRACTOR.equals(impl);
16	18	if (useDefaultExtractor \|\| EXTRACTOR_JSOUP.equals(impl)) {
17	19	return new JSoupExtractor();

22	24	} else {
23	25	throw new IllegalArgumentException("Extractor implementation:"+ impl+" is unknown");
24	26	}
25		--- a/src/components/org/apache/jmeter/extractor/JoddExtractor.java
	27	Index: jakarta-jmeter/src/components/org/apache/jmeter/extractor/JoddExtractor.java
	28	===================================================================
	29	--- jakarta-jmeter.orig/src/components/org/apache/jmeter/extractor/JoddExtractor.java
26	30	+++ /dev/null
27	31	@@ -1,102 +0,0 @@
28	32	-/*

127	131	- }
128	132	- }
129	133	-}
130		--- a/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
	134	Index: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
	135	===================================================================
	136	--- jakarta-jmeter.orig/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
131	137	+++ /dev/null
132	138	@@ -1,242 +0,0 @@
133	139	-/*

+5

-3

debian/patches/06_link-to-system-javadoc.patch less more

0	0	Description: Link the API documentation with the system Javadoc provided by the default-jdk-doc package
1	1	Author: Onkar Shinde <onshinde@ubuntu.com>
2	2	Forwarded: not-needed
3		--- a/build.xml
4		+++ b/build.xml
5		@@ -2198,7 +2198,7 @@
	3	Index: jakarta-jmeter/build.xml
	4	===================================================================
	5	--- jakarta-jmeter.orig/build.xml
	6	+++ jakarta-jmeter/build.xml
	7	@@ -2198,7 +2198,7 @@ run JMeter unless all the JMeter jars ar
6	8	packagenames="org.apache.jmeter.,org.apache.jorphan."
7	9	excludepackagenames="org.apache.jorphan.timer">
8	10	<classpath refid="classpath"/>

+7

-5

debian/patches/07_ignore-tika.patch less more

0	0	Description: Disable the code using Apache Tika until it's in Debian
1	1	Author: Emmanuel Bourg <ebourg@apache.org>
2	2	Forwarded: not-needed
3		--- a/src/core/org/apache/jmeter/util/Document.java
4		+++ b/src/core/org/apache/jmeter/util/Document.java
5		@@ -25,11 +25,13 @@
	3	Index: jakarta-jmeter/src/core/org/apache/jmeter/util/Document.java
	4	===================================================================
	5	--- jakarta-jmeter.orig/src/core/org/apache/jmeter/util/Document.java
	6	+++ jakarta-jmeter/src/core/org/apache/jmeter/util/Document.java
	7	@@ -25,11 +25,13 @@ import java.io.InputStream;
6	8
7	9	import org.apache.jorphan.logging.LoggingManager;
8	10	import org.apache.log.Logger;

16	18	import org.xml.sax.ContentHandler;
17	19
18	20	public class Document {
19		@@ -51,6 +53,7 @@
	21	@@ -51,6 +53,7 @@ public class Document {
20	22	public static String getTextFromDocument(byte[] document) {
21	23	String errMissingTika = JMeterUtils.getResString("view_results_response_missing_tika"); // $NON-NLS-1$
22	24	String response = errMissingTika;

24	26	Parser parser = new AutoDetectParser();
25	27	ContentHandler handler = new BodyContentHandler(MAX_DOCUMENT_SIZE > 0 ? MAX_DOCUMENT_SIZE : -1); // -1 to disable the write limit
26	28	Metadata metadata = new Metadata();
27		@@ -76,7 +79,7 @@
	29	@@ -76,7 +79,7 @@ public class Document {
28	30	log.warn("Error closing document stream", ioe);// $NON-NLS-1$
29	31	}
30	32	}

+11

-11

debian/patches/08_bouncycastle-1.51.patch less more

10	10	.../assertions/SMIMEAssertionTestElement.java \| 5 +++++
11	11	2 files changed, 18 insertions(+), 9 deletions(-)
12	12
13		diff --git a/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java b/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
14		index b0baca9..abcb169 100644
15		--- a/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
16		+++ b/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
	13	Index: jakarta-jmeter/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
	14	===================================================================
	15	--- jakarta-jmeter.orig/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
	16	+++ jakarta-jmeter/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
17	17	@@ -27,12 +27,12 @@ import java.io.InputStream;
18	18	import java.math.BigInteger;
19	19	import java.security.GeneralSecurityException;

28	28	import java.util.List;
29	29	import java.util.Properties;
30	30
31		@@ -53,6 +53,8 @@ import org.bouncycastle.cms.CMSException;
	31	@@ -53,6 +53,8 @@ import org.bouncycastle.cms.CMSException
32	32	import org.bouncycastle.cms.SignerInformation;
33	33	import org.bouncycastle.cms.SignerInformationStore;
34	34	import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;

37	37	import org.bouncycastle.jce.PrincipalUtil;
38	38	import org.bouncycastle.jce.X509Principal;
39	39	import org.bouncycastle.jce.provider.BouncyCastleProvider;
40		@@ -60,6 +62,7 @@ import org.bouncycastle.mail.smime.SMIMEException;
	40	@@ -60,6 +62,7 @@ import org.bouncycastle.mail.smime.SMIME
41	41	import org.bouncycastle.mail.smime.SMIMESignedParser;
42	42	import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;
43	43	import org.bouncycastle.x509.extension.X509ExtensionUtil;

92	92	}
93	93	}
94	94
95		diff --git a/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java b/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
96		index 9fbdd6f..4c9aea4 100644
97		--- a/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
98		+++ b/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
	95	Index: jakarta-jmeter/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
	96	===================================================================
	97	--- jakarta-jmeter.orig/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
	98	+++ jakarta-jmeter/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
99	99	@@ -23,6 +23,7 @@ import java.io.Serializable;
100	100	import org.apache.jmeter.samplers.SampleResult;
101	101	import org.apache.jmeter.testelement.AbstractTestElement;

104	104
105	105	public class SMIMEAssertionTestElement extends AbstractTestElement implements
106	106	Serializable, Assertion {
107		@@ -57,6 +58,10 @@ public class SMIMEAssertionTestElement extends AbstractTestElement implements
	107	@@ -57,6 +58,10 @@ public class SMIMEAssertionTestElement e
108	108	assertionResult.setResultForFailure(JMeterUtils
109	109	.getResString("bouncy_castle_unavailable_message")); //$NON-NLS-1$
110	110	return assertionResult;

+5

-3

debian/patches/09_httpcomponents-compatibility.patch less more

0	0	Description: Fix the compatibility with httpcomponents-client >= 4.3
1	1	Author: Emmanuel Bourg <ebourg@apache.org>
2	2	Forwarded: no
3		--- a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
4		+++ b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
5		@@ -265,5 +265,20 @@
	3	Index: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
	4	===================================================================
	5	--- jakarta-jmeter.orig/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
	6	+++ jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
	7	@@ -265,5 +265,20 @@ public class MeasuringConnectionManager
6	8	public HttpConnectionMetrics getMetrics() {
7	9	return handler.getMetrics();
8	10	}

+4

-2

debian/patches/10_xstream-compatibility.patch less more

0	0	Description: Remove the DOCTYPE to fix an error with XStream >= 1.4.9 (external entities are disabled)
1	1	Author: Emmanuel Bourg <ebourg@apache.org>
2	2	Forwarded: no
3		--- a/bin/templates/templates.xml
4		+++ b/bin/templates/templates.xml
	3	Index: jakarta-jmeter/bin/templates/templates.xml
	4	===================================================================
	5	--- jakarta-jmeter.orig/bin/templates/templates.xml
	6	+++ jakarta-jmeter/bin/templates/templates.xml
5	7	@@ -18,7 +18,6 @@
6	8	<!--
7	9	See the DTD for allowable elements and attributes.

+10

-6

debian/patches/11_java9-compatibility.patch less more

0	0	Description: Fixes the compilations errors with Java 9
1	1	Author: Emmanuel Bourg <ebourg@apache.org>
2	2	Forwarded: no
3		--- a/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
4		+++ b/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
5		@@ -61,7 +61,7 @@
	3	Index: jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
	4	===================================================================
	5	--- jakarta-jmeter.orig/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
	6	+++ jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
	7	@@ -61,7 +61,7 @@ public class JTreeTable extends JTable {
6	8	* @param columnNames the names for the columns
7	9	*/
8	10	public JTreeTable(Vector<?> rowData, Vector<?> columnNames) {

11	13	}
12	14
13	15	}
14		--- a/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
15		+++ b/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
16		@@ -197,7 +197,7 @@
	16	Index: jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
	17	===================================================================
	18	--- jakarta-jmeter.orig/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
	19	+++ jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
	20	@@ -197,7 +197,7 @@ public class JMeterTreeNode extends Defa
17	21	// Override in order to provide type safety
18	22	@Override
19	23	@SuppressWarnings("unchecked")

+19

-13

debian/patches/12_mongodb-compatibility.patch less more

0	0	Description: Fixes the compatibility with the version of the MongoDB Java Driver in Debian (untested! feedback welcome)
1	1	Author: Emmanuel Bourg <ebourg@apache.org>
2	2	Forwarded: no
3		--- a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
4		+++ b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
5		@@ -137,10 +137,8 @@
	3	Index: jakarta-jmeter/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
	4	===================================================================
	5	--- jakarta-jmeter.orig/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
	6	+++ jakarta-jmeter/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
	7	@@ -137,10 +137,8 @@ public class MongoSourceElement
6	8	}
7	9
8	10	MongoClientOptions.Builder builder = MongoClientOptions.builder()

13	15	.maxWaitTime(getMaxWaitTime())
14	16	.socketKeepAlive(getSocketKeepAlive())
15	17	.socketTimeout(getSocketTimeout())
16		@@ -154,8 +152,7 @@
	18	@@ -154,8 +152,7 @@ public class MongoSourceElement
17	19	getWriteOperationNumberOfServers(),
18	20	getWriteOperationTimeout(),
19	21	getFsync(),

23	25	));
24	26	}
25	27	MongoClientOptions mongoOptions = builder.build();
26		--- a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
27		+++ b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
28		@@ -27,6 +27,7 @@
	28	Index: jakarta-jmeter/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
	29	===================================================================
	30	--- jakarta-jmeter.orig/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
	31	+++ jakarta-jmeter/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
	32	@@ -27,6 +27,7 @@ import com.mongodb.DB;
29	33	import com.mongodb.Mongo;
30	34	import com.mongodb.MongoClient;
31	35	import com.mongodb.MongoClientOptions;

33	37	import com.mongodb.ServerAddress;
34	38
35	39	/**
36		@@ -36,12 +37,15 @@
	40	@@ -36,12 +37,15 @@ public class MongoDB {
37	41	private static final Logger log = LoggingManager.getLoggerForClass();
38	42
39	43	// Mongo is Thread Safe

51	55	}
52	56
53	57	public DB getDB(String database, String username, String password) {
54		@@ -49,18 +53,11 @@
	58	@@ -49,18 +53,11 @@ public class MongoDB {
55	59	if(log.isDebugEnabled()) {
56	60	log.debug("username: " + username+", password: " + password+", database: " + database);
57	61	}

74	78	}
75	79
76	80	public void clear() {
77		@@ -68,7 +65,9 @@
	81	@@ -68,7 +65,9 @@ public class MongoDB {
78	82	log.debug("clearing");
79	83	}
80	84

85	89	//there is no harm in trying to clear up
86	90	mongo = null;
87	91	}
88		--- a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
89		+++ b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
90		@@ -51,18 +51,11 @@
	92	Index: jakarta-jmeter/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
	93	===================================================================
	94	--- jakarta-jmeter.orig/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
	95	+++ jakarta-jmeter/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
	96	@@ -51,18 +51,11 @@ public class MongoScriptRunner {
91	97	log.debug("database: " + db.getName()+", script: " + script);
92	98	}
93	99