[pkg-java] r3556 - in trunk/maven-ant-helper: . debian src/main/java

[trygvis-guest at alioth.debian.org]

Author: trygvis-guest
Date: 2007-05-30 03:22:36 +0000 (Wed, 30 May 2007)
New Revision: 3556

Modified:
   trunk/maven-ant-helper/
   trunk/maven-ant-helper/debian/
   trunk/maven-ant-helper/maven-build.xml
   trunk/maven-ant-helper/src/main/java/ModelloTask.java
Log:
o Adding svn:ignore.
o Adding both plexus-utils.jar and libplexus-utils.jar to the classpath. This is a workaround the duplicate plexus-utils package, but won't hurt.
o Properly putting the test output under the build/ directory.



Property changes on: trunk/maven-ant-helper
___________________________________________________________________
Name: svn:ignore
   + build*
*-stamp



Property changes on: trunk/maven-ant-helper/debian
___________________________________________________________________
Name: svn:ignore
   + files
maven-ant-helper


Modified: trunk/maven-ant-helper/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml	2007-05-29 21:58:02 UTC (rev 3555)
+++ trunk/maven-ant-helper/maven-build.xml	2007-05-30 03:22:36 UTC (rev 3556)
@@ -8,8 +8,8 @@
         <fail unless="artifactId" message="Missing required property: artifactId"/>
         <fail unless="version" message="Missing required property: version"/>
 
-        <echo message="Compile classpath: ${classpath.full.compile}" />
-        <echo message="Test classpath: ${classpath.full.test}" />
+        <echo message="Compile classpath: ${classpath.full.compile}"/>
+        <echo message="Test classpath: ${classpath.full.test}"/>
     </target>
 
     <!--
@@ -67,14 +67,14 @@
     </target>
 
     <target name="test" depends="test-compile" unless="maven.test.skip">
-        <mkdir dir="${build.directory}/surefire-tests"/>
-        <junit printsummary="yes" haltonfailure="no">
+        <mkdir dir="${build.directory}/test-output"/>
+        <junit printsummary="yes" haltonfailure="no"> <!--  fork="yes" forkmode="once" -->
             <classpath>
                 <pathelement path="${classpath.full.test}"/>
             </classpath>
 
             <formatter type="plain"/>
-            <batchtest>
+            <batchtest todir="${build.directory}/test-output">
                 <fileset dir="${build.testSourceDirectory}">
                     <include name="**/*Test.java"/>
                     <exclude name="**/Abstract*"/>

Modified: trunk/maven-ant-helper/src/main/java/ModelloTask.java
===================================================================
--- trunk/maven-ant-helper/src/main/java/ModelloTask.java	2007-05-29 21:58:02 UTC (rev 3555)
+++ trunk/maven-ant-helper/src/main/java/ModelloTask.java	2007-05-30 03:22:36 UTC (rev 3556)
@@ -32,6 +32,7 @@
 
         URL[] urls = new URL[] {
             new URL( "file:/usr/share/java/libplexus-utils.jar" ),
+            new URL( "file:/usr/share/java/plexus-utils.jar" ),
             new URL( "file:/usr/share/java/plexus-classworlds.jar" ),
             new URL( "file:/usr/share/java/plexus-container-default.jar" ),
             new URL( "file:/usr/share/java/modello-core.jar" ),