brekke 2004/09/08 20:26:42 Modified: net build.xml project.xml Log: Bringing our POM up to date and regen'd the build.xml Revision Changes Path 1.27 +50 -52 jakarta-commons/net/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons/net/build.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- build.xml 8 Sep 2004 15:36:23 -0000 1.26 +++ build.xml 9 Sep 2004 03:26:42 -0000 1.27 @@ -1,22 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2002-2004 The Apache Software Foundation - Licensed 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. ---> - -<!--build.xml generated by maven from project.xml version 1.2.0-dev - on date February 16 2004, time 2310--> +<!--build.xml generated by maven from project.xml version 1.3.0-dev + on date September 8 2004, time 2216--> <project default="jar" name="commons-net" basedir="."> <property name="defaulttargetdir" value="target"> @@ -27,6 +12,8 @@ </property> <property name="testclassesdir" value="target/test-classes"> </property> + <property name="testclassesdir" value="target/test-classes"> + </property> <property name="testreportdir" value="target/test-reports"> </property> <property name="distdir" value="dist"> @@ -35,6 +22,12 @@ </property> <property name="final.name" value="commons-net-1.3.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> @@ -42,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}"> @@ -51,16 +48,20 @@ <pathelement location="src/java"> </pathelement> </src> - <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> + <classpath refid="build.classpath"> </classpath> </javac> + <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="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> + <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> </jar> </target> <target name="clean" description="o Clean up the generated directories"> @@ -75,7 +76,7 @@ <copy todir="dist"> <fileset dir="${defaulttargetdir}" includes="*.jar"> </fileset> - <fileset dir="${basedir}" includes="LICENSE*, NOTICE*, README*"> + <fileset dir="${basedir}" includes="LICENSE*, README*"> </fileset> </copy> </target> @@ -83,7 +84,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"> @@ -94,10 +95,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}"> @@ -107,13 +106,20 @@ <fileset dir="src/test"> <include name="**/*Test.java"> </include> - <exclude name="**/*FunctionalTest.java" /> - <exclude name="**/*POP3*.java" /> + <exclude name="**/*FunctionalTest.java"> + </exclude> + <exclude name="**/*POP3*.java"> + </exclude> </fileset> </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"> @@ -122,46 +128,38 @@ </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> <format pattern="1997-yyyy" property="year"> </format> </tstamp> - <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved."> + <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved."> </property> - <property name="title" value="Jakarta Commons/Net 1.2.0 API"> + <property name="title" value="Jakarta Commons Net 1.3.0-dev API"> </property> <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.net.*"> <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> - <pathelement location="target/${final.name}.jar"> - </pathelement> + <path refid="build.classpath"> + </path> </classpath> </javadoc> </target> <target name="get-deps" unless="noget" depends="init"> + <!--Proxy settings works only with a JDK 1.2 and higher.--> + + <setproxy> + </setproxy> <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> </target> <target name="install-maven"> <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"> @@ -169,4 +167,4 @@ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> </unjar> </target> -</project> +</project> \ No newline at end of file 1.55 +10 -6 jakarta-commons/net/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons/net/project.xml,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- project.xml 26 Jun 2004 02:19:23 -0000 1.54 +++ project.xml 9 Sep 2004 03:26:42 -0000 1.55 @@ -19,7 +19,7 @@ <name>Jakarta Commons Net</name> <id>commons-net</id> - <currentVersion>1.2.2</currentVersion> + <currentVersion>1.3.0-dev</currentVersion> <inceptionYear>1997</inceptionYear> <shortDescription>Jakarta Commons Net</shortDescription> <description/> @@ -36,11 +36,11 @@ </organization> <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>/LICENSE.txt</url> - <distribution>repo</distribution> - </license> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>/LICENSE.txt</url> + <distribution>repo</distribution> + </license> </licenses> <gumpRepositoryId>jakarta</gumpRepositoryId> @@ -153,7 +153,9 @@ </dependencies> <build> + <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress> + <sourceDirectory>src/java</sourceDirectory> <resources> @@ -167,12 +169,14 @@ </resources> <unitTestSourceDirectory>src/test</unitTestSourceDirectory> + <unitTest> <includes> <include>**/*Test.java</include> </includes> <excludes> <exclude>**/*FunctionalTest.java</exclude> + <exclude>**/*POP3*.java</exclude> </excludes> </unitTest>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
