svn commit: r369199 - in /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse: EclipseCleanMojo.java EclipsePlugin.java

[fg...@apache.org]

Author: fgiust
Date: Sun Jan 15 04:56:36 2006
New Revision: 369199

URL: http://svn.apache.org/viewcvs?rev=369199&view=rev
Log:
don't delete configuration for POM projects, mark a couple of parameters as readonly

Modified:
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java?rev=369199&r1=369198&r2=369199&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java Sun Jan 15 04:56:36 2006
@@ -54,6 +54,14 @@
     private static final String DIR_DOT_SETTINGS = ".settings"; //$NON-NLS-1$
 
     /**
+     * Packaging for the current project.
+     * @parameter expression="${project.packaging}"
+     * @required
+     * @readonly
+     */
+    private String packaging;
+
+    /**
      * @parameter expression="${basedir}"
      */
     private File basedir;
@@ -61,6 +69,14 @@
     public void execute()
         throws MojoExecutionException
     {
+
+        // since the eclipse plugin doesn't generate configuration for POM projects, it should neither delete it
+        if ( "pom".equals( packaging ) ) //$NON-NLS-1$
+        {
+            getLog().info( Messages.getString( "EclipsePlugin.pompackaging" ) ); //$NON-NLS-1$
+            return;
+        }
+
         delete( new File( basedir, FILE_DOT_PROJECT ) );
         delete( new File( basedir, FILE_DOT_CLASSPATH ) );
         delete( new File( basedir, FILE_DOT_WTPMODULES ) );

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=369199&r1=369198&r2=369199&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Sun Jan 15 04:56:36 2006
@@ -90,6 +90,7 @@
      * 
      * @parameter expression="${project}"
      * @required
+     * @readonly
      */
     private MavenProject project;
 
@@ -97,6 +98,7 @@
      * The currently executed project (can be a reactor project).
      * 
      * @parameter expression="${executedProject}"
+     * @readonly
      */
     private MavenProject executedProject;
 
@@ -215,8 +217,7 @@
      * reference those sub-projects using the installed package in the local
      * repository
      * 
-     * @parameter expression="${eclipse.useProjectReferences}"
-     *            default-value="true"
+     * @parameter expression="${eclipse.useProjectReferences}" default-value="true"
      * @required
      */
     private boolean useProjectReferences;
@@ -224,8 +225,7 @@
     /**
      * The default output directory
      * 
-     * @parameter expression="${project.build.outputDirectory}"
-     *            alias="outputDirectory"
+     * @parameter expression="${project.build.outputDirectory}" alias="outputDirectory"
      */
     private File buildOutputDirectory;
 
@@ -238,8 +238,7 @@
     private String wtpversion;
 
     /**
-     * Not a plugin parameter. Collect missing source artifact for the final
-     * report.
+     * Not a plugin parameter. Collect missing source artifact for the final report.
      */
     private List missingSourceArtifacts = new ArrayList();