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 506d99c4629dc3e0fef5ac1e6443296438dcabe5 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 17 14:46:05 2014 +0000 New upstream release (2.9) Refreshed the patches Added a dependency on libtika-java --- debian/changelog | 5 +- debian/control | 1 + debian/jmeter.classpath | 2 +- debian/patches/01_improve_cli_help.patch | 10 +-- debian/patches/02_disable_components.patch | 10 +-- debian/patches/04_java8_compatibility.patch | 12 ++-- debian/patches/05_ignore-jodd.patch | 103 ++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 9 files changed, 127 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 63f5f12..84bcdd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ -jakarta-jmeter (2.8-3) UNRELEASED; urgency=medium +jakarta-jmeter (2.9-1) UNRELEASED; urgency=medium + * New upstream release + - Refreshed the patches + - Added a dependency on libtika-java * Use XZ compression for the upstream tarball -- Emmanuel Bourg <[email protected]> Thu, 17 Jul 2014 13:02:56 +0200 diff --git a/debian/control b/debian/control index e4c2f61..e77e518 100644 --- a/debian/control +++ b/debian/control @@ -32,6 +32,7 @@ Build-Depends-Indep: default-jdk, libjtidy-java, liboro-java, librhino-java, + libtika-java, libxalan2-java, libxmlgraphics-commons-java, libxstream-java, diff --git a/debian/jmeter.classpath b/debian/jmeter.classpath index 3734a5d..a7bee84 100644 --- a/debian/jmeter.classpath +++ b/debian/jmeter.classpath @@ -1,6 +1,6 @@ usr/share/jmeter/lib/jorphan.jar /usr/share/java/avalon-framework.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logger.jar /usr/share/java/excalibur-logkit.jar usr/share/jmeter/lib/ext/ApacheJMeter_components.jar /usr/share/java/bcmail.jar /usr/share/java/bcprov.jar /usr/share/java/bsf.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/geronimo-javamail-1.4-spec.jar /usr/share/java/jcharts.jar /usr/share/java/jdom1.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar -usr/share/jmeter/lib/ext/ApacheJMeter_core.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xmlgraphics-commons.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar +usr/share/jmeter/lib/ext/ApacheJMeter_core.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xmlgraphics-commons.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/tika-core.jar /usr/share/java/tika-parsers.jar usr/share/jmeter/lib/ext/ApacheJMeter_functions.jar /usr/share/java/commons-io.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar usr/share/jmeter/lib/ext/ApacheJMeter_monitors.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar usr/share/jmeter/lib/ext/ApacheJMeter_report.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/jcharts.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar diff --git a/debian/patches/01_improve_cli_help.patch b/debian/patches/01_improve_cli_help.patch index 00c37a0..22aaf8e 100644 --- a/debian/patches/01_improve_cli_help.patch +++ b/debian/patches/01_improve_cli_help.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/src/core/org/apache/jmeter/JMeter.java +++ b/src/core/org/apache/jmeter/JMeter.java -@@ -283,8 +283,7 @@ +@@ -284,8 +284,7 @@ } if (null != error) { System.err.println("Error: " + error); @@ -13,7 +13,7 @@ Forwarded: no return; } try { -@@ -352,7 +351,10 @@ +@@ -354,7 +353,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 { -@@ -388,9 +390,8 @@ +@@ -390,9 +392,8 @@ } } } catch (IllegalUserActionException e) { @@ -37,7 +37,7 @@ Forwarded: no } catch (Throwable e) { log.fatalError("An error occurred: ",e); System.out.println("An error occurred: " + e.getMessage()); -@@ -1151,4 +1152,4 @@ +@@ -1165,4 +1166,4 @@ return socket; } @@ -68,7 +68,7 @@ Forwarded: no + or jmeter-server --- a/build.xml +++ b/build.xml -@@ -937,7 +937,7 @@ +@@ -947,7 +947,7 @@ <exclude name="*eucJP*"/> </fileset> <!-- This file is used by the jmeter -h option --> diff --git a/debian/patches/02_disable_components.patch b/debian/patches/02_disable_components.patch index f465361..8e325df 100644 --- a/debian/patches/02_disable_components.patch +++ b/debian/patches/02_disable_components.patch @@ -4,7 +4,7 @@ Forwarded: not-needed Author: Onkar Shinde <[email protected]> --- a/build.xml +++ b/build.xml -@@ -579,9 +579,10 @@ +@@ -589,9 +589,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 --> @@ -16,7 +16,7 @@ Author: Onkar Shinde <[email protected]> <classpath> <pathelement location="${build.jorphan}"/> <pathelement location="${build.core}"/> -@@ -728,7 +729,7 @@ +@@ -738,7 +739,7 @@ </javac> </target> @@ -25,7 +25,7 @@ Author: Onkar Shinde <[email protected]> <target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components."> <mkdir dir="${build.examples}"/> -@@ -981,14 +982,14 @@ +@@ -991,14 +992,14 @@ </jar> <!-- jdbc --> @@ -42,11 +42,11 @@ Author: Onkar Shinde <[email protected]> <!-- java --> <jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF"> -@@ -1938,7 +1939,7 @@ +@@ -2175,7 +2176,7 @@ packagenames="org.apache.jmeter.*,org.apache.jorphan.*" excludepackagenames="org.apache.jorphan.timer"> <classpath refid="classpath"/> -- <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/> +- <link href="http://docs.oracle.com/javase/6/docs/api/"/> + <link href="file:///usr/share/doc/default-jdk-doc/api/"/> </javadoc> </target> diff --git a/debian/patches/04_java8_compatibility.patch b/debian/patches/04_java8_compatibility.patch index 8a7c83f..4fa0d83 100644 --- a/debian/patches/04_java8_compatibility.patch +++ b/debian/patches/04_java8_compatibility.patch @@ -16,7 +16,7 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360 data.put(newKey, tree); --- a/src/jorphan/org/apache/jorphan/collections/HashTree.java +++ b/src/jorphan/org/apache/jorphan/collections/HashTree.java -@@ -745,7 +745,7 @@ +@@ -770,7 +770,7 @@ * Finds the given current key, and replaces it with the given new key. Any * tree structure found under the original key is moved to the new key. */ @@ -27,7 +27,7 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360 data.put(newKey, tree); --- a/src/core/org/apache/jmeter/JMeter.java +++ b/src/core/org/apache/jmeter/JMeter.java -@@ -851,7 +851,7 @@ +@@ -858,7 +858,7 @@ HashTree replacementTree = rc.getReplacementSubTree(); if (replacementTree != null) { convertSubTree(replacementTree); @@ -36,7 +36,7 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360 tree.set(rc, replacementTree); } } else { // null subTree -@@ -877,14 +877,14 @@ +@@ -884,14 +884,14 @@ HashTree replacementTree = rc.getReplacementSubTree(); if (replacementTree != null) { convertSubTree(replacementTree); @@ -55,7 +55,7 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360 tree.remove(item); --- a/src/core/org/apache/jmeter/engine/ConvertListeners.java +++ b/src/core/org/apache/jmeter/engine/ConvertListeners.java -@@ -62,13 +62,13 @@ +@@ -63,13 +63,13 @@ RemoteSampleListener rtl = new RemoteSampleListenerImpl(item); if (item instanceof TestStateListener && item instanceof SampleListener) { // TL - all RemoteListenerWrapper wrap = new RemoteListenerWrapper(rtl); @@ -74,7 +74,7 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360 } --- a/src/core/org/apache/jmeter/gui/action/Save.java +++ b/src/core/org/apache/jmeter/gui/action/Save.java -@@ -163,7 +163,7 @@ +@@ -165,7 +165,7 @@ JMeterTreeNode item = (JMeterTreeNode) iter.next(); convertSubTree(tree.getTree(item)); TestElement testElement = item.getTestElement(); // requires JMeterTreeNode @@ -85,7 +85,7 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360 } --- a/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java +++ b/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java -@@ -125,7 +125,7 @@ +@@ -127,7 +127,7 @@ ReportTreeNode item = (ReportTreeNode) iter.next(); convertSubTree(tree.getTree(item)); TestElement testElement = item.getTestElement(); diff --git a/debian/patches/05_ignore-jodd.patch b/debian/patches/05_ignore-jodd.patch new file mode 100644 index 0000000..f5f6e20 --- /dev/null +++ b/debian/patches/05_ignore-jodd.patch @@ -0,0 +1,103 @@ +Description: Disable the JoddExtractor since jodd isn't in Debian yet +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/src/components/org/apache/jmeter/extractor/JoddExtractor.java ++++ /dev/null +@@ -1,97 +0,0 @@ +-/* +- * 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. +- * +- */ +- +-package org.apache.jmeter.extractor; +- +-import java.util.LinkedList; +-import java.util.List; +- +-import jodd.lagarto.dom.LagartoDOMBuilder; +-import jodd.lagarto.dom.Node; +-import jodd.lagarto.dom.NodeSelector; +- +-import org.apache.jmeter.threads.JMeterContextService; +-import org.apache.jorphan.util.JOrphanUtils; +- +-/** +- * Jodd-Lagerto based CSS/JQuery extractor +- * see http://jodd.org/doc/csselly/ +- * @since 2.9 +- */ +-public class JoddExtractor implements Extractor { +- +- /** +- * +- */ +- private static final long serialVersionUID = -7235814605293262972L; +- +- private static final String CACHE_KEY_PREFIX = JoddExtractor.class.getName()+"_PARSED_BODY"; +- +- /** +- * +- */ +- public JoddExtractor() { +- super(); +- } +- +- /** +- * @see org.apache.jmeter.extractor.Extractor#extract(String, String, int, String, List, int, String) +- */ +- @Override +- public int extract(String expression, String attribute, int matchNumber, +- String inputString, List<String> result, int found, +- String cacheKey) { +- NodeSelector nodeSelector = null; +- if (cacheKey != null) { +- nodeSelector = (NodeSelector) +- JMeterContextService.getContext().getSamplerContext().get(CACHE_KEY_PREFIX+cacheKey); +- if(nodeSelector==null) { +- LagartoDOMBuilder domBuilder = new LagartoDOMBuilder(); +- jodd.lagarto.dom.Document doc = domBuilder.parse(inputString); +- nodeSelector = new NodeSelector(doc); +- JMeterContextService.getContext().getSamplerContext().put(CACHE_KEY_PREFIX+cacheKey, nodeSelector); +- } +- } else { +- LagartoDOMBuilder domBuilder = new LagartoDOMBuilder(); +- jodd.lagarto.dom.Document doc = domBuilder.parse(inputString); +- nodeSelector = new NodeSelector(doc); +- } +- LinkedList<Node> elements = nodeSelector.select(expression); +- int size = elements.size(); +- for (int i = 0; i < size; i++) { +- Node element = elements.get(i); +- if (matchNumber <=0 || found != matchNumber) { +- result.add(extractValue(attribute, element)); +- found++; +- } else { +- break; +- } +- } +- +- return found; +- } +- +- +- private String extractValue(String attribute, Node element) { +- if (!JOrphanUtils.isBlank(attribute)) { +- return element.getAttribute(attribute); +- } else { +- return element.getTextContent().trim(); +- } +- } +-} diff --git a/debian/patches/series b/debian/patches/series index 60e1098..9efc72a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 02_disable_components.patch 03_bouncycastle_update.patch 04_java8_compatibility.patch +05_ignore-jodd.patch diff --git a/debian/rules b/debian/rules index ad3f978..1be30f5 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/cdbs/1/class/ant.mk JAVA_HOME_DIRS := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps avalon-framework bcmail bcpkix bcprov bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-jexl2 commons-lang commons-lang3 commons-net geronimo-jms-1.1-spec geronimo-javamail-1.4-spec geronimo-jms_1.1_spec httpclient httpcore httpmime jcharts jdom1 js jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons xstream velocity +DEB_JARS := ant-nodeps avalon-framework bcmail bcpkix bcprov bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-jexl2 commons-lang commons-lang3 commons-net geronimo-jms-1.1-spec geronimo-javamail-1.4-spec geronimo-jms_1.1_spec httpclient httpcore httpmime jcharts jdom1 js jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons xstream velocity tika-core tika-parsers DEB_ANT_BUILD_TARGET := install docs-printable docs-api ANT_ARGS := -Dlib.api=/usr/share/java -Djmeter.version=$(DEB_UPSTREAM_VERSION) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-jmeter.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
