You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2010/04/14 23:50:25 UTC

svn commit: r934209 [1/2] - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/writers/ test/java/org/apache/maven/plugin/eclipse/it/ test/resources/eclipse/dynamicWork...

Author: fgiust
Date: Wed Apr 14 21:50:23 2010
New Revision: 934209

URL: http://svn.apache.org/viewvc?rev=934209&view=rev
Log:
MECLIPSE-548 Classpath container entries should come before 3rd party jars in .classpath - reverting the path that swapped the order in the past and added a new property to switch to the non-standard behaviour if needed. All the tests results have been updated and chacked after the change.

Added:
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.project
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.settings/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.settings/org.eclipse.jdt.core.prefs
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/pom.xml   (with props)
Removed:
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/.project
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/.project
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/writers/EclipseClasspathWriter.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
    maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-01/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-06/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-08/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-09/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-31/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-38/child/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-a/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-45/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-48/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-53-MECLIPSE-551/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-56-MECLIPSE-603/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-01/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-02/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-03/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-04/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-05/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-06/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-07/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-08/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-09/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-10-MECLIPSE-538/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-11-MECLIPSE-104/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-4/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/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=934209&r1=934208&r2=934209&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 Wed Apr 14 21:50:23 2010
@@ -550,6 +550,15 @@ public class EclipsePlugin
      * @parameter
      */
     private List linkedResources;
+    
+    /**
+     * Put classpath container entries last in eclipse classpath configuration. Note that this behaviour, although
+     * useful in situations were you want to override resources found in classpath containers, will made JRE classes
+     * loaded after 3rd party jars, so enabling it is not suggested.
+     * 
+     * @parameter expression="${eclipse.classpathContainersLast}" default-value="false"
+     */
+    protected boolean classpathContainersLast;
 
     protected final boolean isJavaProject()
     {
@@ -1290,6 +1299,7 @@ public class EclipsePlugin
         config.setAddVersionToProjectName( isAddVersionToProjectName() );
         config.setPackaging( packaging );
         config.setLinkedResources( linkedResources );
+        config.setClasspathContainersLast( classpathContainersLast );
 
         collectWarContextRootsFromReactorEarConfiguration( config );
 

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?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- 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 Wed Apr 14 21:50:23 2010
@@ -368,6 +368,12 @@ public class EclipseClasspathWriter
                 }
             }
         }
+        
+
+        if (!config.isClasspathContainersLast())
+        {
+            writeClasspathContainers(writer);
+        }
 
         // ----------------------------------------------------------------------
         // The dependencies
@@ -388,6 +394,22 @@ public class EclipseClasspathWriter
             }
         }
 
+        if (config.isClasspathContainersLast())
+        {
+            writeClasspathContainers(writer);
+        }
+        
+        writer.endElement();
+
+        IOUtil.close( w );
+
+    }
+
+    /**
+     * @param writer
+     */
+    private void writeClasspathContainers(XMLWriter writer)
+    {
         // ----------------------------------------------------------------------
         // Container classpath entries
         // ----------------------------------------------------------------------
@@ -399,11 +421,6 @@ public class EclipseClasspathWriter
             writer.addAttribute( ATTR_PATH, (String) it.next() );
             writer.endElement(); // name
         }
-
-        writer.endElement();
-
-        IOUtil.close( w );
-
     }
 
     private String getDependencyId( IdeDependency dep )

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java Wed Apr 14 21:50:23 2010
@@ -150,6 +150,11 @@ public class EclipseWriterConfig
     private WorkspaceConfiguration workspaceConfiguration;
 
     private List linkedResources;
+    
+    /**
+     * @See {@link EclipsePlugin#classpathContainersLast}
+     */
+    private boolean classpathContainersLast;
 
     public WorkspaceConfiguration getWorkspaceConfiguration()
     {
@@ -623,4 +628,24 @@ public class EclipseWriterConfig
         this.linkedResources = linkedResources;
     }
 
+    
+    /**
+     * Returns the classpathContainersLast.
+     * @return the classpathContainersLast
+     */
+    public boolean isClasspathContainersLast()
+    {
+        return classpathContainersLast;
+    }
+
+    
+    /**
+     * Sets the classpathContainersLast.
+     * @param classpathContainersLast the classpathContainersLast to set
+     */
+    public void setClasspathContainersLast(boolean classpathContainersLast)
+    {
+        this.classpathContainersLast = classpathContainersLast;
+    }
+
 }

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java Wed Apr 14 21:50:23 2010
@@ -715,6 +715,17 @@ public class EclipsePluginIT
         testProject( "project-60-MECLIPSE-652" );
     }
 
+    /**
+     * [MECLIPSE-548] Classpath container entries should come before 3rd party jars in .classpath
+     * 
+     * @throws Exception
+     */
+    public void testProject61()
+        throws Exception
+    {
+        testProject( "project-61-MECLIPSE-548" );
+    }
+
     public void testJeeSimple()
         throws Exception
     {

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,8 +1,8 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="src" path="/module-A1"/>
   <classpathentry kind="var" path="M2_REPO/eclipse/module-A2/1/module-A2-1.jar"/>
   <classpathentry kind="src" path="/project-O"/>
-  <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/j2ee-simple/primary-source/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -2,8 +2,8 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="target/generated-resources/eclipse"/>
   <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-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
   <classpathentry kind="src" path="/logging-1.0-SNAPSHOT"/>
-  <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/j2ee-simple/projects/logging/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,6 +1,6 @@
 <classpath>
   <classpathentry kind="src" path="target/generated-resources/eclipse"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,7 +1,7 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
   <classpathentry kind="src" path="/logging-1.0-SNAPSHOT"/>
   <classpathentry kind="src" path="/primary-source-1.0-SNAPSHOT"/>
-  <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-01/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-01/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-01/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-01/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,6 +1,6 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -4,6 +4,6 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -3,6 +3,6 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" including="**/*.xml" excluding="**/*.properties|**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -4,6 +4,6 @@
   <classpathentry kind="src" path="src-main-java" including="**/*.java"/>
   <classpathentry kind="src" path="src-main-resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,8 +1,8 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5"/>
   <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container/wtptest"/>
+  <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-06/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-06/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-06/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-06/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,6 +1,6 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,6 +1,6 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0-tests.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-test-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
-  <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-08/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-08/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-08/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-08/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,5 +1,5 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="lib" path="sysdep.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="lib" path="sysdep.jar"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-09/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-09/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-09/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-09/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -4,6 +4,6 @@
   <classpathentry kind="src" path="src-main-java" including="**/*.java"/>
   <classpathentry kind="src" path="src-main-resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/eclipse-classes"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,10 +1,10 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.0/junit-3.0.jar">
     <attributes>
       <attribute value="jar:file:${M2_REPO}/junit/junit/3.0/junit-3.0-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,5 +1,5 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,5 +1,5 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="lib" path="${basedir}/target/test-classes/projects/project-18/sysdep.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="lib" path="${basedir}/target/test-classes/projects/project-18/sysdep.jar"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,6 +1,6 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="lib" path="junit-3.8.1.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+  <classpathentry kind="lib" path="junit-3.8.1.jar"/>
 </classpath>
\ No newline at end of file

Modified: 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?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,6 +1,6 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <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"/>
   <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

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-31/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-31/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-31/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-31/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,5 +1,5 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/some/junk/group/servlet-api/2.3/servlet-api-2.3.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/some/junk/group/servlet-api/2.3/servlet-api-2.3.jar"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,6 +1,6 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0-tests.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-test-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
-  <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-34/multymodule-1/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -2,6 +2,7 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="target/generated-resources/eclipse"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
   <classpathentry kind="src" path="/multymodule-4-1.0"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
@@ -9,5 +10,4 @@
   <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-provided/1.0/refproject-provided-1.0.jar"/>
   <classpathentry kind="lib" path="refproject-sysdep.jar"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-test/1.0/refproject-test-1.0.jar"/>
-  <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-34/multymodule-2/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,6 +1,7 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar">
     <attributes>
       <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
@@ -32,5 +33,4 @@
     </attributes>
   </classpathentry>
   <classpathentry kind="lib" path="${basedir}/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar"/>
-  <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-34/multymodule-4/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -2,7 +2,7 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="target/generated-resources/eclipse"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
-  <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-35/multymodule-war/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,5 +1,6 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar">
     <attributes>
       <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
@@ -10,5 +11,4 @@
       <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
     </attributes>
   </classpathentry>
-  <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-36/my-ejb/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -4,7 +4,7 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.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"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
-  <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-38/child/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-38/child/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-38/child/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-38/child/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,5 +1,5 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
+</classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,7 +1,7 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar"/>
   <classpathentry kind="src" path="/direct-compile"/>
-  <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-39-b/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,7 +1,7 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.3"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar"/>
   <classpathentry kind="src" path="/direct-compile"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.3"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,7 +1,7 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.3"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar"/>
   <classpathentry kind="src" path="/direct-compile"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.3"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-a/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-a/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-a/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-a/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,7 +1,7 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.3.1"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar"/>
   <classpathentry kind="src" path="/direct-compile"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.3.1"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,7 +1,7 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.3.1"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar"/>
   <classpathentry kind="src" path="/direct-compile"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.3.1"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,7 +1,7 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar"/>
   <classpathentry kind="src" path="/direct-compile"/>
-  <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-45/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-45/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-45/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-45/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,10 +1,10 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.4/ezmorph-1.0.4.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.4/ezmorph-1.0.4-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/net/sf/json-lib/json-lib/2.2/json-lib-2.2-jdk15.jar" sourcepath="M2_REPO/net/sf/json-lib/json-lib/2.2/json-lib-2.2-jdk15-sources.jar"/>
-  <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-46/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -4,6 +4,6 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/biz/aQute/bndlib/0.0.145/bndlib-0.0.145.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/biz/aQute/bndlib/0.0.145/bndlib-0.0.145.jar"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -4,11 +4,11 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/1.0/commons-lang-1.0.jar">
     <attributes>
       <attribute value="jar:file:${M2_REPO}/commons-lang/commons-lang/1.0/commons-lang-1.0-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.7/junit-3.7.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-48/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-48/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-48/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-48/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -4,6 +4,6 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/does-not-exist/does-not-exist/666/does-not-exist-666.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/does-not-exist/does-not-exist/666/does-not-exist-666.jar"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -4,10 +4,10 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar">
     <attributes>
       <attribute value="jar:file:${M2_REPO}/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <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-50-MECLIPSE-415/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,5 +1,5 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="src" path="/module-A1"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+  <classpathentry kind="src" path="/module-A1"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -2,6 +2,7 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="target/generated-resources/eclipse"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
   <classpathentry kind="src" path="/multymodule-4-1.0"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
@@ -9,5 +10,4 @@
   <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-provided/1.0/refproject-provided-1.0.jar"/>
   <classpathentry kind="lib" path="refproject-sysdep.jar"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-test/1.0/refproject-test-1.0.jar"/>
-  <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-51-MECLIPSE-415/multymodule-2/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,36 +1,36 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar">
-    <attributes>
-      <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar">
-    <attributes>
-      <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar">
-    <attributes>
-      <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-optional/1.0/direct-optional-1.0.jar">
-    <attributes>
-      <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-provided/1.0/direct-provided-1.0.jar"/>
-  <classpathentry kind="lib" path="direct-sysdep.jar"/>
-  <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-test/1.0/direct-test-1.0.jar"/>
-  <classpathentry kind="src" path="/prefix-multymodule-1-1.0"/>
-  <classpathentry kind="src" path="/multymodule-4-1.0"/>
-  <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar">
-    <attributes>
-      <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="lib" path="${basedir}/target/test-classes/projects/project-51-MECLIPSE-415/multymodule-1/refproject-sysdep.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+<classpath>
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar">
+    <attributes>
+      <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar">
+    <attributes>
+      <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar">
+    <attributes>
+      <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-optional/1.0/direct-optional-1.0.jar">
+    <attributes>
+      <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-provided/1.0/direct-provided-1.0.jar"/>
+  <classpathentry kind="lib" path="direct-sysdep.jar"/>
+  <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-test/1.0/direct-test-1.0.jar"/>
+  <classpathentry kind="src" path="/prefix-multymodule-1-1.0"/>
+  <classpathentry kind="src" path="/multymodule-4-1.0"/>
+  <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar">
+    <attributes>
+      <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="lib" path="/data/apps/maven/maven-trunks/plugins/maven-eclipse-plugin/target/test-classes/projects/project-51-MECLIPSE-415/multymodule-1/refproject-sysdep.jar"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,8 +1,8 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
-  <classpathentry kind="src" path="target/generated-resources/eclipse"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+<classpath>
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+  <classpathentry kind="src" path="target/generated-resources/eclipse"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-53-MECLIPSE-551/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-53-MECLIPSE-551/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-53-MECLIPSE-551/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-53-MECLIPSE-551/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -3,6 +3,7 @@
   <classpathentry kind="src" path="src/main/java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1.4/jetty-6.1.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-management/6.1.4/jetty-management-6.1.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1.4/jetty-util-6.1.4.jar"/>
@@ -14,5 +15,4 @@
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/wicket/wicket/1.4-rc4/wicket-1.4-rc4.jar"/>
-  <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-56-MECLIPSE-603/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-56-MECLIPSE-603/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-56-MECLIPSE-603/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-56-MECLIPSE-603/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -3,6 +3,7 @@
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
@@ -10,5 +11,4 @@
   <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
+</classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,6 +1,6 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.15/log4j-1.2.15.jar"/>
-  <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-58-MECLIPSE-621/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,8 +1,8 @@
 <classpath>
   <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
-  <classpathentry kind="src" path="src/main/resources" including="**/*.properties" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java|**/*.properties"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
 </classpath>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -3,6 +3,6 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
 </classpath>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Apr 14 21:50:23 2010
@@ -0,0 +1,3 @@
+.settings
+.classpath
+.project

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.classpath?rev=934209&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -0,0 +1,5 @@
+<classpath>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.project?rev=934209&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.project Wed Apr 14 21:50:23 2010
@@ -0,0 +1,13 @@
+<projectDescription>
+  <name>maven-eclipse-plugin-test-project-60</name>
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.settings/org.eclipse.jdt.core.prefs?rev=934209&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.settings/org.eclipse.jdt.core.prefs (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/expected/.settings/org.eclipse.jdt.core.prefs Wed Apr 14 21:50:23 2010
@@ -0,0 +1,5 @@
+#Sun Apr 11 17:54:06 CEST 2010
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/pom.xml?rev=934209&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/pom.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/pom.xml Wed Apr 14 21:50:23 2010
@@ -0,0 +1,38 @@
+<?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>jar</packaging>
+  <groupId>eclipse</groupId>
+  <artifactId>maven-eclipse-plugin-test-project-60</artifactId>
+  <version>99.0</version>
+  <name>Maven</name>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0</version>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>test</version>
+        <configuration>
+          <classpathContainersLast>true</classpathContainersLast>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.14</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

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

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

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-61-MECLIPSE-548/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-01/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-01/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-01/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-01/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,5 +1,7 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
@@ -10,6 +12,4 @@
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-02/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-02/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-02/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-02/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,5 +1,7 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
@@ -10,6 +12,4 @@
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-03/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-03/expected/.classpath?rev=934209&r1=934208&r2=934209&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-03/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-03/expected/.classpath Wed Apr 14 21:50:23 2010
@@ -1,5 +1,7 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
@@ -11,6 +13,4 @@
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 </classpath>