Author: bago
Date: Mon Aug 4 08:36:45 2008
New Revision: 682423
URL: http://svn.apache.org/viewvc?rev=682423&view=rev
Log:
Trying an alternative way (copied from james-server) to bind junit because
hudson is failing to build tests.
Added:
james/mailet/api/trunk/stage/junit/
james/mailet/api/trunk/stage/junit/jars/
james/mailet/api/trunk/stage/junit/jars/junit-3.8.1.jar (with props)
james/mailet/api/trunk/stage/junit/poms/
james/mailet/api/trunk/stage/junit/poms/junit-3.8.1.pom
Modified:
james/mailet/api/trunk/build.xml
james/mailet/api/trunk/include.properties
Modified: james/mailet/api/trunk/build.xml
URL:
http://svn.apache.org/viewvc/james/mailet/api/trunk/build.xml?rev=682423&r1=682422&r2=682423&view=diff
==============================================================================
--- james/mailet/api/trunk/build.xml (original)
+++ james/mailet/api/trunk/build.xml Mon Aug 4 08:36:45 2008
@@ -42,6 +42,7 @@
-->
<path id="project.class.path">
+ <pathelement path="${junit.jar}"/>
<pathelement path="${javax-mail.jar}"/>
<pathelement path="${javax-activation.jar}"/>
<pathelement path="${java.class.path}" />
@@ -396,7 +397,7 @@
Compile Tests
===================================================================
-->
- <target name="compile-tests" depends="junit-present, compile"
description="Compile the test code" if="junit.present">
+ <target name="compile-tests" depends="compile" description="Compile the
test code">
<mkdir dir="${test.classes}"/>
<javac destdir="${test.classes}" excludes="**/package.html"
debug="true" deprecation="true" optimize="false">
<src>
@@ -415,7 +416,7 @@
Run Tests
===================================================================
-->
- <target name="test" depends="junit-present, compile-tests"
if="junit.present" description="Run the test cases">
+ <target name="test" depends="compile-tests" description="Run the test
cases">
<mkdir dir="${test.report}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true"
fork="true" dir=".">
<sysproperty key="basedir" value="."/>
@@ -433,17 +434,4 @@
</batchtest>
</junit>
</target>
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
- <!--
- ===================================================================
- Find Junit
- ===================================================================
- -->
- <target name="junit-present" depends="test-junit-present"
unless="junit.present">
- <echo>================================= WARNING
================================</echo>
- <echo> Junit isn't present in your $ANT_HOME/lib directory. Tests not
executed. </echo>
-
<echo>==========================================================================</echo>
- </target>
</project>
Modified: james/mailet/api/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/mailet/api/trunk/include.properties?rev=682423&r1=682422&r2=682423&view=diff
==============================================================================
--- james/mailet/api/trunk/include.properties (original)
+++ james/mailet/api/trunk/include.properties Mon Aug 4 08:36:45 2008
@@ -54,3 +54,6 @@
javax-activation.name=activation
javax-activation.id=${javax-activation.name}-${javax-activation.version}
javax-activation.jar=stage/activation/jars/${javax-activation.id}.jar
+
+# ----- JUnit ------
+junit.jar=stage/junit/jars/junit-3.8.1.jar
Added: james/mailet/api/trunk/stage/junit/jars/junit-3.8.1.jar
URL:
http://svn.apache.org/viewvc/james/mailet/api/trunk/stage/junit/jars/junit-3.8.1.jar?rev=682423&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/mailet/api/trunk/stage/junit/jars/junit-3.8.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/mailet/api/trunk/stage/junit/poms/junit-3.8.1.pom
URL:
http://svn.apache.org/viewvc/james/mailet/api/trunk/stage/junit/poms/junit-3.8.1.pom?rev=682423&view=auto
==============================================================================
--- james/mailet/api/trunk/stage/junit/poms/junit-3.8.1.pom (added)
+++ james/mailet/api/trunk/stage/junit/poms/junit-3.8.1.pom Mon Aug 4 08:36:45
2008
@@ -0,0 +1,33 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <name>JUnit</name>
+ <version>3.8.1</version>
+ <packaging>jar</packaging>
+ <url>http://www.junit.org</url>
+ <licenses>
+ <license>
+ <name>CPL v1.0</name>
+ <url>http://junit.sourceforge.net/cpl-v10.html</url>
+ </license>
+ </licenses>
+</project>
\ No newline at end of file
