You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by eb...@apache.org on 2004/07/20 13:08:37 UTC
cvs commit: jakarta-commons/configuration build.xml
ebourg 2004/07/20 04:08:37
Modified: configuration build.xml
Log:
Updated build.xml generated by Maven
Revision Changes Path
1.7 +77 -38 jakarta-commons/configuration/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/configuration/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 28 Mar 2004 19:56:08 -0000 1.6
+++ build.xml 20 Jul 2004 11:08:36 -0000 1.7
@@ -1,31 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- build.xml generated by maven from project.xml -->
-
-<!--
- =========================================================================
- WARNING: Some path information is missing in the generated file
- and the simple-jndi jar should be downloaded from www.osjava.org
- Compare with existing version before checking in the update!
- =========================================================================
--->
+<!--build.xml generated by maven from project.xml version 1.0-rc1
+ on date July 20 2004, time 1306-->
<project default="jar" name="commons-configuration" basedir=".">
- <property name="defaulttargetdir" value="target">
+ <property name="defaulttargetdir" value="D:\dev\apache\jakarta-commons\configuration/target">
+ </property>
+ <property name="libdir" value="D:\dev\apache\jakarta-commons\configuration/target/lib">
</property>
- <property name="libdir" value="target/lib">
+ <property name="classesdir" value="D:\dev\apache\jakarta-commons\configuration/target/classes">
</property>
- <property name="classesdir" value="target/classes">
+ <property name="testclassesdir" value="D:\dev\apache\jakarta-commons\configuration/target/test-classes">
</property>
- <property name="testclassesdir" value="target/test-classes">
+ <property name="testclassesdir" value="D:\dev\apache\jakarta-commons\configuration/target/test-classes">
</property>
- <property name="testreportdir" value="target/test-reports">
+ <property name="testreportdir" value="D:\dev\apache\jakarta-commons\configuration/target/test-reports">
</property>
<property name="distdir" value="dist">
</property>
<property name="javadocdir" value="dist/docs/api">
</property>
- <property name="final.name" value="commons-configuration-1.0-dev-3">
+ <property name="final.name" value="commons-configuration-1.0-rc1">
</property>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}">
@@ -52,7 +47,13 @@
</javac>
<copy todir="${classesdir}">
<fileset dir="conf">
- <include name="*">
+ <include name="digesterRules.xml">
+ </include>
+ </fileset>
+ </copy>
+ <copy todir="${testclassesdir}">
+ <fileset dir="conf">
+ <include name="*.xml">
</include>
</fileset>
</copy>
@@ -62,27 +63,31 @@
</include>
<include name="testdb.script">
</include>
+ <include name="*.properties">
+ </include>
</fileset>
</copy>
+ <mkdir dir="${testclassesdir}/org/apache/commons/configuration">
+ </mkdir>
<copy todir="${testclassesdir}/org/apache/commons/configuration">
<fileset dir="conf">
- <include name="*.properties">
+ <include name="test.properties">
+ </include>
+ <include name="include.properties">
</include>
- <exclude name="testClasspath.properties">
- </exclude>
</fileset>
</copy>
+ <mkdir dir="${testclassesdir}/config">
+ </mkdir>
<copy todir="${testclassesdir}/config">
<fileset dir="conf/config">
- <include name="*.properties">
+ <include name="**/*.properties">
</include>
- <exclude name="testClasspath.properties">
- </exclude>
</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">
@@ -108,7 +113,7 @@
<target name="internal-test" depends="compile-tests">
<mkdir dir="${testreportdir}">
</mkdir>
- <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="false">
+ <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
<sysproperty key="basedir" value=".">
</sysproperty>
<formatter type="xml">
@@ -130,11 +135,9 @@
<include name="**/*Test*.java">
</include>
<exclude name="**/TestBasePropertiesConfiguration.java">
- </exclude>
+ </exclude>
<exclude name="**/NonStringTestHolder.java">
</exclude>
- <exclude name="**/TestJNDIConfiguration.java">
- </exclude>
</fileset>
</batchtest>
</junit>
@@ -156,17 +159,51 @@
</pathelement>
</classpath>
</javac>
+ <copy todir="${testclassesdir}">
+ <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test">
+ <include name="*.xml">
+ </include>
+ </fileset>
+ </copy>
+ <copy todir="${testclassesdir}">
+ <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test">
+ <include name="testClasspath.properties">
+ </include>
+ <include name="testdb.script">
+ </include>
+ <include name="*.properties">
+ </include>
+ </fileset>
+ </copy>
+ <mkdir dir="${testclassesdir}/org/apache/commons/configuration">
+ </mkdir>
+ <copy todir="${testclassesdir}/org/apache/commons/configuration">
+ <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test">
+ <include name="test.properties">
+ </include>
+ <include name="include.properties">
+ </include>
+ </fileset>
+ </copy>
+ <mkdir dir="${testclassesdir}/config">
+ </mkdir>
+ <copy todir="${testclassesdir}/config">
+ <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test">
+ <include name="**/*.properties">
+ </include>
+ </fileset>
+ </copy>
</target>
- <target name="javadoc" description="o Generate javadoc" depends="jar">
+ <target name="javadoc" description="o Generate javadoc">
<mkdir dir="${javadocdir}">
</mkdir>
<tstamp>
<format pattern="2001-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="commons-configuration 1.0-dev-3 API">
+ <property name="title" value="Commons Configuration 1.0-rc1 API">
</property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.configuration.*">
<classpath>
@@ -174,13 +211,13 @@
<include name="*.jar">
</include>
</fileset>
- <pathelement location="target/${final.name}.jar">
+ <pathelement location="${defaulttargetdir}/${final.name}.jar">
</pathelement>
</classpath>
</javadoc>
</target>
<target name="get-deps" unless="noget" depends="init">
- <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar">
+ <get dest="${libdir}/commons-collections-3.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-3.0.jar">
</get>
<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>
@@ -196,9 +233,7 @@
</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}/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}/simple-jndi-0.9.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.osjava.org/maven/simple-jndi/jars/simple-jndi-0.9.1.jar">
+ <get dest="${libdir}/spice-jndikit-1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/spice/jars/spice-jndikit-1.1.jar">
</get>
<get dest="${libdir}/commons-dbcp-1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-dbcp/jars/commons-dbcp-1.1.jar">
</get>
@@ -206,9 +241,13 @@
</get>
<get dest="${libdir}/hsqldb-1.7.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/hsqldb/jars/hsqldb-1.7.1.jar">
</get>
- <get dest="${libdir}/dbunit-1.5.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dbunit/jars/dbunit-1.5.5.jar">
+ <get dest="${libdir}/dbunit-2.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dbunit/jars/dbunit-2.0.jar">
+ </get>
+ <get dest="${libdir}/junit-addons-1.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit-addons/jars/junit-addons-1.4.jar">
+ </get>
+ <get dest="${libdir}/maven-tasks-plugin-1.1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven/plugins/maven-tasks-plugin-1.1.0.jar">
</get>
- <get dest="${libdir}/exml-dbunit1.5.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/exml/jars/exml-dbunit1.5.1.jar">
+ <get dest="${libdir}/maven-findbugs-plugin-0.7.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven/plugins/maven-findbugs-plugin-0.7.2.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>
@@ -223,4 +262,4 @@
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
</unjar>
</target>
-</project>
+</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-commons/configuration build.xml
Posted by Dion Gillard <di...@gmail.com>.
You'll need an updated ant plugin for Maven.
The one you have is generating absolute paths from your machine.
Let me know if I can help.
On 20 Jul 2004 11:08:37 -0000, ebourg@apache.org <eb...@apache.org> wrote:
> ebourg 2004/07/20 04:08:37
>
> Modified: configuration build.xml
> Log:
> Updated build.xml generated by Maven
>
> Revision Changes Path
> 1.7 +77 -38 jakarta-commons/configuration/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-commons/configuration/build.xml,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -r1.6 -r1.7
> --- build.xml 28 Mar 2004 19:56:08 -0000 1.6
> +++ build.xml 20 Jul 2004 11:08:36 -0000 1.7
> @@ -1,31 +1,26 @@
> <?xml version="1.0" encoding="UTF-8"?>
>
> -<!-- build.xml generated by maven from project.xml -->
> -
> -<!--
> - =========================================================================
> - WARNING: Some path information is missing in the generated file
> - and the simple-jndi jar should be downloaded from www.osjava.org
> - Compare with existing version before checking in the update!
> - =========================================================================
> --->
> +<!--build.xml generated by maven from project.xml version 1.0-rc1
> + on date July 20 2004, time 1306-->
>
> <project default="jar" name="commons-configuration" basedir=".">
> - <property name="defaulttargetdir" value="target">
> + <property name="defaulttargetdir" value="D:\dev\apache\jakarta-commons\configuration/target">
> + </property>
> + <property name="libdir" value="D:\dev\apache\jakarta-commons\configuration/target/lib">
> </property>
> - <property name="libdir" value="target/lib">
> + <property name="classesdir" value="D:\dev\apache\jakarta-commons\configuration/target/classes">
> </property>
> - <property name="classesdir" value="target/classes">
> + <property name="testclassesdir" value="D:\dev\apache\jakarta-commons\configuration/target/test-classes">
> </property>
> - <property name="testclassesdir" value="target/test-classes">
> + <property name="testclassesdir" value="D:\dev\apache\jakarta-commons\configuration/target/test-classes">
> </property>
> - <property name="testreportdir" value="target/test-reports">
> + <property name="testreportdir" value="D:\dev\apache\jakarta-commons\configuration/target/test-reports">
> </property>
> <property name="distdir" value="dist">
> </property>
> <property name="javadocdir" value="dist/docs/api">
> </property>
> - <property name="final.name" value="commons-configuration-1.0-dev-3">
> + <property name="final.name" value="commons-configuration-1.0-rc1">
> </property>
> <target name="init" description="o Initializes some properties">
> <mkdir dir="${libdir}">
> @@ -52,7 +47,13 @@
> </javac>
> <copy todir="${classesdir}">
> <fileset dir="conf">
> - <include name="*">
> + <include name="digesterRules.xml">
> + </include>
> + </fileset>
> + </copy>
> + <copy todir="${testclassesdir}">
> + <fileset dir="conf">
> + <include name="*.xml">
> </include>
> </fileset>
> </copy>
> @@ -62,27 +63,31 @@
> </include>
> <include name="testdb.script">
> </include>
> + <include name="*.properties">
> + </include>
> </fileset>
> </copy>
> + <mkdir dir="${testclassesdir}/org/apache/commons/configuration">
> + </mkdir>
> <copy todir="${testclassesdir}/org/apache/commons/configuration">
> <fileset dir="conf">
> - <include name="*.properties">
> + <include name="test.properties">
> + </include>
> + <include name="include.properties">
> </include>
> - <exclude name="testClasspath.properties">
> - </exclude>
> </fileset>
> </copy>
> + <mkdir dir="${testclassesdir}/config">
> + </mkdir>
> <copy todir="${testclassesdir}/config">
> <fileset dir="conf/config">
> - <include name="*.properties">
> + <include name="**/*.properties">
> </include>
> - <exclude name="testClasspath.properties">
> - </exclude>
> </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">
> @@ -108,7 +113,7 @@
> <target name="internal-test" depends="compile-tests">
> <mkdir dir="${testreportdir}">
> </mkdir>
> - <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="false">
> + <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
> <sysproperty key="basedir" value=".">
> </sysproperty>
> <formatter type="xml">
> @@ -130,11 +135,9 @@
> <include name="**/*Test*.java">
> </include>
> <exclude name="**/TestBasePropertiesConfiguration.java">
> - </exclude>
> + </exclude>
> <exclude name="**/NonStringTestHolder.java">
> </exclude>
> - <exclude name="**/TestJNDIConfiguration.java">
> - </exclude>
> </fileset>
> </batchtest>
> </junit>
> @@ -156,17 +159,51 @@
> </pathelement>
> </classpath>
> </javac>
> + <copy todir="${testclassesdir}">
> + <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test">
> + <include name="*.xml">
> + </include>
> + </fileset>
> + </copy>
> + <copy todir="${testclassesdir}">
> + <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test">
> + <include name="testClasspath.properties">
> + </include>
> + <include name="testdb.script">
> + </include>
> + <include name="*.properties">
> + </include>
> + </fileset>
> + </copy>
> + <mkdir dir="${testclassesdir}/org/apache/commons/configuration">
> + </mkdir>
> + <copy todir="${testclassesdir}/org/apache/commons/configuration">
> + <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test">
> + <include name="test.properties">
> + </include>
> + <include name="include.properties">
> + </include>
> + </fileset>
> + </copy>
> + <mkdir dir="${testclassesdir}/config">
> + </mkdir>
> + <copy todir="${testclassesdir}/config">
> + <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test">
> + <include name="**/*.properties">
> + </include>
> + </fileset>
> + </copy>
> </target>
> - <target name="javadoc" description="o Generate javadoc" depends="jar">
> + <target name="javadoc" description="o Generate javadoc">
> <mkdir dir="${javadocdir}">
> </mkdir>
> <tstamp>
> <format pattern="2001-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="commons-configuration 1.0-dev-3 API">
> + <property name="title" value="Commons Configuration 1.0-rc1 API">
> </property>
> <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.configuration.*">
> <classpath>
> @@ -174,13 +211,13 @@
> <include name="*.jar">
> </include>
> </fileset>
> - <pathelement location="target/${final.name}.jar">
> + <pathelement location="${defaulttargetdir}/${final.name}.jar">
> </pathelement>
> </classpath>
> </javadoc>
> </target>
> <target name="get-deps" unless="noget" depends="init">
> - <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar">
> + <get dest="${libdir}/commons-collections-3.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-3.0.jar">
> </get>
> <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>
> @@ -196,9 +233,7 @@
> </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}/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}/simple-jndi-0.9.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.osjava.org/maven/simple-jndi/jars/simple-jndi-0.9.1.jar">
> + <get dest="${libdir}/spice-jndikit-1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/spice/jars/spice-jndikit-1.1.jar">
> </get>
> <get dest="${libdir}/commons-dbcp-1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-dbcp/jars/commons-dbcp-1.1.jar">
> </get>
> @@ -206,9 +241,13 @@
> </get>
> <get dest="${libdir}/hsqldb-1.7.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/hsqldb/jars/hsqldb-1.7.1.jar">
> </get>
> - <get dest="${libdir}/dbunit-1.5.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dbunit/jars/dbunit-1.5.5.jar">
> + <get dest="${libdir}/dbunit-2.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dbunit/jars/dbunit-2.0.jar">
> + </get>
> + <get dest="${libdir}/junit-addons-1.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit-addons/jars/junit-addons-1.4.jar">
> + </get>
> + <get dest="${libdir}/maven-tasks-plugin-1.1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven/plugins/maven-tasks-plugin-1.1.0.jar">
> </get>
> - <get dest="${libdir}/exml-dbunit1.5.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/exml/jars/exml-dbunit1.5.1.jar">
> + <get dest="${libdir}/maven-findbugs-plugin-0.7.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven/plugins/maven-findbugs-plugin-0.7.2.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>
> @@ -223,4 +262,4 @@
> <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
> </unjar>
> </target>
> -</project>
> +</project>
> \ No newline at end of file
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org
>
>
--
http://www.multitask.com.au/people/dion/
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org