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

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2007-05-29 21:58:02 +0000 (Tue, 29 May 2007)
New Revision: 3555

Modified:
   trunk/maven-ant-helper/maven-build.xml
   trunk/maven-ant-helper/maven-defaults.properties
   trunk/maven-ant-helper/src/main/java/ModelloTask.java
Log:
Applied patch from trygvis

Modified: trunk/maven-ant-helper/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml	2007-05-29 21:22:53 UTC (rev 3554)
+++ trunk/maven-ant-helper/maven-build.xml	2007-05-29 21:58:02 UTC (rev 3555)
@@ -3,14 +3,11 @@
 <project name="pkg-java" default="package" basedir="..">
 
     <target name="init">
-        <available property="available.sources" file="src/main/java"/>
         <available property="available.resources" file="src/main/resources"/>
 
         <fail unless="artifactId" message="Missing required property: artifactId"/>
         <fail unless="version" message="Missing required property: version"/>
 
-        <echo message="available.sources: ${available.sources}"/>
-        <echo message="available.resources: ${available.resources}"/>
         <echo message="Compile classpath: ${classpath.full.compile}" />
         <echo message="Test classpath: ${classpath.full.test}" />
     </target>
@@ -38,12 +35,15 @@
 
     <target name="compile" depends="process-resources">
         <mkdir dir="${build.outputDirectory}"/>
+        <mkdir dir="${build.directory}/generated-sources"/>
         <javac
             destdir="${build.outputDirectory}"
             classpath="${classpath.compile}"
+            nowarn="true"
+            source="1.4" target="1.4"
             debug="on">
-            <srcdir dir="${build.sourceDirectory}"/>
-            <srcdir dir="${build.outputDirectory}/generated-sources"/>
+            <src path="${build.sourceDirectory}"/>
+            <src path="${build.directory}/generated-sources"/>
         </javac>
     </target>
 
@@ -59,28 +59,26 @@
         <javac
             destdir="${build.testOutputDirectory}"
             classpath="${classpath.full.test}"
+            nowarn="true"
+            source="1.4" target="1.4"
             debug="on">
-            <srcdir dir="${build.testSourceDirectory}"/>
+            <src path="${build.testSourceDirectory}"/>
         </javac>
     </target>
 
     <target name="test" depends="test-compile" unless="maven.test.skip">
         <mkdir dir="${build.directory}/surefire-tests"/>
-        <junit printsummary="yes" haltonfailure="no" forkmode="once">
+        <junit printsummary="yes" haltonfailure="no">
             <classpath>
                 <pathelement path="${classpath.full.test}"/>
             </classpath>
 
             <formatter type="plain"/>
-<!--
-            <test name="my.test.TestCase" haltonfailure="no" outfile="result">
-                <formatter type="xml"/>
-            </test>
--->
-            <batchtest fork="yes" todir="${build.directory}/surefire-tests">
+            <batchtest>
                 <fileset dir="${build.testSourceDirectory}">
                     <include name="**/*Test.java"/>
-                    <exclude name="**/Abstract*.java"/>
+                    <exclude name="**/Abstract*"/>
+                    <exclude name="${maven.test.exclude}"/>
                 </fileset>
             </batchtest>
         </junit>

Modified: trunk/maven-ant-helper/maven-defaults.properties
===================================================================
--- trunk/maven-ant-helper/maven-defaults.properties	2007-05-29 21:22:53 UTC (rev 3554)
+++ trunk/maven-ant-helper/maven-defaults.properties	2007-05-29 21:58:02 UTC (rev 3555)
@@ -2,6 +2,7 @@
 # See http://maven.apache.org/ref/current/maven-model/maven.html for nams
 build.sourceDirectory=src/main/java
 build.testSourceDirectory=src/test/java
+
 build.directory=build
 build.outputDirectory=build/classes
 build.testOutputDirectory=build/test-classes
@@ -10,3 +11,5 @@
 classpath.test=
 classpath.full.compile=${build.outputDirectory}:${classpath.compile}
 classpath.full.test=${build.testOutputDirectory}:${classpath.test}:${build.outputDirectory}:${classpath.compile}
+
+maven.test.excludes=

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