[pkg-java] r11613 - in trunk/httpunit/debian: . patches source
Gabriele Giacone
gg0-guest at alioth.debian.org
Wed Feb 17 22:45:24 UTC 2010
Author: gg0-guest
Date: 2010-02-17 22:45:23 +0000 (Wed, 17 Feb 2010)
New Revision: 11613
Added:
trunk/httpunit/debian/libhttpunit-java.poms
trunk/httpunit/debian/maven.rules
trunk/httpunit/debian/patches/add_classpath_to_manifest
trunk/httpunit/debian/patches/fix_set_encoding
trunk/httpunit/debian/patches/series
trunk/httpunit/debian/patches/use_system_jars
trunk/httpunit/debian/pom.xml
trunk/httpunit/debian/source/
trunk/httpunit/debian/source/format
Removed:
trunk/httpunit/debian/patches/00list
trunk/httpunit/debian/patches/add_classpath_to_manifest.dpatch
trunk/httpunit/debian/patches/fix_set_encoding.dpatch
trunk/httpunit/debian/patches/use_system_jars.dpatch
Modified:
trunk/httpunit/debian/
trunk/httpunit/debian/changelog
trunk/httpunit/debian/control
trunk/httpunit/debian/rules
Log:
Added maven support
Property changes on: trunk/httpunit/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/httpunit/debian/changelog
===================================================================
--- trunk/httpunit/debian/changelog 2010-02-17 22:30:15 UTC (rev 11612)
+++ trunk/httpunit/debian/changelog 2010-02-17 22:45:23 UTC (rev 11613)
@@ -1,3 +1,11 @@
+httpunit (1.7+dfsg-3) unstable; urgency=low
+
+ * Added Maven support
+ * Standards-Version to 3.8.4
+ * Source format 3.0, removed dpatch dependency
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com> Wed, 17 Feb 2010 23:39:09 +0100
+
httpunit (1.7+dfsg-2) unstable; urgency=low
[ Miguel Landaeta ]
Modified: trunk/httpunit/debian/control
===================================================================
--- trunk/httpunit/debian/control 2010-02-17 22:30:15 UTC (rev 11612)
+++ trunk/httpunit/debian/control 2010-02-17 22:45:23 UTC (rev 11613)
@@ -4,12 +4,11 @@
Section: libs
Priority: optional
Build-Depends: openjdk-6-jdk (>= 6b11-9.1), ant (>= 1.7.0-6), cdbs (>= 0.4.52),
- debhelper (>= 5), dpatch (>= 2.0.30), rhino (>= 1.7R1-2),
- libjtidy-java (>= 7+svn20070309-2), libgnujaf-java (>= 1.1.1-4),
- junit (>= 3.8.2), libgnumail-java (>= 1.1.2-2),
- libservlet2.4-java (>= 5.0.30-8), libxerces2-java (>= 2.9.1-2),
- libnekohtml-java (>= 0.9.5+dfsg-1.1)
-Standards-Version: 3.8.3
+ debhelper (>= 5), rhino (>= 1.7R1-2), libjtidy-java (>= 7+svn20070309-2),
+ libgnujaf-java (>= 1.1.1-4), junit (>= 3.8.2), libgnumail-java (>= 1.1.2-2),
+ libservlet2.4-java (>= 5.0.30-8), libxerces2-java (>= 2.9.1-2),
+ libnekohtml-java (>= 0.9.5+dfsg-1.1)
+Standards-Version: 3.8.4
Homepage: http://httpunit.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/httpunit/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/httpunit
Added: trunk/httpunit/debian/libhttpunit-java.poms
===================================================================
--- trunk/httpunit/debian/libhttpunit-java.poms (rev 0)
+++ trunk/httpunit/debian/libhttpunit-java.poms 2010-02-17 22:45:23 UTC (rev 11613)
@@ -0,0 +1 @@
+debian/pom.xml
Added: trunk/httpunit/debian/maven.rules
===================================================================
--- trunk/httpunit/debian/maven.rules (rev 0)
+++ trunk/httpunit/debian/maven.rules 2010-02-17 22:45:23 UTC (rev 11613)
@@ -0,0 +1,2 @@
+s/nekohtml/net.sourceforge.nekohtml/ nekohtml jar s/.*/debian/ *
+s/xerces/javax.xml/ s/xmlParserAPIs/jaxp-api/ jar s/.*/debian/ *
Deleted: trunk/httpunit/debian/patches/00list
===================================================================
--- trunk/httpunit/debian/patches/00list 2010-02-17 22:30:15 UTC (rev 11612)
+++ trunk/httpunit/debian/patches/00list 2010-02-17 22:45:23 UTC (rev 11613)
@@ -1,3 +0,0 @@
-use_system_jars
-fix_set_encoding
-add_classpath_to_manifest
Copied: trunk/httpunit/debian/patches/add_classpath_to_manifest (from rev 11605, trunk/httpunit/debian/patches/add_classpath_to_manifest.dpatch)
===================================================================
--- trunk/httpunit/debian/patches/add_classpath_to_manifest (rev 0)
+++ trunk/httpunit/debian/patches/add_classpath_to_manifest 2010-02-17 22:45:23 UTC (rev 11613)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## add_classpath_to_manifest.dpatch by Florian Weimer <fweimer at bfk.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add Class-Path entry to the manifest, so packages using
+## DP: httpunit don't have to worry about httpunit's internal dependencies.
+
+ at DPATCH@
+diff -urNad httpunit-1.7+dfsg~/build.xml httpunit-1.7+dfsg/build.xml
+--- httpunit-1.7+dfsg~/build.xml 2008-05-20 09:55:36.000000000 -0430
++++ httpunit-1.7+dfsg/build.xml 2009-07-25 14:30:26.000000000 -0430
+@@ -241,6 +241,9 @@
+ Build-Time: ${TSTAMP}
+ </echo>
+ <jar jarfile="${lib.dir}/${name}.jar" manifest="${build.dir}/info.txt">
++ <manifest>
++ <attribute name="Class-Path" value="jtidy.jar nekohtml.jar xercesImpl.jar"/>
++ </manifest>
+ <fileset dir="${build.classes}" includes="com/**"/>
+ <fileset dir="META-INF" includes="*.dtd"/>
+ </jar>
Deleted: trunk/httpunit/debian/patches/add_classpath_to_manifest.dpatch
===================================================================
--- trunk/httpunit/debian/patches/add_classpath_to_manifest.dpatch 2010-02-17 22:30:15 UTC (rev 11612)
+++ trunk/httpunit/debian/patches/add_classpath_to_manifest.dpatch 2010-02-17 22:45:23 UTC (rev 11613)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## add_classpath_to_manifest.dpatch by Florian Weimer <fweimer at bfk.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add Class-Path entry to the manifest, so packages using
-## DP: httpunit don't have to worry about httpunit's internal dependencies.
-
- at DPATCH@
-diff -urNad httpunit-1.7+dfsg~/build.xml httpunit-1.7+dfsg/build.xml
---- httpunit-1.7+dfsg~/build.xml 2008-05-20 09:55:36.000000000 -0430
-+++ httpunit-1.7+dfsg/build.xml 2009-07-25 14:30:26.000000000 -0430
-@@ -241,6 +241,9 @@
- Build-Time: ${TSTAMP}
- </echo>
- <jar jarfile="${lib.dir}/${name}.jar" manifest="${build.dir}/info.txt">
-+ <manifest>
-+ <attribute name="Class-Path" value="jtidy.jar nekohtml.jar xercesImpl.jar"/>
-+ </manifest>
- <fileset dir="${build.classes}" includes="com/**"/>
- <fileset dir="META-INF" includes="*.dtd"/>
- </jar>
Copied: trunk/httpunit/debian/patches/fix_set_encoding (from rev 11605, trunk/httpunit/debian/patches/fix_set_encoding.dpatch)
===================================================================
--- trunk/httpunit/debian/patches/fix_set_encoding (rev 0)
+++ trunk/httpunit/debian/patches/fix_set_encoding 2010-02-17 22:45:23 UTC (rev 11613)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_set_encoding.dpatch by Miguel Landaeta <miguel at miguel.cc>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: method setCharEncoding from Tidy class was removed from API.
+## DP: now the methods setInputEncoding and setOutputEncoding must be used.
+
+ at DPATCH@
+diff -urNad httpunit-1.7+dfsg~/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java httpunit-1.7+dfsg/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java
+--- httpunit-1.7+dfsg~/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java 2008-05-20 16:25:36.000000000 +0000
++++ httpunit-1.7+dfsg/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java 2009-03-04 21:25:54.000000000 +0000
+@@ -87,7 +87,8 @@
+
+ private static Tidy getParser( URL url ) {
+ Tidy tidy = new Tidy();
+- tidy.setCharEncoding( org.w3c.tidy.Configuration.UTF8 );
++ tidy.setInputEncoding( "UTF8" );
++ tidy.setOutputEncoding( "UTF8" );
+ tidy.setQuiet( true );
+ tidy.setShowWarnings( HTMLParserFactory.isParserWarningsEnabled() );
+ if (!HTMLParserFactory.getHTMLParserListeners().isEmpty()) {
Deleted: trunk/httpunit/debian/patches/fix_set_encoding.dpatch
===================================================================
--- trunk/httpunit/debian/patches/fix_set_encoding.dpatch 2010-02-17 22:30:15 UTC (rev 11612)
+++ trunk/httpunit/debian/patches/fix_set_encoding.dpatch 2010-02-17 22:45:23 UTC (rev 11613)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_set_encoding.dpatch by Miguel Landaeta <miguel at miguel.cc>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: method setCharEncoding from Tidy class was removed from API.
-## DP: now the methods setInputEncoding and setOutputEncoding must be used.
-
- at DPATCH@
-diff -urNad httpunit-1.7+dfsg~/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java httpunit-1.7+dfsg/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java
---- httpunit-1.7+dfsg~/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java 2008-05-20 16:25:36.000000000 +0000
-+++ httpunit-1.7+dfsg/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java 2009-03-04 21:25:54.000000000 +0000
-@@ -87,7 +87,8 @@
-
- private static Tidy getParser( URL url ) {
- Tidy tidy = new Tidy();
-- tidy.setCharEncoding( org.w3c.tidy.Configuration.UTF8 );
-+ tidy.setInputEncoding( "UTF8" );
-+ tidy.setOutputEncoding( "UTF8" );
- tidy.setQuiet( true );
- tidy.setShowWarnings( HTMLParserFactory.isParserWarningsEnabled() );
- if (!HTMLParserFactory.getHTMLParserListeners().isEmpty()) {
Added: trunk/httpunit/debian/patches/series
===================================================================
--- trunk/httpunit/debian/patches/series (rev 0)
+++ trunk/httpunit/debian/patches/series 2010-02-17 22:45:23 UTC (rev 11613)
@@ -0,0 +1,3 @@
+use_system_jars
+fix_set_encoding
+add_classpath_to_manifest
Copied: trunk/httpunit/debian/patches/use_system_jars (from rev 11605, trunk/httpunit/debian/patches/use_system_jars.dpatch)
===================================================================
--- trunk/httpunit/debian/patches/use_system_jars (rev 0)
+++ trunk/httpunit/debian/patches/use_system_jars 2010-02-17 22:45:23 UTC (rev 11613)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_system_jars.dpatch by Miguel Landaeta <miguel at miguel.cc>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Configure build to use jar installed on system.
+
+ at DPATCH@
+diff -urNad httpunit-1.7+dfsg~/build.xml httpunit-1.7+dfsg/build.xml
+--- httpunit-1.7+dfsg~/build.xml 2008-05-20 16:25:36.000000000 +0000
++++ httpunit-1.7+dfsg/build.xml 2009-03-04 21:19:43.000000000 +0000
+@@ -41,7 +41,7 @@
+ <property name="website.dir" value="site" />
+ <property name="quicksite.dir" value="../quicksite/src" />
+ <property name="lib.dir" value="lib" />
+- <property name="jars.dir" value="jars" />
++ <property name="jars.dir" value="/usr/share/java" />
+
+ <property name="docs.dir" value="doc" />
+ <property name="build.dir" value="build" />
+@@ -302,10 +302,12 @@
+ </fileset>
+ </copy>
+ <mkdir dir="${archive.dir}/jars"/>
++ <!--
+ <copy todir="${archive.dir}/jars">
+ <mapper type="flatten"/>
+ <fileset refid="distributed.jars" />
+ </copy>
++ -->
+ </target>
+
+
Deleted: trunk/httpunit/debian/patches/use_system_jars.dpatch
===================================================================
--- trunk/httpunit/debian/patches/use_system_jars.dpatch 2010-02-17 22:30:15 UTC (rev 11612)
+++ trunk/httpunit/debian/patches/use_system_jars.dpatch 2010-02-17 22:45:23 UTC (rev 11613)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## use_system_jars.dpatch by Miguel Landaeta <miguel at miguel.cc>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Configure build to use jar installed on system.
-
- at DPATCH@
-diff -urNad httpunit-1.7+dfsg~/build.xml httpunit-1.7+dfsg/build.xml
---- httpunit-1.7+dfsg~/build.xml 2008-05-20 16:25:36.000000000 +0000
-+++ httpunit-1.7+dfsg/build.xml 2009-03-04 21:19:43.000000000 +0000
-@@ -41,7 +41,7 @@
- <property name="website.dir" value="site" />
- <property name="quicksite.dir" value="../quicksite/src" />
- <property name="lib.dir" value="lib" />
-- <property name="jars.dir" value="jars" />
-+ <property name="jars.dir" value="/usr/share/java" />
-
- <property name="docs.dir" value="doc" />
- <property name="build.dir" value="build" />
-@@ -302,10 +302,12 @@
- </fileset>
- </copy>
- <mkdir dir="${archive.dir}/jars"/>
-+ <!--
- <copy todir="${archive.dir}/jars">
- <mapper type="flatten"/>
- <fileset refid="distributed.jars" />
- </copy>
-+ -->
- </target>
-
-
Added: trunk/httpunit/debian/pom.xml
===================================================================
--- trunk/httpunit/debian/pom.xml (rev 0)
+++ trunk/httpunit/debian/pom.xml 2010-02-17 22:45:23 UTC (rev 11613)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---
+ $Id$
+ This file is a contribution by Matt Smith as of 2008-05-14:
+
+ I have created and attached a POM for building httpunit using Maven2.
+ It also runs FindBugs and cobertura, a code coverage tool, as well.
+ It uses the current project structure. It excludes the following tests:
+ EventAwareTestCase
+ WebClientTest
+ WebPageTest
+
+Also, if you run out of memory on the FindBugs, try upping the memory thusly
+export MAVEN_OPTS=-Xmx384M
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.7</version>
+ <description>A library for testing websites programmatically</description>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>META-INF</directory>
+ </testResource>
+ </testResources>
+ <resources>
+ <resource>
+ <directory>META-INF</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src-1.4</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>never</forkMode>
+ <!-- Assertions diasabled due to a bug in xmlbeans
+ https://issues.apache.org/jira/browse/XMLBEANS-317 -->
+ <enableAssertions>false</enableAssertions>
+ <excludes>
+ <exclude>**/TestSuite$1.class</exclude>
+ <exclude>**/EventAwareTestCase.class</exclude>
+ <exclude>**/WebClientTest.class</exclude>
+ <exclude>**/WebPageTest.class</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>
+ META-INF
+ </additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <threshold>Normal</threshold>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+
+ </reporting>
+
+ <dependencies>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R5</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>0.9.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>4aug2000r7-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ </dependency>
+ <!--- Jetty libraries needed for Testing BR [ 2264431 ] form.submit() sends multiple HTTP POSTS
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-naming</artifactId>
+ <version>6.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>6.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.4</version>
+ </dependency> -->
+ </dependencies>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repo1</id>
+ <url>http://repo1.maven.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+</project>
Modified: trunk/httpunit/debian/rules
===================================================================
--- trunk/httpunit/debian/rules 2010-02-17 22:30:15 UTC (rev 11612)
+++ trunk/httpunit/debian/rules 2010-02-17 22:45:23 UTC (rev 11613)
@@ -1,16 +1,17 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+ dh $@
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-
-DEB_ANT_BUILD_TARGET = dist
-DEB_ANT_CLEAN_TARGET = total-clean
-
-clean::
+override_dh_auto_clean:
+ ant total-clean
rm -f doc/tutorial/task1.zip
+override_dh_auto_install:
+ ant dist
+ mh_installpom -plibhttpunit-java $(CURDIR)/debian/pom.xml
+ mh_installjar -plibhttpunit-java -l $(CURDIR)/debian/pom.xml \
+ $(CURDIR)/lib/httpunit.jar
+
get-orig-source:
sh -e debian/orig-tar.sh
Added: trunk/httpunit/debian/source/format
===================================================================
--- trunk/httpunit/debian/source/format (rev 0)
+++ trunk/httpunit/debian/source/format 2010-02-17 22:45:23 UTC (rev 11613)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list