SOURCES: httpunit.build.patch (NEW), httpunit-JavaScript-NotAFunct...

glen glen at pld-linux.org
Wed May 10 23:24:27 CEST 2006


Author: glen                         Date: Wed May 10 21:24:27 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- originated from jpackage

---- Files affected:
SOURCES:
   httpunit.build.patch (NONE -> 1.1)  (NEW), httpunit-JavaScript-NotAFunctionException.patch (NONE -> 1.1)  (NEW), httpunit-servlettest.patch (NONE -> 1.1)  (NEW), httpunit-java15.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/httpunit.build.patch
diff -u /dev/null SOURCES/httpunit.build.patch:1.1
--- /dev/null	Wed May 10 23:24:27 2006
+++ SOURCES/httpunit.build.patch	Wed May 10 23:24:22 2006
@@ -0,0 +1,43 @@
+--- build.xml.orig	2004-10-03 10:17:14.000000000 +0300
++++ build.xml	2004-11-13 18:47:27.904846669 +0200
+@@ -51,7 +51,7 @@
+ <target name="check_for_optional_packages">
+     <available property="jsdk.present"     classname="javax.servlet.http.HttpServlet"
+                                            classpathref="base.classpath" />
+-    <available property="javamail.present" classname="javax.mail.internet.MimeMultipart"
++    <available property="javamail.present" classname="javax.mail.MessagingException"
+                                            classpathref="base.classpath" />
+     <available property="jaxp.present"     classname="javax.xml.parsers.DocumentBuilderFactory"
+                                            classpathref="base.classpath" />
+@@ -173,6 +173,13 @@
+ 
+ 
+ <!--  ===================================================================  -->
++<!--  Creates the test jar archive                                         -->
++<!--  ===================================================================  -->
++<target name="testjar" depends="testcompile">
++    <mkdir dir="${lib.dir}" />
++    <jar jarfile="${lib.dir}/${name}-test.jar" basedir="${test.classes}" includes="com/**" />
++</target>
++
+ <!--  Creates the jar archive                                              -->
+ <!--  ===================================================================  -->
+ <target name="jar" depends="compile">
+@@ -191,6 +198,17 @@
+ 
+ 
+ <!--  ===================================================================  -->
++
++<!--  ===================================================================  -->
++<!--  Creates the examples jar archive                                     -->
++<!--  ===================================================================  -->
++<target name="examplesjar" depends="compile-examples">
++    <mkdir dir="${lib.dir}" />
++    <jar jarfile="${lib.dir}/${name}-examples.jar" basedir="${example.classes}" />
++</target>
++
++
++<!--  ===================================================================  -->
+ <!--  Creates the API documentation                                        -->
+ <!--  ===================================================================  -->
+ <target name="javadocs" depends="prepare">

================================================================
Index: SOURCES/httpunit-JavaScript-NotAFunctionException.patch
diff -u /dev/null SOURCES/httpunit-JavaScript-NotAFunctionException.patch:1.1
--- /dev/null	Wed May 10 23:24:27 2006
+++ SOURCES/httpunit-JavaScript-NotAFunctionException.patch	Wed May 10 23:24:22 2006
@@ -0,0 +1,18 @@
+--- src/com/meterware/httpunit/javascript/JavaScript.java.orig	2004-10-03 10:17:12.000000000 +0300
++++ src/com/meterware/httpunit/javascript/JavaScript.java	2004-11-13 18:48:18.546230094 +0200
+@@ -826,10 +826,15 @@
+         static ElementArray newElementArray( Scriptable parent ) {
+             try {
+                 return (ElementArray) Context.getCurrentContext().newObject( parent, "ElementArray" );
++/* PropertyException not thrown here as of Rhino-1.5-R5
+             } catch (PropertyException e) {
+                 throw new RhinoException( e );
++*/
++/* deprecated NotAFunctionException now extends Error
++   and is no longer thrown by Rhino-1.5-R5
+             } catch (NotAFunctionException e) {
+                 throw new RhinoException( e );
++*/
+             } catch (JavaScriptException e) {
+                 throw new RhinoException( e );
+             }

================================================================
Index: SOURCES/httpunit-servlettest.patch
diff -u /dev/null SOURCES/httpunit-servlettest.patch:1.1
--- /dev/null	Wed May 10 23:24:27 2006
+++ SOURCES/httpunit-servlettest.patch	Wed May 10 23:24:22 2006
@@ -0,0 +1,15 @@
+Index: build.xml
+===================================================================
+RCS file: /cvsroot/httpunit/httpunit/build.xml,v
+retrieving revision 1.77
+diff -u -r1.77 build.xml
+--- build.xml	5 Oct 2004 03:45:15 -0000	1.77
++++ build.xml	13 Nov 2004 19:06:13 -0000
+@@ -166,6 +166,7 @@
+          <classpath>
+              <path refid="base.classpath" />
+              <pathelement location="${build.classes}" />
++             <pathelement location="META-INF" />
+              <pathelement location="${test.classes}" />
+          </classpath>
+     </java>

================================================================
Index: SOURCES/httpunit-java15.patch
diff -u /dev/null SOURCES/httpunit-java15.patch:1.1
--- /dev/null	Wed May 10 23:24:27 2006
+++ SOURCES/httpunit-java15.patch	Wed May 10 23:24:22 2006
@@ -0,0 +1,73 @@
+Index: src/com/meterware/httpunit/parsing/NekoDOMParser.java
+===================================================================
+RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/parsing/NekoDOMParser.java,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- src/com/meterware/httpunit/parsing/NekoDOMParser.java	12 Mar 2003 17:34:07 -0000	1.2
++++ src/com/meterware/httpunit/parsing/NekoDOMParser.java	5 Oct 2004 11:29:52 -0000	1.3
+@@ -142,17 +142,17 @@
+             System.out.println( "At line " + warningException.getLineNumber() + ", column " + warningException.getColumnNumber() + ": " + warningException.getMessage() );
+         }
+ 
+-        Enumeration enum = HTMLParserFactory.getHTMLParserListeners().elements();
+-        while (enum.hasMoreElements()) {
+-            ((HTMLParserListener) enum.nextElement()).warning( _url, warningException.getMessage(), warningException.getLineNumber(), warningException.getColumnNumber() );
++        Enumeration listeners = HTMLParserFactory.getHTMLParserListeners().elements();
++        while (listeners.hasMoreElements()) {
++            ((HTMLParserListener) listeners.nextElement()).warning( _url, warningException.getMessage(), warningException.getLineNumber(), warningException.getColumnNumber() );
+         }
+     }
+ 
+ 
+     public void error( String domain, String key, XMLParseException errorException ) throws XNIException {
+-        Enumeration enum = HTMLParserFactory.getHTMLParserListeners().elements();
+-        while (enum.hasMoreElements()) {
+-            ((HTMLParserListener) enum.nextElement()).error( _url, errorException.getMessage(), errorException.getLineNumber(), errorException.getColumnNumber() );
++        Enumeration listeners = HTMLParserFactory.getHTMLParserListeners().elements();
++        while (listeners.hasMoreElements()) {
++            ((HTMLParserListener) listeners.nextElement()).error( _url, errorException.getMessage(), errorException.getLineNumber(), errorException.getColumnNumber() );
+         }
+     }
+ 
+Index: src/com/meterware/httpunit/parsing/JTidyPrintWriter.java
+===================================================================
+RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/parsing/JTidyPrintWriter.java,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- src/com/meterware/httpunit/parsing/JTidyPrintWriter.java	25 Dec 2002 15:23:11 -0000	1.2
++++ src/com/meterware/httpunit/parsing/JTidyPrintWriter.java	5 Oct 2004 11:29:52 -0000	1.3
+@@ -1,6 +1,6 @@
+ package com.meterware.httpunit.parsing;
+ /********************************************************************************************************************
+-* $Id$
++* $Id$
+ *
+ * Copyright (c) 2001-2002, Russell Gold
+ *
+@@ -198,17 +198,17 @@
+     }
+ 
+     private void reportError( String msg, int line, int column ) {
+-        Enumeration enum = HTMLParserFactory.getHTMLParserListeners().elements();
+-        while (enum.hasMoreElements()) {
+-            ((HTMLParserListener) enum.nextElement()).error( _url, msg, line, column );
++        Enumeration listeners = HTMLParserFactory.getHTMLParserListeners().elements();
++        while (listeners.hasMoreElements()) {
++            ((HTMLParserListener) listeners.nextElement()).error( _url, msg, line, column );
+         }
+     }
+ 
+ 
+     private void reportWarning( String msg, int line, int column ) {
+-        Enumeration enum = HTMLParserFactory.getHTMLParserListeners().elements();
+-        while (enum.hasMoreElements()) {
+-            ((HTMLParserListener) enum.nextElement()).warning( _url, msg, line, column );
++        Enumeration listeners = HTMLParserFactory.getHTMLParserListeners().elements();
++        while (listeners.hasMoreElements()) {
++            ((HTMLParserListener) listeners.nextElement()).warning( _url, msg, line, column );
+         }
+     }
+ }
+\ No newline at end of file
================================================================


More information about the pld-cvs-commit mailing list