epugh 2004/11/11 01:22:02
Modified: email project.properties build.xml
email/xdocs changes.xml
Added: email/lib activation-1.0.2.jar javamail-1.3.2.jar
Log:
Use included /lib directory for Sun jars. Now maven and Ant build out of box!
Revision Changes Path
1.7 +6 -1 jakarta-commons-sandbox/email/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/email/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 29 Oct 2004 12:06:49 -0000 1.6
+++ project.properties 11 Nov 2004 09:22:01 -0000 1.7
@@ -38,3 +38,8 @@
maven.xdoc.poweredby.image=maven-feather.png
maven.xdoc.version=${pom.currentVersion}
maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
+
+# Use included jars
+maven.jar.override=true
+maven.jar.activation = ${basedir}/lib/activation-1.0.2.jar
+maven.jar.javamail = ${basedir}/lib/javamail-1.3.2.jar
\ No newline at end of file
1.9 +41 -56 jakarta-commons-sandbox/email/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/email/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 18 Oct 2004 20:59:12 -0000 1.8
+++ build.xml 11 Nov 2004 09:22:01 -0000 1.9
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--build.xml generated by maven from project.xml version 1.0-dev
- on date October 18 2004, time 2138-->
+ on date November 10 2004, time 0707-->
<project default="jar" name="commons-email" basedir=".">
- <property name="defaulttargetdir"
value="C:\java\cvs\jakarta-commons-sandbox\email/target">
+ <property name="defaulttargetdir" value="target">
</property>
- <property name="libdir"
value="C:\java\cvs\jakarta-commons-sandbox\email/target/lib">
+ <property name="libdir" value="target/lib">
</property>
- <property name="classesdir"
value="C:\java\cvs\jakarta-commons-sandbox\email/target/classes">
+ <property name="classesdir" value="target/classes">
</property>
- <property name="testclassesdir"
value="C:\java\cvs\jakarta-commons-sandbox\email/target/test-classes">
+ <property name="testclassesdir" value="target/test-classes">
</property>
- <property name="testclassesdir"
value="C:\java\cvs\jakarta-commons-sandbox\email/target/test-classes">
+ <property name="testclassesdir" value="target/test-classes">
</property>
- <property name="testreportdir"
value="C:\java\cvs\jakarta-commons-sandbox\email/target/test-reports">
+ <property name="testreportdir" value="target/test-reports">
</property>
<property name="distdir" value="dist">
</property>
@@ -22,6 +22,12 @@
</property>
<property name="final.name" value="commons-email-1.0-dev">
</property>
+ <path id="build.classpath">
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
+ </path>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}">
</mkdir>
@@ -29,6 +35,10 @@
<equals arg2="only" arg1="${build.sysclasspath}">
</equals>
</condition>
+ <!--Test if JUNIT is present in ANT classpath-->
+
+ <available property="Junit.present" classname="junit.framework.Test">
+ </available>
</target>
<target name="compile" description="o Compile the code" depends="get-deps">
<mkdir dir="${classesdir}">
@@ -38,27 +48,9 @@
<pathelement location="src/java">
</pathelement>
</src>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <classpath refid="build.classpath">
</classpath>
</javac>
- <copy todir="${classesdir}">
- <fileset dir=".">
- <include name="**/*.properties">
- </include>
- </fileset>
- </copy>
- <mkdir dir="${classesdir}/META-INF">
- </mkdir>
- <copy todir="${classesdir}/META-INF">
- <fileset dir=".">
- <include name="NOTICE.txt">
- </include>
- </fileset>
- </copy>
</target>
<target name="jar" description="o Create the jar" depends="compile,test">
<jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}">
@@ -84,7 +76,7 @@
<fail message="There were test failures.">
</fail>
</target>
- <target name="internal-test" depends="compile-tests">
+ <target name="internal-test" if="Junit.present"
depends="junit-present,compile-tests">
<mkdir dir="${testreportdir}">
</mkdir>
<junit dir="./" failureproperty="test.failure" printSummary="yes"
fork="true" haltonerror="true">
@@ -95,10 +87,8 @@
<formatter usefile="false" type="plain">
</formatter>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${testclassesdir}">
</pathelement>
<pathelement path="${classesdir}">
@@ -112,7 +102,12 @@
</batchtest>
</junit>
</target>
- <target name="compile-tests" depends="compile">
+ <target name="junit-present" unless="Junit.present" depends="init">
+ <echo>================================= WARNING
================================</echo>
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not
executed.</echo>
+
<echo>==========================================================================</echo>
+ </target>
+ <target name="compile-tests" if="Junit.present"
depends="junit-present,compile">
<mkdir dir="${testclassesdir}">
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
@@ -121,16 +116,14 @@
</pathelement>
</src>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${classesdir}">
</pathelement>
</classpath>
</javac>
</target>
- <target name="javadoc" description="o Generate javadoc">
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
<mkdir dir="${javadocdir}">
</mkdir>
<tstamp>
@@ -143,31 +136,23 @@
</property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.commons.mail.*">
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement location="${defaulttargetdir}/${final.name}.jar">
- </pathelement>
+ <path refid="build.classpath">
+ </path>
</classpath>
</javadoc>
</target>
<target name="get-deps" unless="noget" depends="init">
+ <copy todir="${libdir}">
+ <fileset dir="${basedir}/lib" includes="*.jar">
+ </fileset>
+ </copy>
+ <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+ <setproxy>
+ </setproxy>
<get dest="${libdir}/commons-lang-2.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-2.0.jar";>
</get>
- <get dest="${libdir}/commons-validator-1.1.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-validator/jars/commons-validator-1.1.3.jar";>
- </get>
- <get dest="${libdir}/javamail-1.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/javamail/jars/javamail-1.3.jar";>
- </get>
- <get dest="${libdir}/activation-1.0.2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/activation/jars/activation-1.0.2.jar";>
- </get>
- <get dest="${libdir}/oro-2.0.8.jar" usetimestamp="true"
ignoreerrors="true" src="http://www.ibiblio.org/maven/oro/jars/oro-2.0.8.jar";>
- </get>
- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";>
- </get>
- <get dest="${libdir}/ant-1.5.jar" usetimestamp="true"
ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar";>
- </get>
- <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar";>
+ <get dest="${libdir}/dumbster-1.0.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/dumbster/jars/dumbster-1.0.3.jar";>
</get>
</target>
<target name="install-maven">
1.1 jakarta-commons-sandbox/email/lib/activation-1.0.2.jar
<<Binary file>>
1.1 jakarta-commons-sandbox/email/lib/javamail-1.3.2.jar
<<Binary file>>
1.10 +4 -0 jakarta-commons-sandbox/email/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/email/xdocs/changes.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- changes.xml 1 Nov 2004 18:45:55 -0000 1.9
+++ changes.xml 11 Nov 2004 09:22:02 -0000 1.10
@@ -7,6 +7,10 @@
<body>
<release version="1.0" date="IN CVS">
+ <action dev="epugh" type="add">
+ Add to /lib required jars not on Ibiblio. Tweak Ant and Maven
builds to include
+ them.
+ </action>
<action dev="epugh" type="remove">
Removed deprecated MailMessage and ByteArrayDataSource.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
