You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2006/11/14 17:16:41 UTC
svn commit: r474848 - in /maven/plugins/trunk/maven-eclipse-plugin: ./
src/main/java/org/apache/maven/plugin/eclipse/
src/main/java/org/apache/maven/plugin/eclipse/writers/
src/test/resources/projects/project-03/
src/test/resources/projects/project-03/...
Author: jdcasey
Date: Tue Nov 14 08:16:40 2006
New Revision: 474848
URL: http://svn.apache.org/viewvc?view=rev&rev=474848
Log:
Fixing EclipsePlugin unit tests.
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/eclipse/writers/EclipseClasspathWriter.java
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-03/pom.xml
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
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?view=diff&rev=474848&r1=474847&r2=474848
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Tue Nov 14 08:16:40 2006
@@ -71,6 +71,24 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.0-FCS</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>saxpath</groupId>
+ <artifactId>saxpath</artifactId>
+ <version>1.0-FCS</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0.1</version>
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?view=diff&rev=474848&r1=474847&r2=474848
==============================================================================
--- 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 Nov 14 08:16:40 2006
@@ -885,8 +885,8 @@
// If using the standard output location, don't mix the test output into it.
String testOutput = null;
- boolean useFixedOutputDir = !buildOutputDirectory.equals( new File( project.getBuild().getOutputDirectory() ) );
- if ( !useFixedOutputDir )
+ boolean useStandardOutputDir = buildOutputDirectory.equals( new File( project.getBuild().getOutputDirectory() ) );
+ if ( useStandardOutputDir )
{
testOutput = IdeUtils.toRelativeAndFixSeparator( projectBaseDir, new File( project.getBuild()
.getTestOutputDirectory() ), false );
@@ -919,8 +919,8 @@
}
}
- private void extractResourceDirs( Set directories, List resources, MavenProject project, File basedir,
- File projectBaseDir, boolean test, String output )
+ void extractResourceDirs( Set directories, List resources, MavenProject project, File basedir,
+ File workspaceProjectBaseDir, boolean test, String output )
throws MojoExecutionException
{
for ( Iterator it = resources.iterator(); it.hasNext(); )
@@ -945,7 +945,7 @@
// TODO: figure out how to merge if the same dir is specified twice
// with different in/exclude patterns.
- File resourceDirectory = new File( resource.getDirectory() );
+ File resourceDirectory = new File( /*basedir,*/ resource.getDirectory() );
if ( !resourceDirectory.exists() || !resourceDirectory.isDirectory() )
{
@@ -953,12 +953,12 @@
continue;
}
- String resourceDir = IdeUtils.toRelativeAndFixSeparator( projectBaseDir, resourceDirectory, !projectBaseDir
+ String resourceDir = IdeUtils.toRelativeAndFixSeparator( workspaceProjectBaseDir, resourceDirectory, !workspaceProjectBaseDir
.equals( basedir ) );
if ( output != null )
{
- File outputFile = new File( projectBaseDir, output );
+ File outputFile = new File( workspaceProjectBaseDir, output );
// create output dir if it doesn't exist
outputFile.mkdirs();
@@ -969,7 +969,7 @@
outputFile.mkdirs();
}
- output = IdeUtils.toRelativeAndFixSeparator( projectBaseDir, outputFile, false );
+ output = IdeUtils.toRelativeAndFixSeparator( workspaceProjectBaseDir, outputFile, false );
}
System.out.println( "Adding eclipse source dir: { " + resourceDir + ", " + output + ", true, " + test
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=474848&r1=474847&r2=474848
==============================================================================
--- 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 Tue Nov 14 08:16:40 2006
@@ -183,6 +183,8 @@
log.debug( "Processing " + ( dir.isResource() ? "re" : "" ) + "source " + dir.getPath() + ": output="
+ dir.getOutput() + "; default output=" + defaultOutput );
+ boolean isSpecial = false;
+
// handle resource with nested output folders
if ( dir.isResource() )
{
@@ -198,9 +200,8 @@
log.debug( "Marking as special to prevent output folder nesting: " + dir.getPath() + " (output=" + dir.getOutput() +")");
+ isSpecial = true;
specialSources.add( dir );
-
- continue;
}
}
@@ -209,7 +210,7 @@
writer.addAttribute( ATTR_KIND, "src" ); //$NON-NLS-1$
writer.addAttribute( ATTR_PATH, dir.getPath() );
- if ( dir.getOutput() != null && !defaultOutput.equals( dir.getOutput() ) )
+ if ( !isSpecial && dir.getOutput() != null && !defaultOutput.equals( dir.getOutput() ) )
{
writer.addAttribute( ATTR_OUTPUT, dir.getOutput() );
}
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?view=diff&rev=474848&r1=474847&r2=474848
==============================================================================
--- 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 Nov 14 08:16:40 2006
@@ -1,8 +1,8 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" output="target/classes/main-resources" including="**/*.xml" excluding="**/*.properties|**/*.java"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-output-dir" excluding="**/*.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"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml?view=diff&rev=474848&r1=474847&r2=474848
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml Tue Nov 14 08:16:40 2006
@@ -32,16 +32,18 @@
<exclude>**/*.properties</exclude>
</excludes>
</resource>
- <resource>
- <directory>src/main/resources</directory>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
<includes>
<include>**/*.properties</include>
</includes>
<excludes>
<exclude>**/*.xml</exclude>
</excludes>
- </resource>
- </resources>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
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?view=diff&rev=474848&r1=474847&r2=474848
==============================================================================
--- 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 Nov 14 08:16:40 2006
@@ -1,9 +1,9 @@
<classpath>
<classpathentry kind="src" path="src-main-java"/>
- <classpathentry kind="src" path="src-main-resources" output="target/classes/main-resources" excluding="**/*.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="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"/>
-</classpath>
\ No newline at end of file
+</classpath>
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?view=diff&rev=474848&r1=474847&r2=474848
==============================================================================
--- 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 Nov 14 08:16:40 2006
@@ -1,9 +1,9 @@
<classpath>
<classpathentry kind="src" path="src-main-java"/>
- <classpathentry kind="src" path="src-main-resources" output="target/eclipse-classes/main-resources" excluding="**/*.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="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"/>
-</classpath>
\ No newline at end of file
+</classpath>