You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/08/26 10:05:52 UTC
svn commit: r240187 - in
/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java
test/projects/project-4/project
Author: brett
Date: Fri Aug 26 01:05:47 2005
New Revision: 240187
URL: http://svn.apache.org/viewcvs?rev=240187&view=rev
Log:
make the ordering predictable by sorting the key set.
Switched the key to be the simpler eclipse source root link name.
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project
Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java?rev=240187&r1=240186&r2=240187&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java (original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java Fri Aug 26 01:05:47 2005
@@ -32,7 +32,9 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -357,9 +359,11 @@
if ( new File( sourceRoot ).isDirectory() )
{
+ String eclipseSourceRoot = toRelative( projectBaseDir, sourceRoot );
+
// Don't add the same sourceroots twice. No include/exclude
// patterns possible in maven for (test|script|)source directories.
- if ( addedSourceRoots.containsKey( sourceRoot ) )
+ if ( addedSourceRoots.containsKey( eclipseSourceRoot ) )
{
continue;
}
@@ -368,14 +372,12 @@
writer.addAttribute( "kind", "src" );
- String eclipseSourceRoot = toRelative( projectBaseDir, sourceRoot );
-
if (!projectBaseDir.equals(basedir))
{
eclipseSourceRoot = eclipseSourceRoot.replaceAll( "/", "-" );
}
- addedSourceRoots.put( sourceRoot, eclipseSourceRoot );
+ addedSourceRoots.put( eclipseSourceRoot, sourceRoot );
writer.addAttribute( "path", eclipseSourceRoot );
@@ -419,21 +421,21 @@
String resourceDir = resource.getDirectory();
+ String eclipseResourceDir = toRelative( projectBaseDir, resourceDir );
+
// don't add the same sourceroot twice; eclipse can't handle
// that, even with mutual exclusive include/exclude patterns.
- if ( addedSourceRoots.containsKey( resourceDir ) )
+ if ( addedSourceRoots.containsKey( eclipseResourceDir ) )
{
continue;
}
- String eclipseResourceDir = toRelative( projectBaseDir, resourceDir );
-
if ( ! projectBaseDir.equals( basedir ) )
{
eclipseResourceDir = eclipseResourceDir.replaceAll( "/", "-" );
}
- addedSourceRoots.put( resourceDir, eclipseResourceDir );
+ addedSourceRoots.put( eclipseResourceDir, resourceDir );
writer.startElement( "classpathentry" );
@@ -472,13 +474,16 @@
private void addSourceLinks( XMLWriter writer, File projectBaseDir, File basedir, Map sourceRoots )
{
- for ( Iterator it = sourceRoots.keySet().iterator(); it.hasNext(); )
+ List roots = new ArrayList( sourceRoots.keySet() );
+ Collections.sort( roots );
+
+ for ( Iterator it = roots.iterator(); it.hasNext(); )
{
- String sourceRoot = (String) it.next();
+ String linkName = (String) it.next();
- String linkName = (String) sourceRoots.get( sourceRoot );
+ String sourceRoot = (String) sourceRoots.get( linkName );
- sourceRoot = sourceRoot.replaceAll("\\\\", "/");
+ sourceRoot = sourceRoot.replace('\\', '/');
log.debug( "Adding link '" + linkName + "' to '" + sourceRoot + "'" );
Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project?rev=240187&r1=240186&r2=240187&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project (original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project Fri Aug 26 01:05:47 2005
@@ -18,24 +18,24 @@
<location>${basedir}/src/test/projects/project-4/project.xml</location>
</link>
<link>
- <name>src-test-resources</name>
+ <name>src-main-java</name>
<type>2</type>
- <location>${basedir}/src/test/projects/project-4/src/test/resources</location>
+ <location>${basedir}/src/test/projects/project-4/src/main/java</location>
</link>
<link>
- <name>src-test-java</name>
+ <name>src-main-resources</name>
<type>2</type>
- <location>${basedir}/src/test/projects/project-4/src/test/java</location>
+ <location>${basedir}/src/test/projects/project-4/src/main/resources</location>
</link>
<link>
- <name>src-main-resources</name>
+ <name>src-test-java</name>
<type>2</type>
- <location>${basedir}/src/test/projects/project-4/src/main/resources</location>
+ <location>${basedir}/src/test/projects/project-4/src/test/java</location>
</link>
<link>
- <name>src-main-java</name>
+ <name>src-test-resources</name>
<type>2</type>
- <location>${basedir}/src/test/projects/project-4/src/main/java</location>
+ <location>${basedir}/src/test/projects/project-4/src/test/resources</location>
</link>
</linkedResources>
</projectDescription>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org