[pkg-java] r12295 - trunk/jetty/debian
Torsten Werner
twerner at alioth.debian.org
Tue May 4 19:41:54 UTC 2010
Author: twerner
Date: 2010-05-04 19:41:54 +0000 (Tue, 04 May 2010)
New Revision: 12295
Modified:
trunk/jetty/debian/build.xml
trunk/jetty/debian/changelog
trunk/jetty/debian/control
trunk/jetty/debian/module.xml
trunk/jetty/debian/rules
Log:
* UNRELEASED
* Merge changes from Ubuntu version 6.1.22-1ubuntu1:
- debian/build.xml, debian/module.xml: Enable tests in the jetty module
- debian/rules: Adding slf4j-simple to the DEB_JARS since it's used in
tests
- debian/rules, debian/control: Added junit and ant-optional needed for
tests
* debian/build.xml, debian/module.xml: Enable tests in the jetty module
* debian/rules: Adding slf4j-simple to the DEB_JARS since it's used in tests
* debian/rules, debian/control: Added junit and ant-optional needed for tests
* debian/control, debian/rules: Build with default-jdk.
Modified: trunk/jetty/debian/build.xml
===================================================================
--- trunk/jetty/debian/build.xml 2010-05-03 19:50:51 UTC (rev 12294)
+++ trunk/jetty/debian/build.xml 2010-05-04 19:41:54 UTC (rev 12295)
@@ -1,5 +1,6 @@
<project name="jetty build" basedir=".." default="package">
<property name="src.dir" value="src/main/java"/>
+ <property name="test.dir" value="src/test/java"/>
<property name="rsrc.dir" value="src/main/resources"/>
<property name="config.dir" value="src/main/config/etc"/>
<property name="build.dir" value="${basedir}/build"/>
@@ -25,18 +26,21 @@
<property name="module-name" value="jetty-util"/>
<property name="module-version" value="${VERSION}"/>
<property name="module-libdir" value="${lib.dir}"/>
+ <property name="run-tests" value="true"/>
</ant>
<ant dir="${basedir}/modules/util5/" antfile="${module.script}" inheritRefs="true">
<property name="module-name" value="jetty-util5"/>
<property name="module-version" value="${VERSION}"/>
<property name="module-libdir" value="${lib.dir}/util5"/>
+ <property name="run-tests" value="true"/>
</ant>
<ant dir="${basedir}/modules/jetty/" antfile="${module.script}" inheritRefs="true">
<property name="module-name" value="jetty"/>
<property name="module-version" value="${VERSION}"/>
<property name="module-libdir" value="${lib.dir}"/>
+ <property name="run-tests" value="true"/>
</ant>
<ant dir="${basedir}/extras/sslengine/" antfile="${module.script}" inheritRefs="true">
@@ -125,6 +129,9 @@
<target name="clean">
<delete dir="${build.dir}" quiet="true"/>
+ <delete>
+ <fileset dir="${basedir}/modules" includes="**/test/java/**/*.class"/>
+ </delete>
<delete dir="${target.dir}" quiet="true"/>
<delete dir="${lib.dir}" quiet="true"/>
<delete dir="${etc.dir}" quiet="true"/>
Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog 2010-05-03 19:50:51 UTC (rev 12294)
+++ trunk/jetty/debian/changelog 2010-05-04 19:41:54 UTC (rev 12295)
@@ -1,3 +1,15 @@
+jetty (6.1.24-3) unstable; urgency=low
+
+ * UNRELEASED
+ * Merge changes from Ubuntu version 6.1.22-1ubuntu1:
+ - debian/build.xml, debian/module.xml: Enable tests in the jetty module
+ - debian/rules: Adding slf4j-simple to the DEB_JARS since it's used in
+ tests
+ - debian/rules, debian/control: Added junit and ant-optional needed for
+ tests
+
+ -- Torsten Werner <twerner at debian.org> Tue, 04 May 2010 21:28:35 +0200
+
jetty (6.1.24-2) unstable; urgency=low
* Set JAVA_HOME in d/rules to /usr/lib/jvm/default-java. (Closes: #578618,
@@ -21,6 +33,15 @@
-- Torsten Werner <twerner at debian.org> Fri, 23 Apr 2010 23:55:35 +0200
+jetty (6.1.22-1ubuntu1) lucid; urgency=low
+
+ * debian/build.xml, debian/module.xml: Enable tests in the jetty module
+ * debian/rules: Adding slf4j-simple to the DEB_JARS since it's used in tests
+ * debian/rules, debian/control: Added junit and ant-optional needed for tests
+ * debian/control, debian/rules: Build with default-jdk.
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com> Tue, 26 Jan 2010 09:52:06 +0100
+
jetty (6.1.22-1) unstable; urgency=medium
* New upstream release. (Closes: #553644)
Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control 2010-05-03 19:50:51 UTC (rev 12294)
+++ trunk/jetty/debian/control 2010-05-04 19:41:54 UTC (rev 12295)
@@ -5,9 +5,9 @@
Uploaders: Michael Koch <konqueror at gmx.de>, Thierry Carrez <thierry.carrez at ubuntu.com>,
Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>,
Niels Thykier <niels at thykier.net>, Pablo Duboue <pablo.duboue at gmail.com>
-Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), default-jdk, ant, maven-repo-helper,
+Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper,
libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java,
- libgnujaf-java, libcommons-daemon-java
+ libgnujaf-java, libcommons-daemon-java, junit
Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jetty
Modified: trunk/jetty/debian/module.xml
===================================================================
--- trunk/jetty/debian/module.xml 2010-05-03 19:50:51 UTC (rev 12294)
+++ trunk/jetty/debian/module.xml 2010-05-04 19:41:54 UTC (rev 12295)
@@ -48,6 +48,7 @@
<available file="${config.dir}" type="dir" property="config.dir.exists"/>
<antcall target="copy-to-etc"/>
+ <antcall target="tests" inheritRefs="true"/>
</target>
<target name="generate-jar" unless="jar.main.class">
@@ -142,5 +143,34 @@
<fileset dir="${config.dir}" excludes="**/*.svn"/>
</copy>
</target>
+
+ <target name="tests" if="run-tests">
+ <javac srcdir="${test.dir}"
+ classpathref="classpath"
+ deprecation="false"
+ failonerror="true"
+ debug="true"
+ source="1.5"
+ target="1.5"
+ nowarn="true"
+ listfiles="true"/>
+ <junit haltonfailure="yes">
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement path="${test.dir}"/>
+ </classpath>
+ <formatter type="plain" usefile="false"/>
+ <batchtest>
+ <fileset dir="${test.dir}">
+ <include name="**/*Test.java"/>
+ <include name="**/*TestCase.java"/>
+ <exclude name="org/mortbay/jetty/servlet/AbstractSessionTest.java"/>
+ <exclude name="org/mortbay/jetty/AsyncStressTest.java"/>
+ <exclude name="org/mortbay/resource/*.java"/>
+ <exclude name="org/mortbay/xml/XmlConfigurationTest.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
</project>
Modified: trunk/jetty/debian/rules
===================================================================
--- trunk/jetty/debian/rules 2010-05-03 19:50:51 UTC (rev 12294)
+++ trunk/jetty/debian/rules 2010-05-04 19:41:54 UTC (rev 12295)
@@ -6,7 +6,7 @@
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := servlet-api-2.5 slf4j-api mx4j mx4j-tools gnumail activation commons-daemon
+DEB_JARS := servlet-api-2.5 slf4j-api slf4j-simple mx4j mx4j-tools gnumail activation commons-daemon junit ant-junit
DEB_ANT_BUILD_TARGET := package
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_ARGS := -DVERSION=$(VERSION) -Dbuild.sysclasspath=last
More information about the pkg-java-commits
mailing list