rpms/httpunit/devel httpunit-JavaScript-NotAFunctionException.patch, NONE, 1.1 httpunit-servlettest.patch, NONE, 1.1 httpunit.build.patch, NONE, 1.1 httpunit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matt Wringe (mwringe)
fedora-extras-commits at redhat.com
Mon Mar 19 13:49:01 UTC 2007
Author: mwringe
Update of /cvs/extras/rpms/httpunit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29509/devel
Modified Files:
.cvsignore sources
Added Files:
httpunit-JavaScript-NotAFunctionException.patch
httpunit-servlettest.patch httpunit.build.patch httpunit.spec
Log Message:
auto-import httpunit-1.6.2-1jpp.1 on branch devel from httpunit-1.6.2-1jpp.1.src.rpm
httpunit-JavaScript-NotAFunctionException.patch:
--- NEW FILE httpunit-JavaScript-NotAFunctionException.patch ---
--- 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 );
}
httpunit-servlettest.patch:
--- NEW FILE httpunit-servlettest.patch ---
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>
httpunit.build.patch:
--- NEW FILE httpunit.build.patch ---
--- 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">
--- NEW FILE httpunit.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the
# distribution.
# 3. Neither the name of the JPackage Project nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
Name: httpunit
Version: 1.6.2
Release: 1jpp.1%{?dist}
Epoch: 0
Summary: Automated web site testing toolkit
License: MIT
Source0: http://download.sourceforge.net/httpunit/httpunit-1.6.2.zip
Patch0: %{name}.build.patch
Patch1: %{name}-JavaScript-NotAFunctionException.patch
Patch2: %{name}-servlettest.patch
URL: http://httpunit.sourceforge.net/
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant >= 0:1.6
BuildRequires: nekohtml
BuildRequires: jtidy
BuildRequires: junit >= 0:3.8
BuildRequires: servlet24
BuildRequires: javamail >= 0:1.3
BuildRequires: jaf >= 0:1.0.2
BuildRequires: rhino
BuildRequires: %{__unzip}
Requires: junit >= 0:3.8
Requires: jpackage-utils
Requires: servlet24
Requires: jaxp_parser_impl
# As of 1.5, requires either nekohtml or jtidy, and prefers nekohtml.
Requires: nekohtml
Requires: rhino
Group: Development/Tools
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
HttpUnit emulates the relevant portions of browser behavior, including form
submission, JavaScript, basic http authentication, cookies and automatic page
redirection, and allows Java test code to examine returned pages either as
text, an XML DOM, or containers of forms, tables, and links.
A companion framework, ServletUnit is included in the package.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
%description javadoc
Javadoc for %{name}
%package doc
Summary: Documentation for %{name}
Group: Development/Documentation
Requires: %{name}-javadoc
%description doc
Documentation for %{name}
%package demo
Summary: Demo for %{name}
Group: Development/Testing
Requires: %{name} = %{epoch}:%{version}-%{release}
%description demo
Demonstrations and samples for %{name}.
%prep
%setup -q
# to create the test and examples jar
%patch0 -p0
# patch to work with rhino 1.5
%patch1 -b .sav
# add META-INF
%patch2
#%{__unzip} -qd META-INF lib/httpunit.jar "*.dtd" # 1.6 dist zip is borked
# remove all binary libs and javadocs
find . -name "*.jar" -exec rm -f {} \;
rm -rf doc/api
ln -s \
%{_javadir}/junit.jar \
%{_javadir}/jtidy.jar \
%{_javadir}/nekohtml.jar \
%{_javadir}/servletapi5.jar \
%{_javadir}/js.jar \
%{_javadir}/xerces-j2.jar \
jars
%build
export CLASSPATH=$(build-classpath jaf javamail)
ant -Dbuild.compiler=modern -Dbuild.sysclasspath=last \
jar javadocs test servlettest testjar examplesjar
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
# Jar versioning
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; \
do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# Javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# Avoid having api in doc
rm -rf doc/api
# Fix link between doc and javadoc
pushd doc
ln -sf %{_javadocdir}/%{name}-%{version} api
popd
# Demo
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -p examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -p lib/%{name}-test.jar \
$RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-test-%{version}.jar
cp -p lib/%{name}-examples.jar \
$RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-examples-%{version}.jar
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(0644,root,root,0755)
%{_javadir}/*
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
%files doc
%defattr(0644,root,root,0755)
%doc doc/*
%files demo
%defattr(0644,root,root,0755)
%{_datadir}/%{name}
%changelog
* Wed Feb 14 2007 Permaine Cheung <pcheung at redhat.com> - 0:1.6.2-1jpp.1
- Fixed buildroot, release
- Renamed manual subpackage to doc subpackage as per fedora packaging guideline
- Got rid of Vendor and Distribution tags.
* Mon May 08 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.6.2-1jpp
- Upgrade to 1.6.2
- First JPP-1.7 release
* Sat Nov 13 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.6-1jpp
- Update to 1.6.
- Require Servlet API 2.3, ServletUnit doesn't work with 2.4.
- Fix classpath construction during build; now works also with classpathx-mail.
- Apply upstream patch to build with Java 1.5 (built with 1.4.2 though).
- Patch to fix class path in servlet tests during build.
* Wed Sep 22 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.5.4-3jpp
- Patched JavaScript.java to not handle NotAFunctionException,
as in Rhino-1.5-R5 this now is deprecated, not thrown any more
and extends Error; also not to handle PropertyException not thrown
any more in that try block
* Wed Aug 25 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.5.4-2jpp
- Build with ant-1.6.2
* Thu Aug 21 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5.4-1jpp
- Update to 1.5.4.
- Save .spec in UTF-8.
* Mon May 5 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5.3-2jpp
- Fix non-versioned javadoc symlinking.
* Mon Apr 21 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5.3-1jpp
- Update to 1.5.3 and JPackage 1.5.
- Include non-versioned javadoc symlink.
* Tue Mar 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 1.5.2-1jpp
- Update to 1.5.2.
- Run unit tests during build.
* Wed Dec 18 2002 Ville Skyttä <ville.skytta at iki.fi> - 1.5.1-1jpp
- Update to 1.5.1.
* Mon Nov 4 2002 Ville Skyttä <ville.skytta at iki.fi> 1.5-1jpp
- Update to 1.5.
* Thu Oct 3 2002 Ville Skyttä <ville.skytta at iki.fi> 1.4.6-1jpp
- Update to 1.4.6.
* Fri Sep 6 2002 Ville Skyttä <ville.skytta at iki.fi> 1.4.5-0.cvs20020906.1jpp
- Update to 1.4.5 (CVS 2002-09-06, CVS version needed since we have JUnit 3.8).
- Add requirements.
- Add rhino and xerces to build requirements.
- Fix/add Distribution, License, Vendor tags.
- Use sed instead of bash2 extension when symlinking jars during build.
- s/Copyright/License/
* Tue Jul 16 2002 Henri Gomez <hgomez at users.sourceforge.net> 1.4.1-1jpp
- first jpp release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/httpunit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 19 Mar 2007 00:40:18 -0000 1.1
+++ .cvsignore 19 Mar 2007 13:48:28 -0000 1.2
@@ -0,0 +1 @@
+httpunit-1.6.2.zip
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpunit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 19 Mar 2007 00:40:18 -0000 1.1
+++ sources 19 Mar 2007 13:48:28 -0000 1.2
@@ -0,0 +1 @@
+9d841b1c78568371df357bb35a32a3a6 httpunit-1.6.2.zip
More information about the fedora-extras-commits
mailing list