You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/08/26 23:10:17 UTC
svn commit: r689226 - in /maven/plugins/trunk/maven-eclipse-plugin: ./
src/main/java/org/apache/maven/plugin/eclipse/
src/main/java/org/apache/maven/plugin/ide/
src/test/java/org/apache/maven/plugin/eclipse/
src/test/resources/projects/project-02/expec...
Author: bentmann
Date: Tue Aug 26 14:10:17 2008
New Revision: 689226
URL: http://svn.apache.org/viewvc?rev=689226&view=rev
Log:
[MECLIPSE-318] test classes and resources need to be first in .classpath file
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
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/ide/AbstractIdeSupportMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java
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-09/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-25/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-04/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=689226&r1=689225&r2=689226&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Tue Aug 26 14:10:17 2008
@@ -84,6 +84,11 @@
<version>2.0.8</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.5.6</version>
@@ -196,6 +201,25 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>require-maven-2.0.9</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <!-- The tests check file encoding and class path ordering which depends on fixes in latest Maven -->
+ <version>[2.0.9,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
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=689226&r1=689225&r2=689226&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Tue Aug 26 14:10:17 2008
@@ -32,7 +32,6 @@
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
-import java.util.TreeSet;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
@@ -1274,15 +1273,7 @@
{
File projectBaseDir = project.getFile().getParentFile();
- // avoid duplicated entries
- Set directories = new TreeSet();
-
- extractSourceDirs( directories, project.getCompileSourceRoots(), basedir, projectBaseDir, false, null );
-
- String relativeOutput = IdeUtils.toRelativeAndFixSeparator( projectBaseDir, buildOutputDirectory, false );
-
- extractResourceDirs( directories, project.getBuild().getResources(), project, basedir, projectBaseDir, false,
- relativeOutput );
+ String mainOutput = IdeUtils.toRelativeAndFixSeparator( projectBaseDir, buildOutputDirectory, false );
// If using the standard output location, don't mix the test output into it.
String testOutput = null;
@@ -1291,18 +1282,46 @@
if ( useStandardOutputDir )
{
getLog().debug(
- "testOutput toRelativeAndFixSeparator " + projectBaseDir + " , " +
- project.getBuild().getTestOutputDirectory() );
+ "testOutput toRelativeAndFixSeparator " + projectBaseDir + " , "
+ + project.getBuild().getTestOutputDirectory() );
testOutput =
IdeUtils.toRelativeAndFixSeparator( projectBaseDir,
new File( project.getBuild().getTestOutputDirectory() ), false );
getLog().debug( "testOutput after toRelative : " + testOutput );
}
- extractSourceDirs( directories, project.getTestCompileSourceRoots(), basedir, projectBaseDir, true, testOutput );
+ Set mainDirectories = new LinkedHashSet();
+
+ extractSourceDirs( mainDirectories, project.getCompileSourceRoots(), basedir, projectBaseDir, false, null );
+
+ extractResourceDirs( mainDirectories, project.getBuild().getResources(), project, basedir, projectBaseDir,
+ false, mainOutput );
+
+ Set testDirectories = new LinkedHashSet();
+
+ extractSourceDirs( testDirectories, project.getTestCompileSourceRoots(), basedir, projectBaseDir, true,
+ testOutput );
+
+ extractResourceDirs( testDirectories, project.getBuild().getTestResources(), project, basedir,
+ projectBaseDir, true, testOutput );
- extractResourceDirs( directories, project.getBuild().getTestResources(), project, basedir, projectBaseDir,
- true, testOutput );
+ // avoid duplicated entries
+ Set directories = new LinkedHashSet();
+
+ // NOTE: Since MNG-3118, test classes come before main classes
+ boolean testBeforeMain = isMavenVersion( "[2.0.8,)" );
+
+ if ( testBeforeMain )
+ {
+ directories.addAll( testDirectories );
+ directories.removeAll( mainDirectories );
+ directories.addAll( mainDirectories );
+ }
+ else
+ {
+ directories.addAll( mainDirectories );
+ directories.addAll( testDirectories );
+ }
return (EclipseSourceDir[]) directories.toArray( new EclipseSourceDir[directories.size()] );
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?rev=689226&r1=689225&r2=689226&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java Tue Aug 26 14:10:17 2008
@@ -52,8 +52,10 @@
import org.apache.maven.artifact.resolver.WarningResolutionListener;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
+import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
@@ -145,6 +147,13 @@
protected ArtifactMetadataSource artifactMetadataSource;
/**
+ * The runtime information for Maven, used to retrieve Maven's version number.
+ *
+ * @component
+ */
+ private RuntimeInformation runtimeInformation;
+
+ /**
* Remote repositories which will be searched for source attachments.
*
* @parameter expression="${project.remoteArtifactRepositories}"
@@ -376,7 +385,7 @@
/**
* Setter for <code>downloadJavadocs</code>.
*
- * @param downloadJavadocs The downloadJavadocs to set.
+ * @param downloadJavadoc The downloadJavadocs to set.
*/
public void setDownloadJavadocs( boolean downloadJavadoc )
{
@@ -1095,4 +1104,26 @@
{
return getUseProjectReferences() && isAvailableAsAReactorProject( art );
}
+
+ /**
+ * Checks whether the currently running Maven satisfies the specified version (range).
+ *
+ * @param version The version range to test for, must not be <code>null</code>.
+ * @return <code>true</code> if the current Maven version matches the specified version range, <code>false</code>
+ * otherwise.
+ */
+ protected boolean isMavenVersion( String version )
+ {
+ try
+ {
+ VersionRange versionRange = VersionRange.createFromVersionSpec( version );
+ ArtifactVersion mavenVersion = runtimeInformation.getApplicationVersion();
+ return versionRange.containsVersion( mavenVersion );
+ }
+ catch ( InvalidVersionSpecificationException e )
+ {
+ throw new IllegalArgumentException( e.getMessage() );
+ }
+ }
+
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java?rev=689226&r1=689225&r2=689226&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java Tue Aug 26 14:10:17 2008
@@ -20,16 +20,18 @@
import java.io.File;
import java.io.IOException;
+import java.lang.reflect.Field;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Set;
import junit.framework.TestCase;
+import org.apache.maven.execution.DefaultRuntimeInformation;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.ide.AbstractIdeSupportMojo;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.tools.easymock.TestFileManager;
@@ -45,8 +47,20 @@
fileManager.cleanUp();
}
+ private EclipsePlugin newMojo()
+ throws Exception
+ {
+ EclipsePlugin mojo = new EclipsePlugin();
+ DefaultRuntimeInformation rti = new DefaultRuntimeInformation();
+ rti.initialize();
+ Field field = AbstractIdeSupportMojo.class.getDeclaredField( "runtimeInformation" );
+ field.setAccessible( true );
+ field.set( mojo, rti );
+ return mojo;
+ }
+
public void testBuildDirectoryList_ShouldUseTestOutputDirFromProjectWhenBuildOutputDirIsStandard()
- throws MojoExecutionException
+ throws Exception
{
File basedir = fileManager.createTempDir();
@@ -74,7 +88,7 @@
project.setFile( pom );
EclipseSourceDir[] result =
- new EclipsePlugin().buildDirectoryList( project, basedir, new File( "target/classes" ) );
+ newMojo().buildDirectoryList( project, basedir, new File( "target/classes" ) );
assertEquals( "should have added 1 resource.", 1, result.length );
@@ -84,7 +98,7 @@
}
public void testExtractResourceDirs_ShouldUseResourceOutput()
- throws MojoExecutionException
+ throws Exception
{
File basedir = fileManager.createTempDir();
@@ -109,7 +123,7 @@
Set result = new LinkedHashSet();
- EclipsePlugin plugin = new EclipsePlugin();
+ EclipsePlugin plugin = newMojo();
plugin.extractResourceDirs( result, project.getBuild().getResources(), project, basedir, basedir, false,
"target/classes" );
@@ -127,7 +141,7 @@
}
public void testExtractResourceDirs_ShouldUseSpecifiedOutputDirectory()
- throws MojoExecutionException
+ throws Exception
{
File basedir = fileManager.createTempDir();
@@ -151,7 +165,7 @@
Set result = new LinkedHashSet();
- EclipsePlugin plugin = new EclipsePlugin();
+ EclipsePlugin plugin = newMojo();
plugin.extractResourceDirs( result, project.getBuild().getTestResources(), project, basedir, basedir, false,
resOutput );
@@ -166,7 +180,7 @@
}
public void testExtractResourceDirs_ShouldIncludeMainAndTestResources()
- throws MojoExecutionException
+ throws Exception
{
File basedir = fileManager.createTempDir();
@@ -174,7 +188,7 @@
}
public void testExtractResourceDirs_ShouldIncludeMainAndTestResourcesWhenBaseDirsDiffer()
- throws MojoExecutionException
+ throws Exception
{
File basedir = fileManager.createTempDir();
File projectBasedir = fileManager.createTempDir();
@@ -183,7 +197,7 @@
}
private void runResourceExtractionTest( File basedir, File workspaceProjectBasedir )
- throws MojoExecutionException
+ throws Exception
{
Build build = new Build();
@@ -210,7 +224,7 @@
Set result = new LinkedHashSet();
- EclipsePlugin plugin = new EclipsePlugin();
+ EclipsePlugin plugin = newMojo();
plugin.extractResourceDirs( result, project.getBuild().getResources(), project, basedir,
workspaceProjectBasedir, false, "target/classes" );
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=689226&r1=689225&r2=689226&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 Tue Aug 26 14:10:17 2008
@@ -1,8 +1,8 @@
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
<classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <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/junit/junit/2.0/junit-2.0.jar"/>
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=689226&r1=689225&r2=689226&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 Tue Aug 26 14:10:17 2008
@@ -1,7 +1,7 @@
<classpath>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-output-dir" including="**/*.properties" excluding="**/*.xml|**/*.java"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources" including="**/*.xml" excluding="**/*.properties|**/*.java"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-output-dir" including="**/*.properties" excluding="**/*.xml|**/*.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/2.0/junit-2.0.jar"/>
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=689226&r1=689225&r2=689226&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 Tue Aug 26 14:10:17 2008
@@ -1,8 +1,8 @@
<classpath>
- <classpathentry kind="src" path="src-main-java"/>
- <classpathentry kind="src" path="src-main-resources" excluding="**/*.java"/>
<classpathentry kind="src" path="src-test-java" output="target/test-classes-dir"/>
<classpathentry kind="src" path="src-test-resources" output="target/test-classes-dir" excluding="**/*.java"/>
+ <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/junit/junit/2.0/junit-2.0.jar"/>
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=689226&r1=689225&r2=689226&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 Tue Aug 26 14:10:17 2008
@@ -1,8 +1,8 @@
<classpath>
- <classpathentry kind="src" path="src-main-java"/>
- <classpathentry kind="src" path="src-main-resources" excluding="**/*.java"/>
<classpathentry kind="src" path="src-test-java"/>
<classpathentry kind="src" path="src-test-resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src-main-java"/>
+ <classpathentry kind="src" path="src-main-resources" excluding="**/*.java"/>
<classpathentry kind="output" path="target/eclipse-classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-25/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-25/expected/.classpath?rev=689226&r1=689225&r2=689226&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-25/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-25/expected/.classpath Tue Aug 26 14:10:17 2008
@@ -1,6 +1,6 @@
<classpath>
- <classpathentry kind="src" path="." including="plugin.*|*.bmp|icons/*.*" excluding="**/*.java"/>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="." including="plugin.*|*.bmp|icons/*.*" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath?rev=689226&r1=689225&r2=689226&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath Tue Aug 26 14:10:17 2008
@@ -1,8 +1,8 @@
<classpath>
- <classpathentry kind="src" path="src/main/java" output="/src/main/webapp/WEB-INF/classes"/>
- <classpathentry kind="src" path="src/main/resources" output="/src/main/webapp/WEB-INF/classes" excluding="**/*.java"/>
<classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" output="/src/main/webapp/WEB-INF/classes"/>
+ <classpathentry kind="src" path="src/main/resources" output="/src/main/webapp/WEB-INF/classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE13_CONTAINER"/>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/expected/.classpath?rev=689226&r1=689225&r2=689226&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/expected/.classpath Tue Aug 26 14:10:17 2008
@@ -1,8 +1,8 @@
<classpath>
- <classpathentry kind="src" path="src/main/java" output="/src/main/webapp/WEB-INF/classes"/>
- <classpathentry kind="src" path="src/main/resources" output="/src/main/webapp/WEB-INF/classes" excluding="**/*.java"/>
<classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" output="/src/main/webapp/WEB-INF/classes"/>
+ <classpathentry kind="src" path="src/main/resources" output="/src/main/webapp/WEB-INF/classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/expected/.classpath?rev=689226&r1=689225&r2=689226&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/expected/.classpath Tue Aug 26 14:10:17 2008
@@ -1,8 +1,8 @@
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
<classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <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"/>
</classpath>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-04/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-04/expected/.classpath?rev=689226&r1=689225&r2=689226&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-04/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-04/expected/.classpath Tue Aug 26 14:10:17 2008
@@ -1,8 +1,8 @@
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
<classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <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"/>
</classpath>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath?rev=689226&r1=689225&r2=689226&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath Tue Aug 26 14:10:17 2008
@@ -1,8 +1,8 @@
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
<classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <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"/>
</classpath>
\ No newline at end of file