[pkg-java] r18270 - in trunk/jakarta-jmeter/debian: . patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jul 17 14:46:05 UTC 2014
Author: ebourg-guest
Date: 2014-07-17 14:46:05 +0000 (Thu, 17 Jul 2014)
New Revision: 18270
Added:
trunk/jakarta-jmeter/debian/patches/05_ignore-jodd.patch
Modified:
trunk/jakarta-jmeter/debian/changelog
trunk/jakarta-jmeter/debian/control
trunk/jakarta-jmeter/debian/jmeter.classpath
trunk/jakarta-jmeter/debian/patches/01_improve_cli_help.patch
trunk/jakarta-jmeter/debian/patches/02_disable_components.patch
trunk/jakarta-jmeter/debian/patches/04_java8_compatibility.patch
trunk/jakarta-jmeter/debian/patches/series
trunk/jakarta-jmeter/debian/rules
Log:
New upstream release (2.9)
Refreshed the patches
Added a dependency on libtika-java
Modified: trunk/jakarta-jmeter/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog 2014-07-17 11:07:38 UTC (rev 18269)
+++ trunk/jakarta-jmeter/debian/changelog 2014-07-17 14:46:05 UTC (rev 18270)
@@ -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 <ebourg at apache.org> Thu, 17 Jul 2014 13:02:56 +0200
Modified: trunk/jakarta-jmeter/debian/control
===================================================================
--- trunk/jakarta-jmeter/debian/control 2014-07-17 11:07:38 UTC (rev 18269)
+++ trunk/jakarta-jmeter/debian/control 2014-07-17 14:46:05 UTC (rev 18270)
@@ -32,6 +32,7 @@
libjtidy-java,
liboro-java,
librhino-java,
+ libtika-java,
libxalan2-java,
libxmlgraphics-commons-java,
libxstream-java,
Modified: trunk/jakarta-jmeter/debian/jmeter.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter.classpath 2014-07-17 11:07:38 UTC (rev 18269)
+++ trunk/jakarta-jmeter/debian/jmeter.classpath 2014-07-17 14:46:05 UTC (rev 18270)
@@ -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
Modified: trunk/jakarta-jmeter/debian/patches/01_improve_cli_help.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/01_improve_cli_help.patch 2014-07-17 11:07:38 UTC (rev 18269)
+++ trunk/jakarta-jmeter/debian/patches/01_improve_cli_help.patch 2014-07-17 14:46:05 UTC (rev 18270)
@@ -3,7 +3,7 @@
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 @@
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 @@
} 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 @@
} 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 @@
+ 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 -->
Modified: trunk/jakarta-jmeter/debian/patches/02_disable_components.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/02_disable_components.patch 2014-07-17 11:07:38 UTC (rev 18269)
+++ trunk/jakarta-jmeter/debian/patches/02_disable_components.patch 2014-07-17 14:46:05 UTC (rev 18270)
@@ -4,7 +4,7 @@
Author: Onkar Shinde <onshinde at ubuntu.com>
--- 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 @@
<classpath>
<pathelement location="${build.jorphan}"/>
<pathelement location="${build.core}"/>
-@@ -728,7 +729,7 @@
+@@ -738,7 +739,7 @@
</javac>
</target>
@@ -25,7 +25,7 @@
<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 @@
<!-- 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>
Modified: trunk/jakarta-jmeter/debian/patches/04_java8_compatibility.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/04_java8_compatibility.patch 2014-07-17 11:07:38 UTC (rev 18269)
+++ trunk/jakarta-jmeter/debian/patches/04_java8_compatibility.patch 2014-07-17 14:46:05 UTC (rev 18270)
@@ -16,7 +16,7 @@
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 @@
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 @@
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 @@
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 @@
}
--- 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 @@
}
--- 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();
Added: trunk/jakarta-jmeter/debian/patches/05_ignore-jodd.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/05_ignore-jodd.patch (rev 0)
+++ trunk/jakarta-jmeter/debian/patches/05_ignore-jodd.patch 2014-07-17 14:46:05 UTC (rev 18270)
@@ -0,0 +1,103 @@
+Description: Disable the JoddExtractor since jodd isn't in Debian yet
+Author: Emmanuel Bourg <ebourg at apache.org>
+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();
+- }
+- }
+-}
Modified: trunk/jakarta-jmeter/debian/patches/series
===================================================================
--- trunk/jakarta-jmeter/debian/patches/series 2014-07-17 11:07:38 UTC (rev 18269)
+++ trunk/jakarta-jmeter/debian/patches/series 2014-07-17 14:46:05 UTC (rev 18270)
@@ -2,3 +2,4 @@
02_disable_components.patch
03_bouncycastle_update.patch
04_java8_compatibility.patch
+05_ignore-jodd.patch
Modified: trunk/jakarta-jmeter/debian/rules
===================================================================
--- trunk/jakarta-jmeter/debian/rules 2014-07-17 11:07:38 UTC (rev 18269)
+++ trunk/jakarta-jmeter/debian/rules 2014-07-17 14:46:05 UTC (rev 18270)
@@ -5,7 +5,7 @@
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)
More information about the pkg-java-commits
mailing list