You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by mv...@apache.org on 2006/01/30 23:30:13 UTC
svn commit: r373613 - in /jakarta/commons/dormant/feedparser/trunk:
build.properties build.xml lib/ project.xml
Author: mvdb
Date: Mon Jan 30 14:30:09 2006
New Revision: 373613
URL: http://svn.apache.org/viewcvs?rev=373613&view=rev
Log:
Newly generated ant build file so we can remove the lib directory.
Also updated project.xml to generate SNAPSHOTS instead of a versioned one.
Removed:
jakarta/commons/dormant/feedparser/trunk/lib/
Modified:
jakarta/commons/dormant/feedparser/trunk/build.properties
jakarta/commons/dormant/feedparser/trunk/build.xml
jakarta/commons/dormant/feedparser/trunk/project.xml
Modified: jakarta/commons/dormant/feedparser/trunk/build.properties
URL: http://svn.apache.org/viewcvs/jakarta/commons/dormant/feedparser/trunk/build.properties?rev=373613&r1=373612&r2=373613&view=diff
==============================================================================
--- jakarta/commons/dormant/feedparser/trunk/build.properties (original)
+++ jakarta/commons/dormant/feedparser/trunk/build.properties Mon Jan 30 14:30:09 2006
@@ -13,8 +13,8 @@
# right now so maybe maven is the solution. I need this to build on ANY unix
# machine with java installed.
-ext.lib.path=${user.home}/feedparser/lib/build/
+#ext.lib.path=${user.home}/feedparser/lib/build/
# Turn maven jar overrides on
-maven.jar.override=on
-maven.jar.jaxen=lib/jaxen-full.jar
+#maven.jar.override=on
+#maven.jar.jaxen=lib/jaxen-full.jar
Modified: jakarta/commons/dormant/feedparser/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/dormant/feedparser/trunk/build.xml?rev=373613&r1=373612&r2=373613&view=diff
==============================================================================
--- jakarta/commons/dormant/feedparser/trunk/build.xml (original)
+++ jakarta/commons/dormant/feedparser/trunk/build.xml Mon Jan 30 14:30:09 2006
@@ -1,266 +1,172 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<project name="feedparser" default="jar" basedir=".">
+<!--build.xml generated by maven from project.xml version 0.5-SNAPSHOT
+ on date January 30 2006, time 2306-->
- <property name="jakarta.site2.home" location="../jakarta-site2"/>
-
- <property name="compile.dir" value="compile"/>
- <property name="dist.dir" value="dist"/>
- <property name="junit.dir" value="junit"/>
- <property name="src.dir" value="src"/>
- <property environment="env"/>
- <property file="build.properties"/>
- <property name="project" value="feedparser"/>
- <property name="product" value="FeedParser"/>
-
- <property name="version.major" value="0"/>
- <property name="version.minor" value="5"/>
- <property name="version.sub" value="0"/>
- <property name="version.desc" value="-RC1"/>
-
- <property name="version" value="${version.major}.${version.minor}.${version.sub}${version.desc}"/>
-
- <property name="docs.dest" value="./site"/>
- <property name="docs.src" value="./xdocs"/>
-
- <property name="year" value="2005"/>
-
- <path id="anakia.classpath">
- <fileset dir="${jakarta.site2.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="project.classpath">
- <fileset dir="lib">
- <include name="*.jar"/>
+<project default="jar" name="commons-feedparser" basedir=".">
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </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">
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+ <property name="final.name" value="commons-feedparser-0.5-SNAPSHOT">
+ </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>
+ <condition property="noget">
+ <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}">
+ </mkdir>
+ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="src/java">
+ </pathelement>
+ </src>
+ <classpath refid="build.classpath">
+ </classpath>
+ </javac>
+ </target>
+ <target name="jar" description="o Create the jar" depends="compile,test">
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+ </jar>
+ </target>
+ <target name="clean" description="o Clean up the generated directories">
+ <delete dir="${defaulttargetdir}">
+ </delete>
+ <delete dir="${distdir}">
+ </delete>
+ </target>
+ <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+ <mkdir dir="dist">
+ </mkdir>
+ <copy todir="dist">
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
+ </copy>
+ </target>
+ <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+ <fail message="There were test failures.">
+ </fail>
+ </target>
+ <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">
+ <sysproperty key="basedir" value=".">
+ </sysproperty>
+ <formatter type="xml">
+ </formatter>
+ <formatter usefile="false" type="plain">
+ </formatter>
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ <batchtest todir="${testreportdir}">
+ <fileset dir="src/test">
</fileset>
- </path>
-
- <path id="junit.classpath">
- <path refid="project.classpath"/>
- <fileset dir="lib/build">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <target name="init">
-
- <available property="junit.available"
- classname="junit.framework.TestCase"/>
-
- </target>
-
- <target name="prep" depends="init">
-
- <mkdir dir="${dist.dir}"/>
- <mkdir dir="${compile.dir}"/>
- <mkdir dir="${junit.dir}"/>
-
- </target>
-
- <target name="compile.main" depends="prep">
- <javac srcdir="${src.dir}/java/"
- classpathref="project.classpath"
- destdir="${compile.dir}"
- debug="true"
- excludes="org/apache/commons/feedparser/test/**">
- </javac>
- </target>
-
- <target name="compile.test" depends="prep" if="junit.available">
- <javac srcdir="${src.dir}/java/"
- classpathref="junit.classpath"
- destdir="${junit.dir}"
- debug="true"
- includes="org/apache/commons/feedparser/test/**">
- </javac>
- </target>
-
- <target name="clean" depends="init">
- <delete dir="${dist.dir}"/>
- <delete dir="${compile.dir}"/>
- <delete dir="${junit.dir}"/>
- </target>
-
- <target name="jar" depends="compile.main">
- <mkdir dir="${dist.dir}"/>
- <jar compress="yes" jarfile="${dist.dir}/commons-feedparser-${version}.jar">
- <fileset dir="${compile.dir}">
- </fileset>
- </jar>
-
- </target>
-
- <target name="dist" depends="jar,javadoc" description="build a distribution">
- <copy file="LICENSE.txt" todir="${dist.dir}"/>
- <copy file="NOTICE.txt" todir="${dist.dir}"/>
- <copy todir="${dist.dir}">
- <fileset dir="." includes="docs/**"/>
- </copy>
- </target>
-
- <target name="run-example" description="Runs the example feed parser class"
- depends="jar">
- <java classpathref="project.classpath"
- classname="org.apache.commons.feedparser.example.HelloFeedParser"
- fork="true"
- failonerror="true">
- </java>
- </target>
-
- <target name="debug-feed" description="Debugs a feed"
- depends="jar">
- <java classpathref="project.classpath"
- classname="org.apache.commons.feedparser.Main"
- fork="true"
- failonerror="true">
- <arg value="${feed-url}"/>
- </java>
- </target>
-
- <target name="test-autodiscover" description="Runs the testing class for autodiscovery"
- depends="jar">
-
- <java classpathref="project.classpath"
- classname="org.apache.commons.feedparser.locate.TestFeedLocator"
- fork="true"
- failonerror="true">
-
- <sysproperty key="feedparser.home" value="${feedparser.home}"/>
-
- </java>
-
- </target>
-
- <target name="test-probing" description="Runs the testing class for aggresive probing"
- depends="jar">
-
- <java classpathref="project.classpath"
- classname="org.apache.commons.feedparser.test.TestProbeLocator"
- fork="true"
- failonerror="true">
-
- <sysproperty key="feedparser.home" value="${feedparser.home}"/>
-
- </java>
-
- </target>
-
- <target name="test" depends="jar,compile.test" description="Run junit tests." if="junit.available">
- <junit printsummary="on"
- fork="true"
- filtertrace="true"
- haltonfailure="false"
- haltonerror="false">
- <sysproperty key="feedparser.home" value="${feedparser.home}"/>
- <classpath>
- <path refid="project.classpath"/>
- <pathelement location="${compile.dir}"/>
- <pathelement location="${junit.dir}"/>
- </classpath>
-
- <batchtest todir="target/test-reports">
- <fileset dir="${src.dir}/java">
- <include name="**/Test*.java"/>
- <exclude name="**/Test.java" />
- </fileset>
- <fileset dir="${src.dir}/test">
- <include name="**/Test*.java"/>
- </fileset>
-
- </batchtest>
-
- </junit>
- </target>
-
- <target name="javadoc" depends="init">
-
- <mkdir dir="docs/apidocs"/>
-
- <!--
-
- link="${javadoc.link}"
- -->
-
- <javadoc sourcepath="src/java"
- classpathref="project.classpath"
- packagenames="org.apache.commons.feedparser.*"
- destdir="docs/apidocs"
- author="true"
- version="true"
- use="true"
- windowtitle="${product} ${version} API"
- doctitle="${product} ${version} API"
- bottom="Copyright &copy; ${year} Apache Software Foundation. All Rights Reserved.">
-
- </javadoc>
-
- </target>
-
- <target name="help">
- <echo message="U S A G E :"/>
- <echo message=""/>
-
- <echo message="[clean,clobber]"/>
- <echo message="Delete old builds"/>
- <echo message=""/>
-
- <echo message="[compile]"/>
- <echo message="Compiles the source tree"/>
- <echo message=""/>
-
- <echo message="[jakarta-feedparser.jar]"/>
- <echo message="Generates a JAR file for the feed parser"/>
- <echo message=""/>
-
- <echo message="[run-example]"/>
- <echo message="Runs the example feed parser class"/>
- <echo message=""/>
-
- <echo message="[debug-feed]"/>
- <echo message="Debugs a single feed by attempting to retrieve it."/>
- <echo message="To use:"/>
- <echo message="ant debug-feed -Dfeed-url=http://www.someblog.com"/>
- <echo message=""/>
-
- <echo message="[test]"/>
- <echo message="Runs all the JUnit testing classes"/>
- <echo message="This target has an optional value. If run as follows:"/>
- <echo message="ant test -Dtest.only.local=true"/>
- <echo message="Then any tests that involve network traffic are _not_ run. "/>
- <echo message="This is useful because the remote tests can take a long time "/>
- <echo message="to run. By default we run remote tests."/>
- <echo message=""/>
-
- <echo message="[test-autodiscover]"/>
- <echo message="Runs the testing class for autodiscovery"/>
- <echo message=""/>
-
- <echo message="[test-probing]"/>
- <echo message="Runs the testing class for aggresive probing"/>
- <echo message=""/>
-
- <echo message="[javadoc]"/>
- <echo message="Generates JavaDoc for this project"/>
- <echo message=""/>
- <echo message=""/>
-
- <echo message="General information:"/>
- <echo message="A file named 'build.properties' exists in this"/>
- <echo message="directory that can be used to control the build process."/>
- <echo message="The following attributes are available:"/>
- <echo message=""/>
- <echo message="feedparser.home"/>
- <echo message="The full path to where the Jakarta Feed Parser is installed,"/>
- <echo message="such as 'c:/jakarta/feedparser'; use forward slashes instead of"/>
- <echo message="backslashes on Windows."/>
- <echo message=""/>
- <echo message="ext.lib.path"/>
- <echo message="The file path location to where all of our external "/>
- <echo message="JARs are located that are not bundled with the "/>
- <echo message="Jakarta Feed Parser, such as junit.jar."/>
-
- </target>
-
-</project>
+ </batchtest>
+ </junit>
+ </target>
+ <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">
+ <src>
+ <pathelement location="src/test">
+ </pathelement>
+ </src>
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ </javac>
+ </target>
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+ <mkdir dir="${javadocdir}">
+ </mkdir>
+ <tstamp>
+ <format pattern="2004-yyyy" property="year">
+ </format>
+ </tstamp>
+ <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved.">
+ </property>
+ <property name="title" value="Commons FeedParser 0.5-SNAPSHOT API">
+ </property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.feedparser.*">
+ <classpath>
+ <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}/jdom-b9.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdom/jars/jdom-b9.jar">
+ </get>
+ <get dest="${libdir}/jaxen-1.0-FCS-full.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jaxen/jars/jaxen-1.0-FCS-full.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}/commons-httpclient-3.0-rc1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-3.0-rc1.jar">
+ </get>
+ <get dest="${libdir}/log4j-1.2.6.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/log4j/jars/log4j-1.2.6.jar">
+ </get>
+ <get dest="${libdir}/xmlrpc-1.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xmlrpc/jars/xmlrpc-1.2.jar">
+ </get>
+ <get dest="${libdir}/saxpath-1.0-FCS.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/saxpath/jars/saxpath-1.0-FCS.jar">
+ </get>
+ <get dest="${libdir}/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar">
+ </get>
+ <get dest="${libdir}/xerces-2.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.0.2.jar">
+ </get>
+ </target>
+ <target name="install-maven">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
+ </get>
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
+ </target>
+</project>
\ No newline at end of file
Modified: jakarta/commons/dormant/feedparser/trunk/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/dormant/feedparser/trunk/project.xml?rev=373613&r1=373612&r2=373613&view=diff
==============================================================================
--- jakarta/commons/dormant/feedparser/trunk/project.xml (original)
+++ jakarta/commons/dormant/feedparser/trunk/project.xml Mon Jan 30 14:30:09 2006
@@ -14,7 +14,7 @@
<description>Jakarta FeedParser</description>
- <currentVersion>0.5-beta</currentVersion>
+ <currentVersion>0.5-SNAPSHOT</currentVersion>
<package>org.apache.commons.feedparser</package>
@@ -75,13 +75,7 @@
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <!--
- The filesize of the jaxen-full jar currently in CVS doesn't match
- any in the Maven repo.
-
- <version>1.1-beta-4</version>
- -->
- <version>1.0</version>
+ <version>1.1-beta-6</version>
</dependency>
<dependency>
@@ -135,7 +129,8 @@
<build>
<nagEmailAddress>burton1@rojo.com</nagEmailAddress>
- <sourceDirectory>src/java</sourceDirectory>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
</build>
<reports>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org