dgraham 2003/06/04 18:26:19 Modified: validator project.xml maven.xml Log: Applied patches supplied in PR# 20254 to fix maven build. Revision Changes Path 1.10 +30 -1 jakarta-commons/validator/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons/validator/project.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- project.xml 17 Apr 2003 03:20:10 -0000 1.9 +++ project.xml 5 Jun 2003 01:26:19 -0000 1.10 @@ -45,6 +45,18 @@ <email>[EMAIL PROTECTED]</email> <organization></organization> </developer> + <developer> + <name>David Graham</name> + <id>dgraham</id> + <email>[EMAIL PROTECTED]</email> + <organization></organization> + </developer> + <developer> + <name>Rob Leland</name> + <id>rleland</id> + <email>[EMAIL PROTECTED]</email> + <organization></organization> + </developer> </developers> <dependencies> @@ -61,7 +73,7 @@ <dependency> <id>commons-digester</id> - <version>1.3</version> + <version>1.5</version> </dependency> <dependency> @@ -96,7 +108,24 @@ <includes> <include>**/*Test.java</include> </includes> + <resources> + <resource> + <directory>${pom.build.unitTestSourceDirectory}</directory> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + </resources> </unitTest> + + <resources> + <resource> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + </build> 1.2 +19 -6 jakarta-commons/validator/maven.xml Index: maven.xml =================================================================== RCS file: /home/cvs/jakarta-commons/validator/maven.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- maven.xml 23 Jul 2002 16:59:46 -0000 1.1 +++ maven.xml 5 Jun 2003 01:26:19 -0000 1.2 @@ -2,12 +2,25 @@ <postGoal name="java:compile"> - <copy todir="${maven.build.dir}/test-classes/org/apache/commons/validator"> - <fileset dir="src/test/org/apache/commons/validator"> - <include name="*.xml"/> - </fileset> + <copy todir="${maven.build.dir}/classes/"> + <fileset dir="${pom.build.sourceDirectory}" + excludes="**/*.java"/> </copy> - + + <copy todir="${maven.build.dir}/classes/org/apache/commons/validator/resources/" + file="${basedir}/conf/share/validator_1_0.dtd"/> + + <copy todir="${maven.build.dir}/classes/org/apache/commons/validator/resources/" + file="${basedir}/conf/share/validator_1_0_1.dtd"/> + + <copy todir="${maven.build.dir}/classes/org/apache/commons/validator/resources/" + file="${basedir}/conf/share/validator_1_1.dtd"/> + + <copy todir="${maven.build.dir}/classes/"> + <fileset dir="${javascript.home}" + includes="**/*.js"/> + </copy> + </postGoal> -</project> +</project> \ No newline at end of file
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]