You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ke...@apache.org on 2006/11/13 13:43:17 UTC
svn commit: r474285 -
/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
Author: kenney
Date: Mon Nov 13 04:43:17 2006
New Revision: 474285
URL: http://svn.apache.org/viewvc?view=rev&rev=474285
Log:
Fix output folder nesting detection
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?view=diff&rev=474285&r1=474284&r2=474285
==============================================================================
--- 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 Mon Nov 13 04:43:17 2006
@@ -169,7 +169,9 @@
if ( byOutputDirs == null )
{
// ArrayList<EclipseSourceDir>
- byOutputDir.put( dir.getOutput(), byOutputDirs = new ArrayList() );
+ byOutputDir.put(
+ dir.getOutput() == null ? defaultOutput : dir.getOutput(),
+ byOutputDirs = new ArrayList() );
}
byOutputDirs.add( dir );
}
@@ -193,6 +195,8 @@
{
// do not specify as source since the output will be nested. Instead, mark
// it as a todo, and handle it with a custom build.xml file later.
+
+ log.debug( "Marking as special to prevent output folder nesting: " + dir.getPath() + " (output=" + dir.getOutput() +")");
specialSources.add( dir );