jvanzyl 2004/02/16 12:38:15
Modified: maven-plugins/maven-compiler-plugin/src/java/org/apache/maven/plugin
CompilerPlugin.java
maven-plugins/maven-compiler-plugin/src/resources/META-INF/maven
plugin.xml
maven-plugins/maven-jar-plugin/src/resources/META-INF/maven
plugin.xml
maven-plugins/maven-surefire-plugin/src/resources/META-INF/maven
plugin.xml
Log:
o using OGNL consistently, so we can either have any valid OGNL expression,
#project.x.y or #<property>.
Revision Changes Path
1.7 +11 -2
maven-components/maven-plugins/maven-compiler-plugin/src/java/org/apache/maven/plugin/CompilerPlugin.java
Index: CompilerPlugin.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-compiler-plugin/src/java/org/apache/maven/plugin/CompilerPlugin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CompilerPlugin.java 15 Feb 2004 21:42:50 -0000 1.6
+++ CompilerPlugin.java 16 Feb 2004 20:38:15 -0000 1.7
@@ -1,9 +1,11 @@
package org.apache.maven.plugin;
import org.codehaus.plexus.compiler.Compiler;
+import org.codehaus.plexus.compiler.CompilerError;
import java.util.List;
import java.util.Map;
+import java.util.Iterator;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
@@ -27,6 +29,13 @@
{
Compiler compiler = (Compiler) compilers.get( this.compiler );
- List messages = compiler.compile( classpathElements, new String[]{
sourceDirectory }, outputDirectory );
+ List messages = compiler.compile( classpathElements, new
String[]{sourceDirectory}, outputDirectory );
+
+ for ( Iterator i = messages.iterator(); i.hasNext(); )
+ {
+ CompilerError message = (CompilerError) i.next();
+
+ System.out.println( message.getMessage() );
+ }
}
}
1.4 +6 -6
maven-components/maven-plugins/maven-compiler-plugin/src/resources/META-INF/maven/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-compiler-plugin/src/resources/META-INF/maven/plugin.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.xml 15 Feb 2004 21:42:50 -0000 1.3
+++ plugin.xml 16 Feb 2004 20:38:15 -0000 1.4
@@ -4,9 +4,9 @@
<goal>
<name>compile</name>
<configuration>
- <sourceDirectory>#build.sourceDirectory</sourceDirectory>
- <outputDirectory>maven.build.dest</outputDirectory>
- <classpathElements>#classpathElements</classpathElements>
+ <sourceDirectory>#project.build.sourceDirectory</sourceDirectory>
+ <outputDirectory>#maven.build.dest</outputDirectory>
+ <classpathElements>#project.classpathElements</classpathElements>
<compiler>javac</compiler>
</configuration>
</goal>
@@ -16,9 +16,9 @@
<prereq>compile</prereq>
</prereqs>
<configuration>
- <sourceDirectory>#build.unitTestSourceDirectory</sourceDirectory>
- <outputDirectory>maven.test.dest</outputDirectory>
- <classpathElements>#classpathElements</classpathElements>
+ <sourceDirectory>#project.build.unitTestSourceDirectory</sourceDirectory>
+ <outputDirectory>#maven.test.dest</outputDirectory>
+ <classpathElements>#project.classpathElements</classpathElements>
<compiler>javac</compiler>
</configuration>
</goal>
1.4 +3 -3
maven-components/maven-plugins/maven-jar-plugin/src/resources/META-INF/maven/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-jar-plugin/src/resources/META-INF/maven/plugin.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.xml 16 Feb 2004 17:27:12 -0000 1.3
+++ plugin.xml 16 Feb 2004 20:38:15 -0000 1.4
@@ -8,9 +8,9 @@
<prereq>resources</prereq>
</prereqs>
<configuration>
- <jarName>maven.final.name</jarName>
- <outputDirectory>maven.build.dir</outputDirectory>
- <basedir>maven.build.dest</basedir>
+ <jarName>#maven.final.name</jarName>
+ <outputDirectory>#maven.build.dir</outputDirectory>
+ <basedir>#maven.build.dest</basedir>
</configuration>
</goal>
</goals>
1.3 +6 -5
maven-components/maven-plugins/maven-surefire-plugin/src/resources/META-INF/maven/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-surefire-plugin/src/resources/META-INF/maven/plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.xml 15 Feb 2004 21:42:50 -0000 1.2
+++ plugin.xml 16 Feb 2004 20:38:15 -0000 1.3
@@ -5,13 +5,14 @@
<name>test</name>
<prereqs>
<prereq>test:compile</prereq>
+ <prereq>test:resources</prereq>
</prereqs>
<configuration>
- <mavenRepoLocal>maven.repo.local</mavenRepoLocal>
- <basedir>basedir</basedir>
- <includes>#build.unitTest.includes</includes>
- <excludes>#build.unitTest.excludes</excludes>
- <classpathElements>#classpathElements</classpathElements>
+ <mavenRepoLocal>#maven.repo.local</mavenRepoLocal>
+ <basedir>#basedir</basedir>
+ <includes>#project.build.unitTest.includes</includes>
+ <excludes>#project.build.unitTest.excludes</excludes>
+ <classpathElements>#project.classpathElements</classpathElements>
</configuration>
</goal>
</goals>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
