maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From baerr...@apache.org
Subject svn commit: r727284 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/ test/resources/projects/project-myeclipse-01/expected/ test/resources/projec...
Date Wed, 17 Dec 2008 05:09:23 GMT
Author: baerrach
Date: Tue Dec 16 21:09:23 2008
New Revision: 727284

URL: http://svn.apache.org/viewvc?rev=727284&view=rev
Log:
[MECLIPSE-419]

As part of this change a lot of methods on EclipsePlugin were made final or hidden as private.
This is to avoid the problems in the future where subclasses are extending at the wrong points
and getting out of sync. e.g. MyEclipse plugin overwrote writeConfiguration() but missed all
the WTP changes.

Added javadocs for public/protected methods that were missing docs.

Renamed methods used for subclassing to be consistent with a "Extras" suffix.

MyEclipse now just writes MyEclipse specific files and EclipsePlugin handles the rest.

Updated ITs to include provided jars in classpath.

As part of the EclipsePlugin/WTP handling target/generated-resources/eclipse will be added
to the classpath with the generated META-INF/MANIFEST.MF file.

Removed:
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseClasspathWriter.java
Modified:
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=727284&r1=727283&r2=727284&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
Tue Dec 16 21:09:23 2008
@@ -506,12 +506,12 @@
      */
     private String ajdtVersion;
 
-    protected boolean isJavaProject()
+    protected final boolean isJavaProject()
     {
         return isJavaProject;
     }
 
-    protected boolean isPdeProject()
+    protected final boolean isPdeProject()
     {
         return pde;
     }
@@ -521,7 +521,7 @@
      * 
      * @return Returns the buildcommands.
      */
-    public List getBuildcommands()
+    public final List getBuildcommands()
     {
         return buildcommands;
     }
@@ -531,7 +531,7 @@
      * 
      * @param buildcommands The buildcommands to set.
      */
-    public void setBuildcommands( List buildcommands )
+    public final void setBuildcommands( List buildcommands )
     {
         this.buildcommands = buildcommands;
     }
@@ -541,7 +541,7 @@
      * 
      * @return Returns the buildOutputDirectory.
      */
-    public File getBuildOutputDirectory()
+    public final File getBuildOutputDirectory()
     {
         return buildOutputDirectory;
     }
@@ -551,7 +551,7 @@
      * 
      * @param buildOutputDirectory The buildOutputDirectory to set.
      */
-    public void setBuildOutputDirectory( File buildOutputDirectory )
+    public final void setBuildOutputDirectory( File buildOutputDirectory )
     {
         this.buildOutputDirectory = buildOutputDirectory;
     }
@@ -561,7 +561,7 @@
      * 
      * @return Returns the classpathContainers.
      */
-    public List getClasspathContainers()
+    public final List getClasspathContainers()
     {
         return classpathContainers;
     }
@@ -571,7 +571,7 @@
      * 
      * @param classpathContainers The classpathContainers to set.
      */
-    public void setClasspathContainers( List classpathContainers )
+    public final void setClasspathContainers( List classpathContainers )
     {
         this.classpathContainers = classpathContainers;
     }
@@ -581,7 +581,7 @@
      * 
      * @return Returns the eclipseProjectDir.
      */
-    public File getEclipseProjectDir()
+    public final File getEclipseProjectDir()
     {
         return eclipseProjectDir;
     }
@@ -591,7 +591,7 @@
      * 
      * @param eclipseProjectDir The eclipseProjectDir to set.
      */
-    public void setEclipseProjectDir( File eclipseProjectDir )
+    public final void setEclipseProjectDir( File eclipseProjectDir )
     {
         this.eclipseProjectDir = eclipseProjectDir;
     }
@@ -601,7 +601,7 @@
      * 
      * @return Returns the projectnatures.
      */
-    public List getProjectnatures()
+    public final List getProjectnatures()
     {
         return projectnatures;
     }
@@ -611,7 +611,7 @@
      * 
      * @param projectnatures The projectnatures to set.
      */
-    public void setProjectnatures( List projectnatures )
+    public final void setProjectnatures( List projectnatures )
     {
         this.projectnatures = projectnatures;
     }
@@ -621,7 +621,7 @@
      * 
      * @return Returns the useProjectReferences.
      */
-    public boolean getUseProjectReferences()
+    public final boolean getUseProjectReferences()
     {
         return useProjectReferences;
     }
@@ -631,7 +631,7 @@
      * 
      * @param useProjectReferences The useProjectReferences to set.
      */
-    public void setUseProjectReferences( boolean useProjectReferences )
+    public final void setUseProjectReferences( boolean useProjectReferences )
     {
         this.useProjectReferences = useProjectReferences;
     }
@@ -641,7 +641,7 @@
      * 
      * @return Returns the wtpversion.
      */
-    public String getWtpversion()
+    public final String getWtpversion()
     {
         return wtpversion;
     }
@@ -651,7 +651,7 @@
      * 
      * @param wtpversion The wtpversion to set.
      */
-    public void setWtpversion( String wtpversion )
+    public final void setWtpversion( String wtpversion )
     {
         this.wtpversion = wtpversion;
     }
@@ -661,7 +661,7 @@
      * 
      * @return Returns the additionalBuildcommands.
      */
-    public List getAdditionalBuildcommands()
+    public final List getAdditionalBuildcommands()
     {
         return additionalBuildcommands;
     }
@@ -671,7 +671,7 @@
      * 
      * @param additionalBuildcommands The additionalBuildcommands to set.
      */
-    public void setAdditionalBuildcommands( List additionalBuildcommands )
+    public final void setAdditionalBuildcommands( List additionalBuildcommands )
     {
         this.additionalBuildcommands = additionalBuildcommands;
     }
@@ -681,7 +681,7 @@
      * 
      * @return Returns the additionalProjectnatures.
      */
-    public List getAdditionalProjectnatures()
+    public final List getAdditionalProjectnatures()
     {
         return additionalProjectnatures;
     }
@@ -691,7 +691,7 @@
      * 
      * @param additionalProjectnatures The additionalProjectnatures to set.
      */
-    public void setAdditionalProjectnatures( List additionalProjectnatures )
+    public final void setAdditionalProjectnatures( List additionalProjectnatures )
     {
         this.additionalProjectnatures = additionalProjectnatures;
     }
@@ -699,7 +699,7 @@
     /**
      * Getter for <code>addVersionToProjectName</code>.
      */
-    public boolean isAddVersionToProjectName()
+    public final boolean isAddVersionToProjectName()
     {
         return addVersionToProjectName;
     }
@@ -707,7 +707,7 @@
     /**
      * Setter for <code>addVersionToProjectName</code>.
      */
-    public void setAddVersionToProjectName( boolean addVersionToProjectName )
+    public final void setAddVersionToProjectName( boolean addVersionToProjectName )
     {
         this.addVersionToProjectName = addVersionToProjectName;
     }
@@ -715,7 +715,7 @@
     /**
      * Getter for <code>addGroupIdToProjectName</code>.
      */
-    public boolean isAddGroupIdToProjectName()
+    public final boolean isAddGroupIdToProjectName()
     {
         return addGroupIdToProjectName;
     }
@@ -723,17 +723,27 @@
     /**
      * Setter for <code>addGroupIdToProjectName</code>.
      */
-    public void setAddGroupIdToProjectName( boolean addGroupIdToProjectName )
+    public final void setAddGroupIdToProjectName( boolean addGroupIdToProjectName )
     {
         this.addGroupIdToProjectName = addGroupIdToProjectName;
     }
 
-    public String getProjectNameTemplate()
+    /**
+     * Getter for <code>projectNameTemplate</code>
+     * 
+     * @return projectNameTemplate
+     */
+    public final String getProjectNameTemplate()
     {
         return projectNameTemplate;
     }
 
-    public void setProjectNameTemplate( String projectNameTemplate )
+    /**
+     * Setter for <code>projectNameTemplate</code>.
+     * 
+     * @param projectNameTemplate projectNameTemplate
+     */
+    public final void setProjectNameTemplate( String projectNameTemplate )
     {
         this.projectNameTemplate = projectNameTemplate;
     }
@@ -741,7 +751,7 @@
     /**
      * @see org.apache.maven.plugin.Mojo#execute()
      */
-    public boolean setup()
+    public final boolean setup()
         throws MojoExecutionException
     {
         boolean ready = true;
@@ -804,7 +814,13 @@
         return ready;
     }
 
-    protected void convertBuildCommandList( List commands )
+    /**
+     * Convert any Strings in the <code>commands</code> List to <code>BuildCommand</code>s.
The conversion happens
+     * in situ.
+     * 
+     * @param commands a list of commands to convert into <code>BuildCommand</code>
+     */
+    protected final void convertBuildCommandList( List commands )
     {
         if ( commands != null )
         {
@@ -845,13 +861,20 @@
         }
     }
 
+    /**
+     * Extension point for subclasses.
+     * <p>
+     * Called during <code>setup</code>.
+     * 
+     * @throws MojoExecutionException mojo failures.
+     */
     protected void setupExtras()
         throws MojoExecutionException
     {
         // extension point.
     }
 
-    protected void verifyClasspathContainerListIsComplete()
+    private void verifyClasspathContainerListIsComplete()
     {
         boolean containsJREContainer = false;
         // Check if classpathContainer contains a JRE (default, alternate or
@@ -932,7 +955,14 @@
         return true;
     }
 
-    protected void validateExtras()
+    /**
+     * Extension point for subclasses.
+     * <p>
+     * Called during <code>setup</code> and used to validate that the configuration
is sane.
+     * 
+     * @throws MojoExecutionException mojo failures.
+     */
+    protected void validateExtras() throws MojoExecutionException
     {
         // provided for extension.
     }
@@ -948,15 +978,20 @@
             downloadSources = true;
         }
 
-        checkExtraDeprecations();
+        checkDeprecationsExtras();
     }
 
-    protected void checkExtraDeprecations()
+    /**
+     * Extension point for subclasses.
+     * <p>
+     * Check for any extra deprecations and log warnings. Called during <code>setup</code>
+     */
+    protected void checkDeprecationsExtras()
     {
         // provided for extension.
     }
 
-    public void writeConfiguration( IdeDependency[] deps )
+    public final void writeConfiguration( IdeDependency[] deps )
         throws MojoExecutionException
     {
         EclipseWriterConfig config = createEclipseWriterConfig( deps );
@@ -966,7 +1001,7 @@
             EclipseManifestWriter.addManifestResource( getLog(), config );
         }
         // NOTE: This could change the config!
-        writeExtraConfiguration( config );
+        writeConfigurationExtras( config );
 
         if ( wtpVersionFloat == 0.7f )
         {
@@ -1020,7 +1055,7 @@
                                            config.getEclipseProjectName(), eclipseProjectDir.getAbsolutePath()
} ) );
     }
 
-    protected void writeAdditionalConfig()
+    private void writeAdditionalConfig()
         throws MojoExecutionException
     {
         if ( additionalConfig != null )
@@ -1081,7 +1116,14 @@
         }
     }
 
-    protected EclipseWriterConfig createEclipseWriterConfig( IdeDependency[] deps )
+    /**
+     * Create the <code>EclipseWriterConfig</code> for the specified dependencies.
+     * 
+     * @param deps the project dependencies
+     * @return a configured <code>EclipseWriterConfig</code>
+     * @throws MojoExecutionException mojo failures.
+     */
+    protected final EclipseWriterConfig createEclipseWriterConfig( IdeDependency[] deps )
         throws MojoExecutionException
     {
         File projectBaseDir = executedProject.getFile().getParentFile();
@@ -1231,7 +1273,7 @@
      * @param config
      * @throws MojoExecutionException
      */
-    protected void writeExtraConfiguration( EclipseWriterConfig config )
+    protected void writeConfigurationExtras( EclipseWriterConfig config )
         throws MojoExecutionException
     {
         // extension point.
@@ -1245,7 +1287,15 @@
             throw new MojoExecutionException( Messages.getString( "EclipsePlugin.missingelement",
elementName ) ); //$NON-NLS-1$
         }
     }
-
+    
+    /**
+     * Fill getProjectnatures() with values.
+     * <p>
+     * Subclasses should call super and then calculate their own additions and insert them
via
+     * <code>getProjectnatures().addAll()</code>.
+     * 
+     * @param packaging the pom's packaging
+     */    
     protected void fillDefaultNatures( String packaging )
     {
         projectnatures = new ArrayList();
@@ -1282,6 +1332,14 @@
 
     }
 
+    /**
+     * Fill getClasspathContainers() with values.
+     * <p>
+     * Subclasses should call super and then calculate their own additions and insert them
via
+     * <code>getClasspathContainers().addAll()</code>.
+     * 
+     * @param packaging the pom's packaging
+     */
     protected void fillDefaultClasspathContainers( String packaging )
     {
         classpathContainers = new ArrayList();
@@ -1304,6 +1362,14 @@
         }
     }
 
+    /**
+     * Fill getBuildcommands() with values.
+     * <p>
+     * Subclasses should call super and then calculate their own additions and insert them
via
+     * <code>getBuildcommands().addAll()</code>.
+     * 
+     * @param packaging the pom's packaging
+     */
     protected void fillDefaultBuilders( String packaging )
     {
         buildcommands = new ArrayList();
@@ -1348,7 +1414,7 @@
         }
     }
 
-    public EclipseSourceDir[] buildDirectoryList( MavenProject project, File basedir, File
buildOutputDirectory )
+    public final EclipseSourceDir[] buildDirectoryList( MavenProject project, File basedir,
File buildOutputDirectory )
         throws MojoExecutionException
     {
         File projectBaseDir = project.getFile().getParentFile();
@@ -1427,7 +1493,7 @@
         }
     }
 
-    void extractResourceDirs( Set directories, List resources, File basedir, File workspaceProjectBaseDir,
+    final void extractResourceDirs( Set directories, List resources, File basedir, File workspaceProjectBaseDir,
                               boolean test, final String output )
         throws MojoExecutionException
     {
@@ -1693,12 +1759,12 @@
     /**
      * {@inheritDoc}
      */
-    protected IdeDependency[] getWorkspaceArtefacts()
+    protected final IdeDependency[] getWorkspaceArtefacts()
     {
         return getWorkspaceConfiguration().getWorkspaceArtefacts();
     }
 
-    public WorkspaceConfiguration getWorkspaceConfiguration()
+    public final WorkspaceConfiguration getWorkspaceConfiguration()
     {
         if ( workspaceConfiguration == null )
         {
@@ -1735,7 +1801,7 @@
         }
     }
 
-    public List getExcludes()
+    public final List getExcludes()
     {
         return excludes;
     }
@@ -1774,24 +1840,13 @@
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.maven.plugin.ide.AbstractIdeSupportMojo#doDependencyResolution()
-     */
-    protected IdeDependency[] doDependencyResolution()
-        throws MojoExecutionException
-    {
-
-        return super.doDependencyResolution();
-    }
-
     /**
      * Checks if jar has to be resolved for the given artifact
      * 
      * @param art the artifact to check
      * @return true if resolution should happen
      */
-    protected boolean hasToResolveJar( Artifact art )
+    protected final boolean hasToResolveJar( Artifact art )
     {
         return !( getUseProjectReferences() && isAvailableAsAReactorProject( art
) )
             || ( limitProjectReferencesToWorkspace && !( getUseProjectReferences()
&& isAvailableAsAWorkspaceProject( art ) ) );
@@ -1803,7 +1858,7 @@
      * @param art the artifact to check
      * @return true if a project reference has to be used.
      */
-    protected boolean useProjectReference( Artifact art )
+    protected final boolean useProjectReference( Artifact art )
     {
         boolean isReactorProject = getUseProjectReferences() && isAvailableAsAReactorProject(
art );
         boolean isWorkspaceProject = getUseProjectReferences() && isAvailableAsAWorkspaceProject(
art );

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java?rev=727284&r1=727283&r2=727284&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java
Tue Dec 16 21:09:23 2008
@@ -5,10 +5,10 @@
 import java.util.Map;
 
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.eclipse.writers.EclipseClasspathWriter;
 import org.apache.maven.plugin.eclipse.writers.EclipseProjectWriter;
 import org.apache.maven.plugin.eclipse.writers.EclipseSettingsWriter;
 import org.apache.maven.plugin.eclipse.writers.EclipseWriterConfig;
-import org.apache.maven.plugin.eclipse.writers.myeclipse.MyEclipseClasspathWriter;
 import org.apache.maven.plugin.eclipse.writers.myeclipse.MyEclipseHibernateWriter;
 import org.apache.maven.plugin.eclipse.writers.myeclipse.MyEclipseMetadataWriter;
 import org.apache.maven.plugin.eclipse.writers.myeclipse.MyEclipseSpringBeansWriter;
@@ -106,14 +106,14 @@
      * @parameter
      */
     private Map struts;
-
-    public void writeConfiguration( IdeDependency[] deps )
+   
+    /**
+     * {@inheritDoc}
+     */
+    protected void writeConfigurationExtras( EclipseWriterConfig config )
         throws MojoExecutionException
     {
-        EclipseWriterConfig config = createEclipseWriterConfig( deps );
-
-        new EclipseSettingsWriter().init( getLog(), config ).write();
-
+        super.writeConfigurationExtras( config );
         if ( isJavaProject() )
         {
             // If the project is a Web Project, make it compile in WEB-INF/classes
@@ -133,14 +133,8 @@
                     }
                 }
             }
-
-            new MyEclipseClasspathWriter().init( getLog(), config ).write();
         }
-
-        new EclipseProjectWriter().init( getLog(), config ).write();
-
-        writeAdditionalConfig();
-
+        
         // the MyEclipse part ...
 
         new MyEclipseMetadataWriter().init( getLog(), config ).write();
@@ -164,7 +158,7 @@
             }
 
             new MyEclipseHibernateWriter( getHibernate() ).init( getLog(), config ).write();
-        }
+        }                
     }
 
     /**

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java?rev=727284&r1=727283&r2=727284&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java
Tue Dec 16 21:09:23 2008
@@ -133,10 +133,10 @@
      * @param deps resolved dependencies to handle
      * @throws MojoExecutionException if the config files could not be written.
      */
-    protected void writeExtraConfiguration( EclipseWriterConfig config )
+    protected void writeConfigurationExtras( EclipseWriterConfig config )
         throws MojoExecutionException
     {
-        super.writeExtraConfiguration( config );
+        super.writeConfigurationExtras( config );
 
         new RadJ2EEWriter().init( getLog(), config ).write();
 

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath?rev=727284&r1=727283&r2=727284&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath
Tue Dec 16 21:09:23 2008
@@ -4,6 +4,7 @@
   <classpathentry kind="src" path="src/main/java" output="/src/main/webapp/WEB-INF/classes"
including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" output="/src/main/webapp/WEB-INF/classes"
excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"
sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE13_CONTAINER"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/expected/.classpath?rev=727284&r1=727283&r2=727284&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/expected/.classpath
Tue Dec 16 21:09:23 2008
@@ -4,6 +4,7 @@
   <classpathentry kind="src" path="src/main/java" output="/src/main/webapp/WEB-INF/classes"
including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" output="/src/main/webapp/WEB-INF/classes"
excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath?rev=727284&r1=727283&r2=727284&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
Tue Dec 16 21:09:23 2008
@@ -3,6 +3,7 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+  <classpathentry kind="src" path="target/generated-resources/eclipse" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath?rev=727284&r1=727283&r2=727284&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
Tue Dec 16 21:09:23 2008
@@ -3,6 +3,7 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+  <classpathentry kind="src" path="target/generated-resources/eclipse" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>
\ No newline at end of file



Mime
View raw message