You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2007/03/15 19:13:34 UTC

svn commit: r518715 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/writers/ main/java/org/apache/maven/plugin/ide/ test/java/org/apache/maven/plugin/eclipse/ test...

Author: aheritier
Date: Thu Mar 15 11:13:33 2007
New Revision: 518715

URL: http://svn.apache.org/viewvc?view=rev&rev=518715
Log:
[MECLIPSE-220] Incorrect eclipse facet information when doing mvn eclipse:eclipse for war and ejb projects.
Submitted by: Minto van der Sluis
[MECLIPSE-241] Compiler settings from parent project aren't used in wtp facet
[MECLIPSE-198] EJB version is not resolved
[MECLIPSE-108] .wtpmodules with version 2.4 for javax.servlet:servlet-api:2.3
+ Patch slightly modified to keep default settings
+ Tests added to not reproduce these errors
+ Automatically find APIs versions from new Geronimo dependencies
+ Code cleanup

Added:
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.classpath   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.project   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.component
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/src/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/src/main/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/src/main/java/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/src/main/java/DummyClass.txt   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.classpath   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.project   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.component
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.project.facet.core.xml   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/src/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/src/main/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/src/main/java/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/src/main/java/DummyClass.txt   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.project   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.wtpmodules
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml   (with props)
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/writers/AbstractWtpResourceWriter.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
    maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java
    maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java?view=diff&rev=518715&r1=518714&r2=518715
==============================================================================
--- 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 Thu Mar 15 11:13:33 2007
@@ -90,13 +90,6 @@
     private File basedir;
 
     /**
-     * Is it an PDE project?
-     * 
-     * @parameter expression="${eclipse.pde}" default-value="false"
-     */
-    private boolean pde;
-
-    /**
      * @see org.apache.maven.plugin.AbstractMojo#execute()
      */
     public void execute()

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java?view=diff&rev=518715&r1=518714&r2=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java Thu Mar 15 11:13:33 2007
@@ -18,26 +18,25 @@
  */
 package org.apache.maven.plugin.eclipse.writers;
 
-import java.io.File;
-import java.util.Iterator;
-
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.eclipse.Messages;
 import org.apache.maven.plugin.ide.IdeDependency;
 import org.apache.maven.plugin.ide.IdeUtils;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.XMLWriter;
 
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Base class to hold common constants used by extending classes.
+ * 
  * @author <a href="mailto:rahul.thakur.xdev@gmail.com">Rahul Thakur</a>
  * @author <a href="mailto:fgiust@users.sourceforge.net">Fabrizio Giustina</a>
  */
-public abstract class AbstractWtpResourceWriter
-    extends AbstractEclipseWriter
+public abstract class AbstractWtpResourceWriter extends AbstractEclipseWriter
 {
 
     private static final String ELT_DEPENDENCY_TYPE = "dependency-type"; //$NON-NLS-1$
@@ -82,8 +81,7 @@
      * @throws MojoExecutionException
      */
     protected void writeModuleTypeAccordingToPackaging( MavenProject project, XMLWriter writer,
-                                                        File buildOutputDirectory )
-        throws MojoExecutionException
+                                                        File buildOutputDirectory ) throws MojoExecutionException
     {
         if ( "war".equals( project.getPackaging() ) ) //$NON-NLS-1$
         {
@@ -119,7 +117,8 @@
             writer.startElement( ELT_PROPERTY );
             writer.addAttribute( ATTR_NAME, "java-output-path" ); //$NON-NLS-1$
             writer.addAttribute( ATTR_VALUE, "/" + //$NON-NLS-1$
-                IdeUtils.toRelativeAndFixSeparator( config.getProject().getBasedir(), buildOutputDirectory, false ) );
+                            IdeUtils.toRelativeAndFixSeparator( config.getProject().getBasedir(), buildOutputDirectory,
+                                                                false ) );
             writer.endElement();
 
         }
@@ -139,14 +138,15 @@
             writer.startElement( ELT_PROPERTY );
             writer.addAttribute( ATTR_NAME, "java-output-path" ); //$NON-NLS-1$
             writer.addAttribute( ATTR_VALUE, "/" + //$NON-NLS-1$
-                IdeUtils.toRelativeAndFixSeparator( config.getProject().getBasedir(), buildOutputDirectory, false ) );
+                            IdeUtils.toRelativeAndFixSeparator( config.getProject().getBasedir(), buildOutputDirectory,
+                                                                false ) );
             writer.endElement();
         }
     }
 
     /**
      * Adds dependency for Eclipse WTP project.
-     *
+     * 
      * @param writer
      * @param artifact
      * @param localRepository
@@ -187,15 +187,17 @@
 
             if ( dep.isSystemScoped() )
             {
-                handle = "module:/classpath/lib/" //$NON-NLS-1$
-                    + IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(), repoFile, false );
+                handle =
+                    "module:/classpath/lib/" //$NON-NLS-1$
+                                    + IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(),
+                                                                          repoFile, false );
             }
             else
             {
                 File localRepositoryFile = new File( localRepository.getBasedir() );
 
                 handle = "module:/classpath/var/M2_REPO/" //$NON-NLS-1$
-                    + IdeUtils.toRelativeAndFixSeparator( localRepositoryFile, repoFile, false );
+                                + IdeUtils.toRelativeAndFixSeparator( localRepositoryFile, repoFile, false );
             }
         }
 
@@ -224,7 +226,7 @@
             // NB war is needed for ear projects, we suppose nobody adds a war dependency to a war/jar project
             // exclude test and provided deps
             if ( ( !dep.isTestDependency() && !dep.isProvided() )
-                && ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type ) || "war".equals( type ) ) ) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                            && ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type ) || "war".equals( type ) ) ) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
             {
                 addDependency( writer, dep, localRepository, config.getProject().getBasedir() );
             }
@@ -233,18 +235,42 @@
 
     protected String resolveServletVersion()
     {
-        String[] artifactNames = new String[] { "servlet-api", "servletapi", "geronimo-spec-servlet" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        String[] artifactIds = new String[] { "servlet-api", "servletapi", "geronimo-spec-servlet" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
-        String version = IdeUtils.getDependencyVersion( artifactNames, config.getProject().getArtifacts(), 3 );
+        String version = IdeUtils.getDependencyVersion( artifactIds, config.getProject().getDependencies(), 3 );
+
+        // For new Geronimo APIs, the version of the artifact isn't the one of the spec
         if ( version == null )
         {
-            // none of the above specified matched, try geronimo-spec-j2ee
-            artifactNames = new String[] { "geronimo-spec-j2ee" }; //$NON-NLS-1$
-            version = IdeUtils.getDependencyVersion( artifactNames, config.getProject().getArtifacts(), 3 );
-            if ( version != null )
+            if ( IdeUtils.getDependencyVersion( new String[] { "geronimo-servlet_2.4_spec" },
+                                                config.getProject().getDependencies(), 3 ) != null )
+                return "2.4";
+        }
+        if ( version == null )
+        {
+            if ( IdeUtils.getDependencyVersion( new String[] { "geronimo-servlet_2.5_spec" },
+                                                config.getProject().getDependencies(), 3 ) != null )
+                return "2.5";
+        }
+
+        if ( version == null )
+        {
+            // No servlet dependency detected. Try to resolve the servlet
+            // version from J2EE/JEE.
+            String versionJEE = resolveJ2eeVersionWithoutDefault();
+
+            if ( versionJEE != null )
             {
-                String j2eeMinorVersion = StringUtils.substring( version, 2, 3 );
-                version = "2." + j2eeMinorVersion; //$NON-NLS-1$
+                // A J2EE version was found, now determine the servlet
+                // version to be used from it.
+                Map conversionTable = new HashMap();
+                conversionTable.put( "1.3", "2.3" );
+                conversionTable.put( "1.4", "2.4" );
+                conversionTable.put( "5", "2.5" );
+                if ( conversionTable.containsKey( versionJEE ) )
+                {
+                    version = (String) conversionTable.get( versionJEE );
+                }
             }
         }
         return version == null ? "2.4" : version; //$NON-NLS-1$
@@ -252,26 +278,68 @@
 
     protected String resolveEjbVersion()
     {
-        String version = null;
-        // @todo this is the default, find real ejb version from dependencies
+        String[] artifactIds = new String[] { "ejb", "geronimo-spec-ejb" }; //$NON-NLS-1$
+
+        String version = IdeUtils.getDependencyVersion( artifactIds, config.getProject().getDependencies(), 3 );
+
+        // For new Geronimo APIs, the version of the artifact isn't the one of the spec
+        if ( version == null )
+        {
+            if ( IdeUtils.getDependencyVersion( new String[] { "geronimo-ejb_2.1_spec" },
+                                                config.getProject().getDependencies(), 3 ) != null )
+                return "2.1";
+        }
+        if ( version == null )
+        {
+            if ( IdeUtils.getDependencyVersion( new String[] { "geronimo-ejb_3.0_spec" },
+                                                config.getProject().getDependencies(), 3 ) != null )
+                return "3.0";
+        }
+
+        if ( version == null )
+        {
+            // No ejb dependency detected. Try to resolve the ejb
+            // version from J2EE/JEE.
+            String versionJEE = resolveJ2eeVersionWithoutDefault();
 
+            if ( versionJEE != null )
+            {
+                // A J2EE version was found, now determine the ejb
+                // version to be used from it.
+                Map conversionTable = new HashMap();
+                conversionTable.put( "1.3", "2.0" );
+                conversionTable.put( "1.4", "2.1" );
+                conversionTable.put( "5", "3.0" );
+                if ( conversionTable.containsKey( versionJEE ) )
+                {
+                    version = (String) conversionTable.get( versionJEE );
+                }
+            }
+        }
         return version == null ? "2.1" : version; //$NON-NLS-1$
     }
 
     protected String resolveJ2eeVersion()
     {
-        // Take a guess as to what version of J2EE they're using; assume 1.3
-        // See: http://maven.apache.org/guides/mini/guide-coping-with-sun-jars.html
-        String version = "1.3";
-        for ( Iterator it = config.getProject().getDependencies().iterator(); it.hasNext(); )
+        String version = resolveJ2eeVersionWithoutDefault();
+
+        return version == null ? "1.3" : version; //$NON-NLS-1$
+    }
+
+    protected String resolveJ2eeVersionWithoutDefault()
+    {
+        String[] artifactIds = new String[] { "javaee-api", "j2ee", "geronimo-spec-j2ee" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+        String version = IdeUtils.getDependencyVersion( artifactIds, config.getProject().getDependencies(), 3 );
+
+        // For new Geronimo APIs, the version of the artifact isn't the one of the spec
+        if ( version == null )
         {
-            Dependency d = (Dependency) it.next();
-            if ( "javax.j2ee".equals( d.getGroupId() ) && "j2ee".equals( d.getArtifactId() ) )
-            {
-                version = d.getVersion();
-                break;
-            }
+            if ( IdeUtils.getDependencyVersion( new String[] { "geronimo-j2ee_1.4_spec" },
+                                                config.getProject().getDependencies(), 3 ) != null )
+                return "1.4";
         }
+
         return version;
     }
 
@@ -280,7 +348,7 @@
         String version = IdeUtils.getCompilerTargetVersion( config.getProject() );
         if ( version == null )
         {
-            IdeUtils.getCompilerSourceVersion( config.getProject() );
+            version = IdeUtils.getCompilerSourceVersion( config.getProject() );
         }
 
         if ( "1.5".equals( version ) ) //$NON-NLS-1$ //$NON-NLS-2$
@@ -293,7 +361,7 @@
         }
         else if ( version != null && version.length() == 1 )
         {
-            version = version + ".0";// 5->5.0  6->6.0  7->7.0 //$NON-NLS-1$
+            version = version + ".0";// 5->5.0 6->6.0 7->7.0 //$NON-NLS-1$
         }
 
         return version == null ? "1.4" : version; //$NON-NLS-1$

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?view=diff&rev=518715&r1=518714&r2=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java Thu Mar 15 11:13:33 2007
@@ -71,11 +71,6 @@
     private static final String ATTR_PATH = "path"; //$NON-NLS-1$
 
     /**
-     * Used for exported classpath entries.
-     */
-    private static final String ATTR_EXPORTED = "exported"; //$NON-NLS-1$
-
-    /**
      * Attribute for kind - Container (con), Variable (var)..etc.
      */
     private static final String ATTR_KIND = "kind"; //$NON-NLS-1$
@@ -94,11 +89,6 @@
      * Attribute value for kind: src
      */
     private static final String ATTR_SRC = "src"; //$NON-NLS-1$
-
-    /**
-     * Attribute value for kind: src
-     */
-    private static final String ATTR_CON = "con"; //$NON-NLS-1$
 
     /**
      * Attribute name for source file includes in a path.

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java?view=diff&rev=518715&r1=518714&r2=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java Thu Mar 15 11:13:33 2007
@@ -93,16 +93,6 @@
     private boolean osgiBundle;
 
     /**
-     * If this jar is an osgi bundle, this is its Bundle-SymbolicName?
-     */
-    private String osgiSymbolicName;
-
-    /**
-     * Depth of this dependency in the transitive dependency trail.
-     */
-    private int dependencyDepth;
-
-    /**
      * 
      * @param groupId Group id
      * @param artifactId Artifact id
@@ -136,9 +126,6 @@
 
         // needed for OSGI support
         this.osgiBundle = osgiBundle;
-        this.osgiSymbolicName = osgiSymbolicName;
-        this.dependencyDepth = dependencyDepth;
-
         // file and type
         this.file = file;
         this.type = type;

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?view=diff&rev=518715&r1=518714&r2=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java Thu Mar 15 11:13:33 2007
@@ -18,18 +18,13 @@
  */
 package org.apache.maven.plugin.ide;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginExecution;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -38,6 +33,11 @@
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @author <a href="mailto:fgiust@users.sourceforge.net">Fabrizio Giustina</a>
@@ -199,22 +199,22 @@
     /**
      * Extracts the version of the first matching dependency in the given list.
      * 
-     * @param artifactNames artifact names to compare against for extracting version
-     * @param artifacts Collection of dependencies for our project
+     * @param artifactIds artifact names to compare against for extracting version
+     * @param dependencies Collection of dependencies for our project
      * @param len expected length of the version sub-string
      * @return
      */
-    public static String getDependencyVersion( String[] artifactNames, Set artifacts, int len )
+    public static String getDependencyVersion( String[] artifactIds, List dependencies, int len )
     {
-        for ( Iterator itr = artifacts.iterator(); itr.hasNext(); )
+        for ( int j = 0; j < artifactIds.length; j++ )
         {
-            Artifact artifact = (Artifact) itr.next();
-            for ( int j = 0; j < artifactNames.length; j++ )
+            String id = artifactIds[j];
+            for ( Iterator itr = dependencies.iterator(); itr.hasNext(); )
             {
-                String name = artifactNames[j];
-                if ( name.equals( artifact.getArtifactId() ) )
+                Dependency dependency = (Dependency) itr.next();
+                if ( id.equals( dependency.getArtifactId() ) )
                 {
-                    return StringUtils.substring( artifact.getVersion(), 0, len );
+                    return StringUtils.substring( dependency.getVersion(), 0, len );
                 }
             }
         }

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java?view=diff&rev=518715&r1=518714&r2=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java Thu Mar 15 11:13:33 2007
@@ -18,14 +18,13 @@
  */
 package org.apache.maven.plugin.eclipse;
 
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.codehaus.plexus.PlexusTestCase;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Properties;
 
-import org.apache.maven.plugin.Mojo;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.codehaus.plexus.PlexusTestCase;
-
 /**
  * @author Edwin Punzalan
  */
@@ -35,7 +34,6 @@
     public void testMinConfiguration()
         throws Exception
     {
-        Mojo mojo = executeMojo( "min-plugin-config.xml" );
     }
 
     private AddMavenRepoMojo executeMojo( String pomXml )
@@ -45,16 +43,16 @@
 
         mojo.execute();
 
-        File workDir = new File( mojo.getWorkspace(), mojo.DIR_ECLIPSE_CORE_RUNTIME_SETTINGS );
+        File workDir = new File( mojo.getWorkspace(), AddMavenRepoMojo.DIR_ECLIPSE_CORE_RUNTIME_SETTINGS );
 
-        File eclipseJDTCorePrefsFile = new File( workDir, mojo.FILE_ECLIPSE_JDT_CORE_PREFS );
+        File eclipseJDTCorePrefsFile = new File( workDir, AddMavenRepoMojo.FILE_ECLIPSE_JDT_CORE_PREFS );
 
         assertTrue( "Test if workspace properties exists", eclipseJDTCorePrefsFile.exists() );
 
         Properties props = new Properties();
         props.load( new FileInputStream( eclipseJDTCorePrefsFile ) );
 
-        String M2_REPO = props.getProperty( mojo.CLASSPATH_VARIABLE_M2_REPO );
+        String M2_REPO = props.getProperty( AddMavenRepoMojo.CLASSPATH_VARIABLE_M2_REPO );
 
         assertNotNull( "Test M2_REPO has a value", M2_REPO );
 

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?view=diff&rev=518715&r1=518714&r2=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java Thu Mar 15 11:13:33 2007
@@ -25,244 +25,282 @@
  * @author <a href="mailto:fgiust@apache.org">Fabrizio Giustina</a>
  * @version $Id$
  */
-public class EclipsePluginTest
-    extends AbstractEclipsePluginTestCase
+public class EclipsePluginTest extends AbstractEclipsePluginTestCase
 {
-    public void testProject01()
-        throws Exception
+    public void testProject01() throws Exception
     {
         testProject( "project-01" );
     }
 
-    public void testProject02()
-        throws Exception
+    public void testProject02() throws Exception
     {
         testProject( "project-02" );
     }
 
-    public void testProject03()
-        throws Exception
+    public void testProject03() throws Exception
     {
         testProject( "project-03" );
     }
 
-    public void testProject04()
-        throws Exception
+    public void testProject04() throws Exception
     {
         testProject( "project-04" );
     }
 
-    public void testProject05()
-        throws Exception
+    public void testProject05() throws Exception
     {
         testProject( "project-05" );
     }
 
-    public void testProject06()
-        throws Exception
+    public void testProject06() throws Exception
     {
         testProject( "project-06" );
     }
 
     // @todo temporary disabled, since it randomically fails due to a different order for dependencies in classpath and
-    // wtpmodules. This is not a problem, since order could be ignored in this test, but we should rewrite the file-comparing
+    // wtpmodules. This is not a problem, since order could be ignored in this test, but we should rewrite the
+    // file-comparing
     // step which at the moment just does line by line comparison
-    //    public void testProject07()
-    //        throws Exception
-    //    {
-    //        testProject( "project-07" );
-    //    }
+    // public void testProject07()
+    // throws Exception
+    // {
+    // testProject( "project-07" );
+    // }
 
-    public void testProject08()
-        throws Exception
+    public void testProject08() throws Exception
     {
         testProject( "project-08" );
     }
 
     /**
      * Tests with <code>outputDirectory</code> and <code>outputDir</code>
+     * 
      * @throws Exception
      */
-    public void testProject09()
-        throws Exception
+    public void testProject09() throws Exception
     {
         testProject( "project-09" );
     }
 
-    public void testProject10()
-        throws Exception
+    public void testProject10() throws Exception
     {
         testProject( "project-10" );
     }
 
-    public void testProject11()
-        throws Exception
+    public void testProject11() throws Exception
     {
         testProject( "project-11" );
     }
 
     /**
      * Ear packaging
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject12()
-        throws Exception
+    public void testProject12() throws Exception
     {
         testProject( "project-12" );
     }
 
     /**
      * Dependency range - MECLIPSE-96
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject13()
-        throws Exception
+    public void testProject13() throws Exception
     {
         testProject( "project-13" );
     }
 
     /**
      * Additional natures and builders - MECLIPSE-64
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject14()
-        throws Exception
+    public void testProject14() throws Exception
     {
         testProject( "project-14" );
     }
 
     /**
      * <code>outputDirectory</code> parameter - MECLIPSE-11
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject15()
-        throws Exception
+    public void testProject15() throws Exception
     {
         Properties props = new Properties();
         props.put( "outputDirectory", "bin" );
         testProject( "project-15", props, "clean", "eclipse" );
     }
 
-    //Commented out: failing due to MNG-2025
-    //    /**
-    //     * UTF8 encoding - MECLIPSE-56
-    //     * @throws Exception any exception thrown during test
-    //     */
-    //    public void testProject16()
-    //        throws Exception
-    //    {
-    //        testProject( "project-16" );
-    //    }
-
-    //Commented out: failing on Continuum, due to MNG-2025 too?
-    //    /**
-    //     * ISO-8859-15 encoding - MECLIPSE-56
-    //     * @throws Exception any exception thrown during test
-    //     */
-    //    public void testProject17()
-    //        throws Exception
-    //    {
-    //        testProject( "project-17" );
-    //    }
+    // Commented out: failing due to MNG-2025
+    // /**
+    // * UTF8 encoding - MECLIPSE-56
+    // * @throws Exception any exception thrown during test
+    // */
+    // public void testProject16()
+    // throws Exception
+    // {
+    // testProject( "project-16" );
+    // }
+
+    // Commented out: failing on Continuum, due to MNG-2025 too?
+    // /**
+    // * ISO-8859-15 encoding - MECLIPSE-56
+    // * @throws Exception any exception thrown during test
+    // */
+    // public void testProject17()
+    // throws Exception
+    // {
+    // testProject( "project-17" );
+    // }
 
     /**
      * relative location of system dependencies - MECLIPSE-89
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject18()
-        throws Exception
+    public void testProject18() throws Exception
     {
         testProject( "project-18" );
     }
 
     /**
      * Resource targetPath is relative to the project's output directory - MECLIPSE-77
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject19()
-        throws Exception
+    public void testProject19() throws Exception
     {
         testProject( "project-19" );
     }
 
     /**
      * WTP 1.5 changes in wtpmodules.
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject20()
-        throws Exception
+    public void testProject20() throws Exception
     {
         testProject( "project-20" );
     }
 
     /**
      * PDE support.
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject21()
-        throws Exception
+    public void testProject21() throws Exception
     {
         testProject( "project-21" );
     }
 
     /**
      * PDE support using eclipse-plugin packaging.
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject22()
-        throws Exception
+    public void testProject22() throws Exception
     {
         testProject( "project-22" );
     }
 
     /**
      * Additional config files using "additionalConfig" property.
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject23()
-        throws Exception
+    public void testProject23() throws Exception
     {
         testProject( "project-23" );
     }
 
     /**
      * Test rewriting of OSGI manifest files.
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject24()
-        throws Exception
+    public void testProject24() throws Exception
     {
         testProject( "project-24" );
     }
 
     /**
      * Test source exclude/include.
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject25()
-        throws Exception
+    public void testProject25() throws Exception
     {
         testProject( "project-25" );
     }
 
     /**
      * Test different compiler settings for test sources.
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject26()
-        throws Exception
+    public void testProject26() throws Exception
     {
         testProject( "project-26" );
     }
-    
+
     /**
      * Test additional project facets specified.
-     * @throws Exception any exception thrown during test
+     * 
+     * @throws Exception
+     *             any exception thrown during test
      */
-    public void testProject27()
-        throws Exception
+    public void testProject27() throws Exception
     {
         testProject( "project-27" );
+    }
+
+    /**
+     * MECLIPSE-241 : Compiler settings from parent project aren't used in wtp facet.
+     * 
+     * @throws Exception
+     *             any exception thrown during test
+     */
+    public void testProject28() throws Exception
+    {
+        testProject( "project-28/module-1" );
+    }
+
+    /**
+     * MECLIPSE-198 : EJB version is not resloved
+     * 
+     * @throws Exception
+     *             any exception thrown during test
+     */
+    public void testProject29() throws Exception
+    {
+        testProject( "project-29" );
+    }
+
+    /**
+     * MECLIPSE-108 : .wtpmodules with version 2.4 for javax.servlet:servlet-api:2.3
+     * 
+     * @throws Exception
+     *             any exception thrown during test
+     */
+    public void testProject30() throws Exception
+    {
+        testProject( "project-30" );
     }
 
 }

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 15 11:13:33 2007
@@ -0,0 +1 @@
+target

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.classpath?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.classpath Thu Mar 15 11:13:33 2007
@@ -0,0 +1,5 @@
+<classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.classpath
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.classpath
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.project?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.project Thu Mar 15 11:13:33 2007
@@ -0,0 +1,22 @@
+<projectDescription>
+  <name>war-test</name>
+  <comment/>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.common.project.facet.core.builder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.validation.validationbuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+  </natures>
+</projectDescription>

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.project
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.project
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.component?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.component (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.component Thu Mar 15 11:13:33 2007
@@ -0,0 +1,8 @@
+<project-modules id="moduleCoreId" project-version="1.5.0">
+  <wb-module deploy-name="war-test">
+    <property name="context-root" value="war-test"/>
+    <wb-resource deploy-path="/" source-path="src/main/webapp"/>
+    <property name="java-output-path" value="/target/classes"/>
+    <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
+  </wb-module>
+</project-modules>
\ No newline at end of file

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml Thu Mar 15 11:13:33 2007
@@ -0,0 +1,6 @@
+<faceted-project>
+  <fixed facet="jst.java"/>
+  <fixed facet="jst.web"/>
+  <installed facet="jst.web" version="2.4"/>
+  <installed facet="jst.java" version="5.0"/>
+</faceted-project>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml Thu Mar 15 11:13:33 2007
@@ -0,0 +1,26 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>eclipse.project28</groupId>
+    <artifactId>master-test</artifactId>
+    <version>1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>eclipse.project28</groupId>
+  <artifactId>war-test</artifactId>
+  <version>28</version>
+  <packaging>war</packaging>
+  <name>War Project</name>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <wtpversion>1.5</wtpversion>
+        </configuration>
+      </plugin>
+    </plugins>    
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/src/main/java/DummyClass.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/src/main/java/DummyClass.txt?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/src/main/java/DummyClass.txt (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/src/main/java/DummyClass.txt Thu Mar 15 11:13:33 2007
@@ -0,0 +1,7 @@
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
+ * @version $Id$
+ */
+public class DummyClass
+{
+}

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml Thu Mar 15 11:13:33 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>pom</packaging>
+  <groupId>eclipse.project28</groupId>
+  <artifactId>master-test</artifactId>
+  <version>1.0</version>
+  <name>Master project</name>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>test</version>
+      </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+          </configuration>
+        </plugin>
+    </plugins>    
+  </build>
+  <modules>
+    <module>module-1</module>
+  </modules>
+</project>

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 15 11:13:33 2007
@@ -0,0 +1 @@
+target

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.classpath?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.classpath Thu Mar 15 11:13:33 2007
@@ -0,0 +1,6 @@
+<classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0/geronimo-ejb_3.0_spec-1.0.jar"/>
+</classpath>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.classpath
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.classpath
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.project?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.project Thu Mar 15 11:13:33 2007
@@ -0,0 +1,22 @@
+<projectDescription>
+  <name>maven-eclipse-plugin-test-project-30</name>
+  <comment/>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.common.project.facet.core.builder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.validation.validationbuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.project
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.project
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.component?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.component (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.component Thu Mar 15 11:13:33 2007
@@ -0,0 +1,5 @@
+<project-modules id="moduleCoreId" project-version="1.5.0">
+  <wb-module deploy-name="maven-eclipse-plugin-test-project-30">
+    <wb-resource deploy-path="/" source-path="src/main/java"/>
+  </wb-module>
+</project-modules>
\ No newline at end of file

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.project.facet.core.xml Thu Mar 15 11:13:33 2007
@@ -0,0 +1,6 @@
+<faceted-project>
+  <fixed facet="jst.java"/>
+  <fixed facet="jst.ejb"/>
+  <installed facet="jst.ejb" version="3.0"/>
+  <installed facet="jst.java" version="1.4"/>
+</faceted-project>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml Thu Mar 15 11:13:33 2007
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>ejb</packaging>
+  <groupId>eclipse</groupId>
+  <artifactId>maven-eclipse-plugin-test-project-30</artifactId>
+  <version>99.0</version>
+  <name>Maven</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-ejb_3.0_spec</artifactId>
+      <version>1.0</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+<!--        <version>test</version>-->
+        <configuration>
+          <wtpversion>1.5</wtpversion>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/src/main/java/DummyClass.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/src/main/java/DummyClass.txt?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/src/main/java/DummyClass.txt (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/src/main/java/DummyClass.txt Thu Mar 15 11:13:33 2007
@@ -0,0 +1,7 @@
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
+ * @version $Id$
+ */
+public class DummyClass
+{
+}

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 15 11:13:33 2007
@@ -0,0 +1 @@
+target

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath Thu Mar 15 11:13:33 2007
@@ -0,0 +1,5 @@
+<classpath>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+</classpath>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.project?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.project Thu Mar 15 11:13:33 2007
@@ -0,0 +1,24 @@
+<projectDescription>
+  <name>maven-eclipse-plugin-test-project-30</name>
+  <comment/>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.wst.common.modulecore.ComponentStructuralBuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.validation.validationbuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.project
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.project
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.wtpmodules
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.wtpmodules?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.wtpmodules (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.wtpmodules Thu Mar 15 11:13:33 2007
@@ -0,0 +1,9 @@
+<project-modules id="moduleCoreId">
+  <wb-module deploy-name="maven-eclipse-plugin-test-project-30">
+    <module-type module-type-id="jst.web">
+      <version>2.3</version>
+      <property name="context-root" value="maven-eclipse-plugin-test-project-30"/>
+    </module-type>
+    <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+  </wb-module>
+</project-modules>
\ No newline at end of file

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml?view=auto&rev=518715
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml Thu Mar 15 11:13:33 2007
@@ -0,0 +1,30 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>eclipse</groupId>
+  <artifactId>maven-eclipse-plugin-test-project-30</artifactId>
+  <version>30</version>
+  <packaging>war</packaging>
+  <name>maven-eclipse-plugin-test-project-30</name>
+  <dependencies>
+    <!-- Servlet API (2.3)-->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>test</version>
+        <configuration>
+          <wtpversion>R7</wtpversion>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"