jvanzyl 2004/02/12 16:03:47
Modified: maven-plugins/maven-compiler-plugin/src/java/org/apache/maven/plugin
CompilerPlugin.java
maven-plugins/maven-jar-plugin/src/java/org/apache/maven/plugin
JarPlugin.java
maven-plugins/maven-surefire-plugin project.xml
maven-plugins/maven-surefire-plugin/src/main/org/apache/maven/test
SurefirePlugin.java
Log:
o plugin execution must be parameterized
Revision Changes Path
1.3 +7 -11
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompilerPlugin.java 7 Feb 2004 17:27:10 -0000 1.2
+++ CompilerPlugin.java 13 Feb 2004 00:03:46 -0000 1.3
@@ -1,9 +1,7 @@
package org.apache.maven.plugin;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.artifact.MavenArtifact;
-
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.compiler.Compiler;
import java.util.List;
@@ -21,15 +19,14 @@
{
private Map compilers;
- public void execute( MavenProject project )
+ public void execute( MavenProject project, Map parameters )
throws Exception
{
- buildProject( project );
- }
+ // sourceDirectory
+ // targetDirectory
+ // compiler: jikes|eclipse|aspectj|javac
+ // options specific to the compiler
- private List buildProject( MavenProject project )
- throws Exception
- {
String destinationDirectory = project.getBasedir() + "/target/classes";
Compiler compiler = (Compiler) compilers.get( "jikes" );
@@ -37,7 +34,6 @@
List messages = compiler.compile( classpathElements( project ),
new
String[]{project.getBuild().getSourceDirectory()},
destinationDirectory );
- return messages;
}
private String[] classpathElements( MavenProject project )
1.2 +3 -2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JarPlugin.java 6 Feb 2004 23:34:32 -0000 1.1
+++ JarPlugin.java 13 Feb 2004 00:03:46 -0000 1.2
@@ -69,6 +69,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
+import java.util.Map;
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
import java.util.jar.JarEntry;
@@ -91,7 +92,7 @@
public class JarPlugin
extends AbstractPlugin
{
- public void execute( MavenProject project )
+ public void execute( MavenProject project, Map parameters )
throws Exception
{
String jarName = project.getProperty( "maven.final.name" ) + ".jar";
1.3 +0 -23 maven-components/maven-plugins/maven-surefire-plugin/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-surefire-plugin/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 12 Feb 2004 02:02:08 -0000 1.2
+++ project.xml 13 Feb 2004 00:03:46 -0000 1.3
@@ -101,12 +101,6 @@
<version>0.4</version>
</dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-compiler</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
</dependencies>
<build>
@@ -129,27 +123,10 @@
</build>
<reports>
- <!--
- <report>maven-checkstyle-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-simian-plugin</report>
- -->
<report>maven-jxr-plugin</report>
<report>maven-javadoc-plugin</report>
<report>maven-changes-plugin</report>
<report>maven-changelog-plugin</report>
- <!--
- <report>maven-faq-plugin</report> will run by itself but won't register
- <report>maven-file-activity-plugin</report> can't parse jelly script
- <report>maven-developer-activity-plugin</report>
- <report>maven-tasklist-plugin</report> not quite right the report comes out
empty @tag problem?
- <report>maven-jdepend-plugin</report> works itself but not with site, also it
uses maven-classpath which is really just maven_home/lib
- <report>maven-jellydoc-plugin</report> ${genDocs} not available in jelly.plugin
- <report>maven-pmd-plugin</report> classpath is borked because of
getDependencyPath("foo:foo")
-
- We have different uses everywhere which is a result of no documenation.
-
- -->
</reports>
</project>
1.3 +3 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SurefirePlugin.java 12 Feb 2004 02:02:08 -0000 1.2
+++ SurefirePlugin.java 13 Feb 2004 00:03:47 -0000 1.3
@@ -8,6 +8,7 @@
import java.io.File;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
/**
*
@@ -19,7 +20,7 @@
public class SurefirePlugin
extends AbstractPlugin
{
- public void execute( MavenProject project )
+ public void execute( MavenProject project, Map parameters )
throws Exception
{
String mavenRepoLocal = project.getProperty( "maven.repo.local" );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
