Package: jmeter
Version: 2.0.0-3
Severity: wishlist
Tags: patch
There is no sun-j2sdk1.4 on amd64.
With the attached patch, the 'jmeter' package can be compiled
using sun-j2sdk1.5. The patch basically replace all occurences
of 'enum' because 'enum' is a reserverd word in j2sdk1.5.
Regards
Andreas Jochens
diff -urN ../tmp-orig/jmeter-2.0.0/j2sdk1.5-jmeter.diff ./j2sdk1.5-jmeter.diff
--- ../tmp-orig/jmeter-2.0.0/j2sdk1.5-jmeter.diff 1970-01-01
01:00:00.000000000 +0100
+++ ./j2sdk1.5-jmeter.diff 2005-04-08 11:53:01.592864668 +0200
@@ -0,0 +1,279 @@
+diff -urN build-tree/jakarta-jmeter-2.0.0/build.xml
jakarta-jmeter-2.0.0/build.xml
+--- build-tree/jakarta-jmeter-2.0.0/build.xml 2004-04-04 14:49:18.000000000
+0200
++++ jakarta-jmeter-2.0.0/build.xml 2005-04-08 11:05:10.270604000 +0200
+@@ -282,7 +282,7 @@
+ <!-- Compilation parameters -->
+ <property name="optimize" value="on"/>
+ <property name="deprecation" value="off"/>
+- <property name="target.java.version" value="1.2"/>
++ <property name="target.java.version" value="1.5"/>
+ <property name="encoding" value="UTF-8"/>
+
+ <!-- 3rd party libraries to be included in the binary distribution -->
+diff -urN
build-tree/jakarta-jmeter-2.0.0/src/components/org/apache/jmeter/control/ModuleController.java
jakarta-jmeter-2.0.0/src/components/org/apache/jmeter/control/ModuleController.java
+---
build-tree/jakarta-jmeter-2.0.0/src/components/org/apache/jmeter/control/ModuleController.java
2004-02-20 02:03:07.000000000 +0100
++++
jakarta-jmeter-2.0.0/src/components/org/apache/jmeter/control/ModuleController.java
2005-04-08 11:28:44.440164000 +0200
+@@ -199,10 +199,10 @@
+
+ private void createSubTree(HashTree tree, JMeterTreeNode node)
+ {
+- Enumeration e = node.children();
+- while (e.hasMoreElements())
++ Enumeration en = node.children();
++ while (en.hasMoreElements())
+ {
+- JMeterTreeNode subNode = (JMeterTreeNode) e.nextElement();
++ JMeterTreeNode subNode = (JMeterTreeNode) en.nextElement();
+ tree.add(subNode);
+ createSubTree(tree.getTree(subNode), subNode);
+ }
+@@ -218,10 +218,10 @@
+
+ private static void cloneChildren(JMeterTreeNode to, JMeterTreeNode from)
+ {
+- Enumeration enum = from.children();
+- while (enum.hasMoreElements())
++ Enumeration en = from.children();
++ while (en.hasMoreElements())
+ {
+- JMeterTreeNode child = (JMeterTreeNode) enum.nextElement();
++ JMeterTreeNode child = (JMeterTreeNode) en.nextElement();
+ JMeterTreeNode childClone = (JMeterTreeNode) child.clone();
+ childClone.setUserObject(
+ ((TestElement) child.getUserObject()).clone());
+diff -urN
build-tree/jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/gui/action/Copy.java
jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/gui/action/Copy.java
+---
build-tree/jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/gui/action/Copy.java
2004-02-14 04:34:28.000000000 +0100
++++ jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/gui/action/Copy.java
2005-04-08 11:06:06.099003000 +0200
+@@ -86,10 +86,10 @@
+
+ private static void cloneChildren(JMeterTreeNode to, JMeterTreeNode from)
+ {
+- Enumeration enum = from.children();
+- while (enum.hasMoreElements())
++ Enumeration e = from.children();
++ while (e.hasMoreElements())
+ {
+- JMeterTreeNode child = (JMeterTreeNode) enum.nextElement();
++ JMeterTreeNode child = (JMeterTreeNode) e.nextElement();
+ JMeterTreeNode childClone = (JMeterTreeNode) child.clone();
+ childClone.setUserObject(
+ ((TestElement) child.getUserObject()).clone());
+diff -urN
build-tree/jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
+---
build-tree/jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
2004-02-13 03:21:36.000000000 +0100
++++
jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
2005-04-08 11:07:50.198244000 +0200
+@@ -179,10 +179,10 @@
+ {
+ nodeList.add(node);
+ }
+- Enumeration enum = node.children();
+- while (enum.hasMoreElements())
++ Enumeration e = node.children();
++ while (e.hasMoreElements())
+ {
+- JMeterTreeNode child = (JMeterTreeNode) enum.nextElement();
++ JMeterTreeNode child = (JMeterTreeNode) e.nextElement();
+ traverseAndFind(type, child, nodeList);
+ }
+ }
+@@ -195,10 +195,10 @@
+ {
+ return node;
+ }
+- Enumeration enum = node.children();
+- while (enum.hasMoreElements())
++ Enumeration e = node.children();
++ while (e.hasMoreElements())
+ {
+- JMeterTreeNode child = (JMeterTreeNode) enum.nextElement();
++ JMeterTreeNode child = (JMeterTreeNode) e.nextElement();
+ JMeterTreeNode result= traverseAndFind(userObject, child);
+ if (result != null) return result;
+ }
+@@ -208,10 +208,10 @@
+ public HashTree getCurrentSubTree(JMeterTreeNode node)
+ {
+ ListedHashTree hashTree = new ListedHashTree(node);
+- Enumeration enum = node.children();
+- while (enum.hasMoreElements())
++ Enumeration e = node.children();
++ while (e.hasMoreElements())
+ {
+- JMeterTreeNode child = (JMeterTreeNode) enum.nextElement();
++ JMeterTreeNode child = (JMeterTreeNode) e.nextElement();
+ hashTree.add(node, getCurrentSubTree(child));
+ }
+ return hashTree;
+diff -urN
build-tree/jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/resources/PackageTest.java
jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/resources/PackageTest.java
+---
build-tree/jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/resources/PackageTest.java
2004-03-30 20:08:09.000000000 +0200
++++ jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/resources/PackageTest.java
2005-04-08 11:27:24.113382000 +0200
+@@ -120,13 +120,13 @@
+ else
+ {
+ // Check all the keys are in the default props file
+- Enumeration enum = getRAS(res).getKeys();
+- while(enum.hasMoreElements())
++ Enumeration en = getRAS(res).getKeys();
++ while(en.hasMoreElements())
+ {
+ String key = null;
+ try
+ {
+- key = (String)enum.nextElement();
++ key = (String)en.nextElement();
+ defaultPRB.getString(key);
+ }
+ catch (MissingResourceException e)
+diff -urN
build-tree/jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/util/JsseSSLManager.java
jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/util/JsseSSLManager.java
+---
build-tree/jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/util/JsseSSLManager.java
2004-02-13 03:21:37.000000000 +0100
++++ jakarta-jmeter-2.0.0/src/core/org/apache/jmeter/util/JsseSSLManager.java
2005-04-08 11:06:56.693398000 +0200
+@@ -245,12 +245,12 @@
+ {
+ try
+ {
+- java.util.Enumeration enum = store.aliases();
++ java.util.Enumeration e = store.aliases();
+ java.util.ArrayList list =
+ new java.util.ArrayList(store.size());
+- while (enum.hasMoreElements())
++ while (e.hasMoreElements())
+ {
+- String alias = (String) enum.nextElement();
++ String alias = (String) e.nextElement();
+ log.info("AlwaysTrustManager alias: " + alias);
+ if (store.isCertificateEntry(alias))
+ {
+diff -urN
build-tree/jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
+---
build-tree/jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
2004-03-20 01:35:27.000000000 +0100
++++
jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
2005-04-08 11:31:26.784284000 +0200
+@@ -204,11 +204,11 @@
+ if (url2 != null) s2= url2.toString();
+
+ // TODO should really return most specific (i.e. longest) match.
+- for (PropertyIterator enum = getAuthObjects().iterator();
+- enum.hasNext();
++ for (PropertyIterator en = getAuthObjects().iterator();
++ en.hasNext();
+ )
+ {
+- Authorization auth = (Authorization) enum.next().getObjectValue();
++ Authorization auth = (Authorization) en.next().getObjectValue();
+
+ String uRL = auth.getURL();
+ if (s1.startsWith(uRL) || s2 != null &&
s2.startsWith(uRL))
+diff -urN
build-tree/jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
+---
build-tree/jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
2004-03-24 00:23:32.000000000 +0100
++++
jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
2005-04-08 11:30:45.992059000 +0200
+@@ -280,9 +280,9 @@
+ return null;
+
+ StringBuffer header = new StringBuffer();
+- for (PropertyIterator enum = getCookies().iterator(); enum.hasNext();)
++ for (PropertyIterator en = getCookies().iterator(); en.hasNext();)
+ {
+- Cookie cookie = (Cookie) enum.next().getObjectValue();
++ Cookie cookie = (Cookie) en.next().getObjectValue();
+ // Add a leading dot to the host name so that host X matches
+ // domain .X. This is a breach of the standard, but it's how
+ // browsers behave:
+@@ -598,4 +598,4 @@
+ assertNull(man.getCookieHeaderForURL(url));
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff -urN
build-tree/jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+---
build-tree/jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
2004-02-20 02:03:07.000000000 +0100
++++
jakarta-jmeter-2.0.0/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
2005-04-08 11:30:02.303387000 +0200
+@@ -496,11 +496,11 @@
+ LinkedList elements= new LinkedList();
+
+ // Look for elements directly within the HTTP proxy:
+- Enumeration enum = treeModel.getNodeOf(this).children();
+- while (enum.hasMoreElements())
++ Enumeration en = treeModel.getNodeOf(this).children();
++ while (en.hasMoreElements())
+ {
+ JMeterTreeNode subNode =
+- (JMeterTreeNode) enum.nextElement();
++ (JMeterTreeNode) en.nextElement();
+ if (subNode.isEnabled())
+ {
+ TestElement element= (TestElement)subNode.getUserObject();
+@@ -517,11 +517,11 @@
+ controller != null;
+ controller= (JMeterTreeNode)controller.getParent())
+ {
+- enum = controller.children();
+- while (enum.hasMoreElements())
++ en = controller.children();
++ while (en.hasMoreElements())
+ {
+ JMeterTreeNode subNode =
+- (JMeterTreeNode) enum.nextElement();
++ (JMeterTreeNode) en.nextElement();
+ if (subNode.isEnabled())
+ {
+ TestElement element= (TestElement)subNode.getUserObject();
+@@ -776,11 +776,11 @@
+ {
+ JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel();
+ JMeterTreeNode myNode = treeModel.getNodeOf(this);
+- Enumeration enum = myNode.children();
+- while (enum.hasMoreElements())
++ Enumeration en = myNode.children();
++ while (en.hasMoreElements())
+ {
+ JMeterTreeNode subNode =
+- (JMeterTreeNode) enum.nextElement();
++ (JMeterTreeNode) en.nextElement();
+ if (subNode.isEnabled()) {
+ TestElement testElement =
+ (TestElement) subNode.getTestElement();
+@@ -799,11 +799,11 @@
+ {
+ JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel();
+ JMeterTreeNode myNode = treeModel.getNodeOf(this);
+- Enumeration enum = myNode.children();
+- while (enum.hasMoreElements())
++ Enumeration en = myNode.children();
++ while (en.hasMoreElements())
+ {
+ JMeterTreeNode subNode =
+- (JMeterTreeNode) enum.nextElement();
++ (JMeterTreeNode) en.nextElement();
+ if (subNode.isEnabled()) {
+ TestElement testElement =
+ (TestElement) subNode.getTestElement();
+@@ -822,11 +822,11 @@
+ {
+ JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel();
+ JMeterTreeNode myNode = treeModel.getNodeOf(this);
+- Enumeration enum = myNode.children();
+- while (enum.hasMoreElements())
++ Enumeration en = myNode.children();
++ while (en.hasMoreElements())
+ {
+ JMeterTreeNode subNode =
+- (JMeterTreeNode) enum.nextElement();
++ (JMeterTreeNode) en.nextElement();
+ if (subNode.isEnabled()) {
+ TestElement testElement =
+ (TestElement) subNode.getTestElement();
+diff -urN tmp/src/core/org/w3c/tidy/Configuration.java
jakarta-jmeter-2.0.0/src/core/org/w3c/tidy/Configuration.java
+--- tmp/src/core/org/w3c/tidy/Configuration.java 2005-04-08
11:50:20.418473000 +0200
++++ jakarta-jmeter-2.0.0/src/core/org/w3c/tidy/Configuration.java
2005-04-08 11:52:34.612986640 +0200
+@@ -123,10 +123,10 @@
+
+ public void addProps( Properties p )
+ {
+- Enumeration enum = p.propertyNames();
+- while (enum.hasMoreElements())
++ Enumeration en = p.propertyNames();
++ while (en.hasMoreElements())
+ {
+- String key = (String) enum.nextElement();
++ String key = (String) en.nextElement();
+ String value = p.getProperty(key);
+ _properties.put(key, value);
+ }
diff -urN ../tmp-orig/jmeter-2.0.0/debian/control ./debian/control
--- ../tmp-orig/jmeter-2.0.0/debian/control 2005-04-08 12:10:50.476411122
+0200
+++ ./debian/control 2005-04-08 11:03:25.014570380 +0200
@@ -2,7 +2,7 @@
Section: contrib/net
Priority: optional
Maintainer: Takashi Okamoto <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 2.1.0), sun-j2sdk1.4debian, ant (>=1.3),
libavalon-framework-java, libavalon-excalibur-java, libxerces-java |
libxerces2-java, liblog4j1.2-java, liboro-java, libxalan2-java, bsh, libbsf-java
+Build-Depends-Indep: debhelper, j2sdk1.5, ant, libavalon-framework-java,
libavalon-excalibur-java, libxerces-java | libxerces2-java, liblog4j1.2-java,
liboro-java, libxalan2-java, bsh, libbsf-java
Standards-Version: 3.5.8
Package: jmeter
diff -urN ../tmp-orig/jmeter-2.0.0/debian/rules ./debian/rules
--- ../tmp-orig/jmeter-2.0.0/debian/rules 2005-04-08 12:10:50.477410933
+0200
+++ ./debian/rules 2005-04-08 11:35:38.502358591 +0200
@@ -5,10 +5,10 @@
package=jmeter
-CLASSPATH=/usr/lib/j2re1.3/lib/rt.jar:/home/tora/tmp/jakarta-velocity/bin/velocity-1.4-dev.jar:/usr/share/java/oro.jar:/usr/share/java/xerces.jar:/usr/share/java/junit.jar:/usr/share/java/log4j.jar:/usr/share/java/avalon-framework.jar:/usr/share/java/avalon-excalibur.jar:/usr/share/java/regexp.jar:/usr/share/ant1.6/lib/ant.jar:/usr/share/ant1.6/lib/ant-nodeps.jar:/usr/share/ant1.6/lib/ant-launcher.jar:lib/velocity-1.4-dev.jar:lib/jdom-b9.jar:lib/jdom-b8.jar:lib/avalon-framework-4.1.4.jar:lib/avalon-excalibur-4.1.jar:lib/avalon-excalibur-4.1.jar:lib/commons-collections.jar:lib/logkit-1.2.jar:/usr/share/java/gnumail.jar:/usr/share/java/activation.jar:/usr/share/java/bsh.jar:/usr/share/java/bsf.jar:.
+CLASSPATH=/usr/lib/j2sdk1.5-sun/lib/rt.jar:/home/tora/tmp/jakarta-velocity/bin/velocity-1.4-dev.jar:/usr/share/java/oro.jar:/usr/share/java/xerces.jar:/usr/share/java/junit.jar:/usr/share/java/log4j.jar:/usr/share/java/avalon-framework.jar:/usr/share/java/avalon-excalibur.jar:/usr/share/java/regexp.jar:/usr/share/ant1.6/lib/ant.jar:/usr/share/ant1.6/lib/ant-nodeps.jar:/usr/share/ant1.6/lib/ant-launcher.jar:lib/velocity-1.4-dev.jar:lib/jdom-b9.jar:lib/jdom-b8.jar:lib/avalon-framework-4.1.4.jar:lib/avalon-excalibur-4.1.jar:lib/avalon-excalibur-4.1.jar:lib/commons-collections.jar:lib/logkit-1.2.jar:/usr/share/java/gnumail.jar:/usr/share/java/activation.jar:/usr/share/java/bsh.jar:/usr/share/java/bsf.jar:.
-JAVA_HOME=/usr/lib/j2sdk1.4-sun
+JAVA_HOME=/usr/lib/j2sdk1.5-sun
JAVA=${JAVA_HOME}/bin/java
include debian/rules.mk
@@ -58,9 +58,9 @@
# install -m 755 debian/bin/jmeter debian/bin/jmeter-server
debian/tmp/usr/bin
install -m 755 debian/bin/jmeter debian/tmp/usr/bin
mkdir -p debian/tmp/usr/share/jmeter/printable_docs/
- cp -ar $(builddir)/docs/usermanual
debian/tmp/usr/share/jmeter/printable_docs/
+ cp -ar $(builddir)/*docs/usermanual
debian/tmp/usr/share/jmeter/printable_docs/
- dh_installdocs -i $(builddir)/docs
+ dh_installdocs -i $(builddir)/*docs
# Must have debmake installed for this to work. Otherwise please copy
# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
diff -urN ../tmp-orig/jmeter-2.0.0/debian/rules.mk ./debian/rules.mk
--- ../tmp-orig/jmeter-2.0.0/debian/rules.mk 2005-04-08 12:10:50.478410744
+0200
+++ ./debian/rules.mk 2005-04-08 11:51:35.900135337 +0200
@@ -13,6 +13,7 @@
mv jtidy-04aug2000r7-dev $(buildtree)
cp -r sources/com $(buildtree)/jakarta-jmeter-2.0.0/src/core
cp -r $(buildtree)/jtidy-04aug2000r7-dev/src/*
$(buildtree)/jakarta-jmeter-2.0.0/src/core
+ cat *.diff | ( cd $(buildtree) && patch -p0 )
touch extract-stamp
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
