jvanzyl 2004/02/15 13:42:50
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/java/org/apache/maven/plugin
JarPlugin.java
maven-plugins/maven-jar-plugin/src/resources/META-INF/maven
plugin.xml
maven-plugins/maven-surefire-plugin/src/main/org/apache/maven/test
SurefirePlugin.java
maven-plugins/maven-surefire-plugin/src/resources/META-INF/maven
plugin.xml
Log:
o after some discussion with michal I changed the way the plugins work and
just use a more simple bean with fields and an execute method. Also
simplified the configuration for plugins.
Revision Changes Path
1.6 +9 -13
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CompilerPlugin.java 14 Feb 2004 21:31:13 -0000 1.5
+++ CompilerPlugin.java 15 Feb 2004 21:42:50 -0000 1.6
@@ -14,22 +14,18 @@
{
private Map compilers;
- public void execute( Map parameters )
- throws Exception
- {
- //---
-
- String sourceDirectory = (String) parameters.get( "sourceDirectory" );
+ private String sourceDirectory;
- String outputDirectory = (String) parameters.get( "outputDirectory" );
+ private String outputDirectory;
- String[] classpathElements = (String[]) parameters.get( "classpathElements"
);
+ private String[] classpathElements;
- String compilerName = (String) parameters.get( "compiler" );
+ private String compiler;
- //---
-
- Compiler compiler = (Compiler) compilers.get( compilerName );
+ public void execute()
+ throws Exception
+ {
+ Compiler compiler = (Compiler) compilers.get( this.compiler );
List messages = compiler.compile( classpathElements, new String[]{
sourceDirectory }, outputDirectory );
}
1.3 +12 -36
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.xml 15 Feb 2004 03:34:19 -0000 1.2
+++ plugin.xml 15 Feb 2004 21:42:50 -0000 1.3
@@ -3,48 +3,24 @@
<goals>
<goal>
<name>compile</name>
- <parameters>
- <parameter>
- <key>sourceDirectory</key>
- <value>#build.sourceDirectory</value>
- </parameter>
- <parameter>
- <key>outputDirectory</key>
- <value>maven.build.dest</value>
- </parameter>
- <parameter>
- <key>classpathElements</key>
- <value>#classpathElements</value>
- </parameter>
- <parameter>
- <key>compiler</key>
- <value>javac</value>
- </parameter>
- </parameters>
+ <configuration>
+ <sourceDirectory>#build.sourceDirectory</sourceDirectory>
+ <outputDirectory>maven.build.dest</outputDirectory>
+ <classpathElements>#classpathElements</classpathElements>
+ <compiler>javac</compiler>
+ </configuration>
</goal>
<goal>
<name>test:compile</name>
<prereqs>
<prereq>compile</prereq>
</prereqs>
- <parameters>
- <parameter>
- <key>sourceDirectory</key>
- <value>#build.unitTestSourceDirectory</value>
- </parameter>
- <parameter>
- <key>outputDirectory</key>
- <value>maven.test.dest</value>
- </parameter>
- <parameter>
- <key>classpathElements</key>
- <value>#classpathElements</value>
- </parameter>
- <parameter>
- <key>compiler</key>
- <value>javac</value>
- </parameter>
- </parameters>
+ <configuration>
+ <sourceDirectory>#build.unitTestSourceDirectory</sourceDirectory>
+ <outputDirectory>maven.test.dest</outputDirectory>
+ <classpathElements>#classpathElements</classpathElements>
+ <compiler>javac</compiler>
+ </configuration>
</goal>
</goals>
</plugin>
1.7 +9 -11
maven-components/maven-plugins/maven-jar-plugin/src/java/org/apache/maven/plugin/JarPlugin.java
Index: JarPlugin.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-jar-plugin/src/java/org/apache/maven/plugin/JarPlugin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JarPlugin.java 15 Feb 2004 03:49:23 -0000 1.6
+++ JarPlugin.java 15 Feb 2004 21:42:50 -0000 1.7
@@ -90,20 +90,18 @@
*/
public class JarPlugin
{
- public void execute( Map parameters )
- throws Exception
- {
- //---
-
- String jarName = (String) parameters.get( "jarName" ) + ".jar";
+ private String jarName;
- String outputDirectory = (String) parameters.get( "outputDirectory" );
+ private String outputDirectory;
- File basedir = new File( (String) parameters.get( "basedir" ) );
+ private String basedir;
- MavenProject project = (MavenProject) parameters.get( "project" );
+ private MavenProject project;
- //---
+ public void execute()
+ throws Exception
+ {
+ File basedir = new File( this.basedir );
File jarFile = new File( new File( outputDirectory ), jarName );
1.2 +6 -18
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.xml 15 Feb 2004 02:00:08 -0000 1.1
+++ plugin.xml 15 Feb 2004 21:42:50 -0000 1.2
@@ -6,24 +6,12 @@
<prereqs>
<prereq>test</prereq>
</prereqs>
- <parameters>
- <parameter>
- <key>jarName</key>
- <value>maven.final.name</value>
- </parameter>
- <parameter>
- <key>outputDirectory</key>
- <value>maven.build.dir</value>
- </parameter>
- <parameter>
- <key>basedir</key>
- <value>maven.build.dest</value>
- </parameter>
- <parameter>
- <key>project</key>
- <value>project</value>
- </parameter>
- </parameters>
+ <configuration>
+ <jarName>maven.final.name</jarName>
+ <outputDirectory>maven.build.dir</outputDirectory>
+ <basedir>maven.build.dest</basedir>
+ <project>project</project>
+ </configuration>
</goal>
</goals>
</plugin>
1.6 +9 -14
maven-components/maven-plugins/maven-surefire-plugin/src/main/org/apache/maven/test/SurefirePlugin.java
Index: SurefirePlugin.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-surefire-plugin/src/main/org/apache/maven/test/SurefirePlugin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SurefirePlugin.java 14 Feb 2004 21:31:14 -0000 1.5
+++ SurefirePlugin.java 15 Feb 2004 21:42:50 -0000 1.6
@@ -4,7 +4,6 @@
import java.io.File;
import java.util.List;
-import java.util.Map;
/**
*
@@ -15,23 +14,19 @@
*/
public class SurefirePlugin
{
- public void execute( Map parameters )
- throws Exception
- {
- //---
-
- String mavenRepoLocal = (String) parameters.get( "mavenRepoLocal" );
+ private String mavenRepoLocal;
- String basedir = (String) parameters.get( "basedir" );
+ private String basedir;
- List includes = (List) parameters.get( "includes" );
+ private List includes;
- List excludes = (List) parameters.get( "excludes" );
+ private List excludes;
- String[] classpathElements = (String[]) parameters.get( "classpathElements"
);
-
- //---
+ private String[] classpathElements;
+ public void execute()
+ throws Exception
+ {
System.setProperty( "basedir", basedir );
SurefireBooter surefireBooter = new SurefireBooter();
1.2 +7 -22
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.xml 15 Feb 2004 01:48:20 -0000 1.1
+++ plugin.xml 15 Feb 2004 21:42:50 -0000 1.2
@@ -6,28 +6,13 @@
<prereqs>
<prereq>test:compile</prereq>
</prereqs>
- <parameters>
- <parameter>
- <key>mavenRepoLocal</key>
- <value>maven.repo.local</value>
- </parameter>
- <parameter>
- <key>basedir</key>
- <value>basedir</value>
- </parameter>
- <parameter>
- <key>includes</key>
- <value>#build.unitTest.includes</value>
- </parameter>
- <parameter>
- <key>excludes</key>
- <value>#build.unitTest.excludes</value>
- </parameter>
- <parameter>
- <key>classpathElements</key>
- <value>#classpathElements</value>
- </parameter>
- </parameters>
+ <configuration>
+ <mavenRepoLocal>maven.repo.local</mavenRepoLocal>
+ <basedir>basedir</basedir>
+ <includes>#build.unitTest.includes</includes>
+ <excludes>#build.unitTest.excludes</excludes>
+ <classpathElements>#classpathElements</classpathElements>
+ </configuration>
</goal>
</goals>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
