Author: jdcasey
Date: Wed Sep 21 11:36:16 2005
New Revision: 290778
URL: http://svn.apache.org/viewcvs?rev=290778&view=rev
Log:
Resolving: MNG-907.
Patch applied, thanks Hiram!
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java?rev=290778&r1=290777&r2=290778&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java
Wed Sep 21 11:36:16 2005
@@ -53,11 +53,12 @@
/**
* @todo the list of needed parameters is really long, maybe this should
become a Plexus component
+ * @param outputDirectory TODO
*/
protected void write( File projectBaseDir, File basedir, MavenProject
project, List referencedReactorArtifacts,
EclipseSourceDir[] sourceDirs, List
classpathContainers, ArtifactRepository localRepository,
ArtifactResolver artifactResolver, ArtifactFactory
artifactFactory,
- List remoteArtifactRepositories, boolean
downloadSources )
+ List remoteArtifactRepositories, boolean
downloadSources, String outputDirectory )
throws EclipsePluginException
{
@@ -103,8 +104,8 @@
writer.startElement( "classpathentry" ); //$NON-NLS-1$
writer.addAttribute( "kind", "output" ); //$NON-NLS-1$ //$NON-NLS-2$
- writer.addAttribute( "path", EclipseUtils.toRelativeAndFixSeparator(
projectBaseDir, project.getBuild() //$NON-NLS-1$
- .getOutputDirectory(), false ) );
+ writer.addAttribute( "path", EclipseUtils.toRelativeAndFixSeparator(
projectBaseDir, //$NON-NLS-1$
+ outputDirectory, false ) );
writer.endElement();
//
----------------------------------------------------------------------
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=290778&r1=290777&r2=290778&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Wed Sep 21 11:36:16 2005
@@ -160,6 +160,13 @@
* @parameter expression="${eclipse.workspace}"
*/
private File outputDir;
+
+ /**
+ * The default output directory
+ *
+ * @parameter expression="${project.build.outputDirectory}"
+ */
+ String outputDirectory;
/**
* Setter for <code>project</code>. Needed for tests.
@@ -257,6 +264,7 @@
public void execute()
throws MojoExecutionException
{
+
if ( executedProject == null )
{
// backwards compat with alpha-2 only
@@ -332,12 +340,12 @@
List reactorArtifacts = EclipseUtils.resolveReactorArtifacts( project,
reactorProjects );
// build a list of UNIQUE source dirs (both src and resources) to be
used in classpath and wtpmodules
- EclipseSourceDir[] sourceDirs = EclipseUtils.buildDirectoryList(
executedProject, outputDir, getLog() );
+ EclipseSourceDir[] sourceDirs = EclipseUtils.buildDirectoryList(
executedProject, outputDir, getLog(), outputDirectory );
// use project since that one has all artifacts resolved.
new EclipseClasspathWriter( getLog() ).write( projectBaseDir,
outputDir, project, reactorArtifacts, sourceDirs,
classpathContainers,
localRepository, artifactResolver,
- artifactFactory,
remoteArtifactRepositories, downloadSources );
+ artifactFactory,
remoteArtifactRepositories, downloadSources, outputDirectory );
new EclipseProjectWriter( getLog() ).write( projectBaseDir, outputDir,
project, executedProject,
reactorArtifacts,
projectnatures, buildcommands );
@@ -364,5 +372,9 @@
public void setDownloadSources( boolean downloadSources )
{
this.downloadSources = downloadSources;
+ }
+
+ public void setOutputDirectory(String outputDirectory) {
+ this.outputDirectory = outputDirectory;
}
}
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java?rev=290778&r1=290777&r2=290778&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java
Wed Sep 21 11:36:16 2005
@@ -97,7 +97,7 @@
- public static EclipseSourceDir[] buildDirectoryList( MavenProject project,
File basedir, Log log )
+ public static EclipseSourceDir[] buildDirectoryList( MavenProject project,
File basedir, Log log, String outputDirectory )
{
File projectBaseDir = project.getFile().getParentFile();
@@ -109,13 +109,16 @@
EclipseUtils.extractResourceDirs( directories,
project.getBuild().getResources(), project, basedir, projectBaseDir, false,
null, log );
+ // If using the standard output location, don't mix the test output
into it.
+ String testOutput = outputDirectory.equals(
project.getBuild().getOutputDirectory() ) ?
+ EclipseUtils.toRelativeAndFixSeparator( projectBaseDir,
project.getBuild().getTestOutputDirectory(), false ) :
+ null;
+
EclipseUtils.extractSourceDirs( directories,
project.getTestCompileSourceRoots(), basedir, projectBaseDir, true,
- EclipseUtils.toRelativeAndFixSeparator(
projectBaseDir, project.getBuild()
- .getTestOutputDirectory(), false ) );
+ testOutput );
EclipseUtils.extractResourceDirs( directories,
project.getBuild().getTestResources(), project, basedir, projectBaseDir,
- true, EclipseUtils.toRelativeAndFixSeparator(
projectBaseDir, project.getBuild()
- .getTestOutputDirectory(), false ), log );
+ true, testOutput, log );
return (EclipseSourceDir[]) directories.toArray( new
EclipseSourceDir[directories.size()] );
}
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=290778&r1=290777&r2=290778&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Wed Sep 21 11:36:16 2005
@@ -126,6 +126,7 @@
}
plugin.setProject( project );
+ plugin.setOutputDirectory( project.getBuild().getOutputDirectory() );
plugin.setLocalRepository( localRepository );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
