You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ba...@apache.org on 2008/09/12 01:40:23 UTC
svn commit: r694545 - in /maven/plugins/trunk/maven-eclipse-plugin: ./
src/main/java/org/apache/maven/plugin/ide/
src/test/java/org/apache/maven/plugin/eclipse/it/
src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/
src/test/resources/m2repo/eclip...
Author: baerrach
Date: Thu Sep 11 16:40:21 2008
New Revision: 694545
URL: http://svn.apache.org/viewvc?rev=694545&view=rev
Log:
[MECLIPSE-486] fixing ITs to support multi-module expected file checking.
pom.xml:
Fixed the phase "test" to not include "projects/**" as this directory is copied from src/test/resources into target/test-classes
and surefire will attempt to compile any *Test*.java files - which will fail since they are not in the correct location
relative to their package declaration. See http://www.nabble.com/Plugins%3A-execution-configuration-does-not-add-to-configuration-td19425025.html
Fixed the run-its profile so that it overrides the excludes inherited from the "test" phase configuration.
IdeUtils:
Refactored code to create fixSeparator() method.
AbstractEclipsePluginIT:
Changed compareDirectoryContent to no longer accept a directory to use as check contents.
Instead ${basedir} is searched for EXPECTED_DIRECTORY_NAME ("expected") and all occurrences
of this directory are used in the comparison processes. This has simplified checking in
code as you no longer need to specify additional calls for multiple directories and
made it easier to support multi-module checking as previously only ${basedir}/expected
was checked, module directories where ignored. The actual files checked are relative to the
parent directory of the matching "expected" directory.
IOExceptions are no longer thrown instead MojoExecutionException are used mainly by
delegating to IdeUtils.getCanonicalPath() instead of calling File.getCanonicalPath() directly.
RadPluginIT:
Updated to use new compareDirectoryContent()
src/test/resources/projects/*:
Fixed files that were never previously checked to use the contents of the actual
maven-eclipse-plugin output. On the assumption that the plugin is generating the correct
output and nothing in this change set has altered that behaviour.
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/refproject-sysdep.jar
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/direct-sysdep.jar
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/target/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/target/generated-resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/target/generated-resources/eclipse/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/target/generated-resources/eclipse/META-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicationContext-foo.xml
- copied unchanged from r693338, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicaitonContext-foo.xml
Removed:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicaitonContext-foo.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/.modulemaps
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/application.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Thu Sep 11 16:40:21 2008
@@ -19,25 +19,20 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>12-SNAPSHOT</version>
</parent>
-
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.6-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
-
<name>Maven Eclipse Plugin</name>
<description>The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM.</description>
-
<prerequisites>
<maven>2.0.1</maven>
</prerequisites>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/</developerConnection>
@@ -47,11 +42,9 @@
<system>JIRA</system>
<url>http://jira.codehaus.org/browse/MECLIPSE</url>
</issueManagement>
-
<properties>
<maven.test.jvmargs>-Xmx256m</maven.test.jvmargs>
</properties>
-
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -197,7 +190,6 @@
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -221,18 +213,12 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </execution>
- </executions>
<configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
<excludes>
+ <exclude>**/project/**</exclude>
<exclude>**/Abstract*.java</exclude>
<exclude>**/InstallPluginsMojoTest.java</exclude>
</excludes>
@@ -264,6 +250,9 @@
<includes>
<include>**/*IT.java</include>
</includes>
+ <excludes>
+ <exclude>specified only to override configuration from default execution</exclude>
+ </excludes>
</configuration>
</execution>
</executions>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java Thu Sep 11 16:40:21 2008
@@ -414,7 +414,7 @@
relative = absolutePath;
}
- relative = StringUtils.replace( relative, '\\', '/' );
+ relative = fixSeparator( relative );
if ( replaceSlashesWithDashes )
{
@@ -426,6 +426,18 @@
}
/**
+ * Convert the provided filename from a Windows separator \\ to a unix/java
+ * separator /
+ *
+ * @param filename file name to fix separator
+ * @return filename with all \\ replaced with /
+ */
+ public static String fixSeparator( String filename )
+ {
+ return StringUtils.replace( filename, '\\', '/' );
+ }
+
+ /**
* Returns a compiler plugin settings from a list of plugins .
*
* @param project maven project
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java Thu Sep 11 16:40:21 2008
@@ -20,20 +20,21 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import junit.framework.AssertionFailedError;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.eclipse.ExecutionFailedException;
-import org.apache.maven.plugin.eclipse.writers.workspace.EclipseWorkspaceWriter;
+import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.ide.IdeUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.invoker.InvocationRequest;
@@ -91,6 +92,11 @@
private static boolean installed = false;
/**
+ * The name of the directory used for comparison of expected output.
+ */
+ private static final String EXPECTED_DIRECTORY_NAME = "expected";
+
+ /**
* @see org.codehaus.plexus.PlexusTestCase#setUp()
*/
protected void setUp()
@@ -109,8 +115,8 @@
String mavenHome = System.getProperty( "maven.home" );
- // maven.home is set by surefire when the test is run with maven, but better make the test run in IDEs without
- // the need of additional properties
+ // maven.home is set by surefire when the test is run with maven, but better make the test
+ // run in IDEs without the need of additional properties
if ( mavenHome == null )
{
String path = System.getProperty( "java.library.path" );
@@ -247,11 +253,7 @@
projectOutputDir = new File( outputDir, project.getArtifactId() );
}
- compareDirectoryContent( basedir, projectOutputDir, "" );
- compareDirectoryContent( basedir, projectOutputDir, ".settings/" );
- compareDirectoryContent( basedir, projectOutputDir, ".externalToolBuilders/" );
- compareDirectoryContent( basedir, projectOutputDir, "META-INF/" );
-
+ compareDirectoryContent( basedir, projectOutputDir );
}
/**
@@ -320,8 +322,7 @@
projectOutputDir = new File( outputDir, project.getArtifactId() );
}
- compareDirectoryContent( basedir, projectOutputDir, EclipseWorkspaceWriter.ECLIPSE_CORE_RUNTIME_SETTINGS_DIR
- + "/" );
+ compareDirectoryContent( basedir, projectOutputDir );
}
@@ -429,30 +430,24 @@
}
/**
- * @param basedir
- * @param projectOutputDir
- * @throws IOException
+ * @param basedir the base directory of the project
+ * @param projectOutputDir the directory where the eclipse plugin will write the output files.
+ * @throws MojoExecutionException
*/
- protected void compareDirectoryContent( File basedir, File projectOutputDir, String additionalDir )
- throws IOException
+ protected void compareDirectoryContent( File basedir, File projectOutputDir )
+ throws MojoExecutionException
{
- File expectedConfigDir = new File( basedir, "expected/" + additionalDir );
+ File[] expectedDirectories = getExpectedDirectories( basedir );
- if ( expectedConfigDir.isDirectory() )
+ for ( int i = 0; i < expectedDirectories.length; i++ )
{
- File[] files = expectedConfigDir.listFiles( new FileFilter()
- {
- public boolean accept( File file )
- {
- return !file.isDirectory();
- }
- } );
+ File expectedDirectory = expectedDirectories[i];
+ File[] expectedFilesToCompare = getExpectedFilesToCompare( expectedDirectory );
- for ( int j = 0; j < files.length; j++ )
+ for ( int j = 0; j < expectedFilesToCompare.length; j++ )
{
- File expectedFile = files[j];
- File actualFile =
- new File( projectOutputDir, additionalDir + expectedFile.getName() ).getCanonicalFile();
+ File expectedFile = expectedFilesToCompare[j];
+ File actualFile = getActualFile( projectOutputDir, basedir, expectedFile );
if ( !actualFile.exists() )
{
@@ -466,7 +461,7 @@
}
protected void assertFileEquals( File expectedFile, File actualFile )
- throws IOException
+ throws MojoExecutionException
{
List expectedLines = getLines( expectedFile );
@@ -476,9 +471,9 @@
}
List actualLines = getLines( actualFile );
- String filename = actualFile.getName();
- String basedir = new File( getBasedir() ).getCanonicalPath().replace( '\\', '/' );
+ String basedir = ( IdeUtils.getCanonicalPath( new File( getBasedir() ) ) ).replace( '\\', '/' );
+ String localRepositoryAsPath = IdeUtils.fixSeparator( IdeUtils.getCanonicalPath( localRepositoryDirectory ) );
for ( int i = 0; i < expectedLines.size(); i++ )
{
@@ -487,9 +482,7 @@
// replace some vars in the expected line, to account
// for absolute paths that are different on each installation.
expected = StringUtils.replace( expected, "${basedir}", basedir );
- expected =
- StringUtils.replace( expected, "${M2_REPO}", localRepositoryDirectory.getCanonicalPath().replace( '\\',
- '/' ) );
+ expected = StringUtils.replace( expected, "${M2_REPO}", localRepositoryAsPath );
if ( actualLines.size() <= i )
{
@@ -530,7 +523,8 @@
actual = actual.replaceAll( "(\\\\r\\\\n)|(\\\\n)|(\\\\r)", "\\n" );
}
- assertEquals( "Checking " + filename + ", line #" + ( i + 1 ), expected, actual );
+ assertEquals( "Comparing '" + IdeUtils.getCanonicalPath( actualFile ) + "' against '"
+ + IdeUtils.getCanonicalPath( expectedFile ) + "' at line #" + ( i + 1 ), expected, actual );
}
assertTrue( "Unequal number of lines.", expectedLines.size() == actualLines.size() );
@@ -571,22 +565,133 @@
}
private List getLines( File file )
- throws IOException
+ throws MojoExecutionException
{
- List lines = new ArrayList();
+ try
+ {
+ List lines = new ArrayList();
+
+ BufferedReader reader = new BufferedReader( new InputStreamReader( new FileInputStream( file ), "UTF-8" ) );
+
+ String line;
+
+ while ( ( line = reader.readLine() ) != null )
+ {
+ lines.add( line );
+ }
+
+ IOUtil.close( reader );
- BufferedReader reader = new BufferedReader( new InputStreamReader( new FileInputStream( file ), "UTF-8" ) );
+ return lines;
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "failed to getLines from file: " + file.getAbsolutePath(), e );
+ }
+ }
- String line;
+ /**
+ * @param basedir base directory to search for directories named "expected"
+ * @return an array of directories that match "expected"
+ */
+ private File[] getExpectedDirectories( File basedir )
+ {
+ List expectedDirectories = new ArrayList();
+ List subdirectories = new ArrayList();
- while ( ( line = reader.readLine() ) != null )
+ File[] allFiles = basedir.listFiles();
+ if ( allFiles != null )
{
- lines.add( line );
+ for ( int i = 0; i < allFiles.length; i++ )
+ {
+ File currentFile = allFiles[i];
+ if ( currentFile.isDirectory() )
+ {
+ if ( currentFile.getName().equals( EXPECTED_DIRECTORY_NAME ) )
+ {
+ expectedDirectories.add( currentFile );
+ }
+ else
+ {
+ subdirectories.add( currentFile );
+ }
+ }
+ }
+ }
+ if ( !subdirectories.isEmpty() )
+ {
+ for ( Iterator iter = subdirectories.iterator(); iter.hasNext(); )
+ {
+ File subdirectory = (File) iter.next();
+ File[] subdirectoryFiles = getExpectedDirectories( subdirectory );
+ expectedDirectories.addAll( Arrays.asList( subdirectoryFiles ) );
+ }
}
+ return (File[]) expectedDirectories.toArray( new File[expectedDirectories.size()] );
+ }
- IOUtil.close( reader );
+ /**
+ * @param expectedDirectory the expected directory to locate expected Files
+ * @return an array of Files found under the expectedDirectory - will recurse through the directory structure.
+ */
+ private File[] getExpectedFilesToCompare( File expectedDirectory )
+ {
+ List expectedFiles = new ArrayList();
+ List subdirectories = new ArrayList();
+
+ File[] allFiles = expectedDirectory.listFiles();
+ if ( allFiles != null )
+ {
+ for ( int i = 0; i < allFiles.length; i++ )
+ {
+ File currentFile = allFiles[i];
+ if ( currentFile.isDirectory() )
+ {
+ subdirectories.add( currentFile );
+ }
+ else
+ {
+ expectedFiles.add( currentFile );
+ }
+ }
+ }
+ if ( !subdirectories.isEmpty() )
+ {
+ for ( Iterator iter = subdirectories.iterator(); iter.hasNext(); )
+ {
+ File subdirectory = (File) iter.next();
+ File[] subdirectoryFiles = getExpectedFilesToCompare( subdirectory );
+ expectedFiles.addAll( Arrays.asList( subdirectoryFiles ) );
+ }
+ }
- return lines;
+ return (File[]) expectedFiles.toArray( new File[expectedFiles.size()] );
}
+ /**
+ * Locate the actual file needed for comparison. The expectedFile has the baseDir prefix removed and the resulting
+ * relative path used to locate the file within the projectOutputDir.
+ *
+ * @param projectOutputDir the directory where the eclipse plugin writes files to
+ * @param basedir the base dir of the project being tested
+ * @param expectedFile the expected file used to compare to the actual file
+ * @return the actual file needed for comparison against the expectedFile
+ * @throws MojoExecutionException failures for obtaining actual file.
+ */
+ private File getActualFile( File projectOutputDir, File basedir, File expectedFile )
+ throws MojoExecutionException
+ {
+ String relativePath = IdeUtils.toRelativeAndFixSeparator( basedir, expectedFile, false );
+ relativePath = relativePath.replaceFirst( EXPECTED_DIRECTORY_NAME, "" );
+ File actualFile = new File( projectOutputDir, relativePath );
+ try
+ {
+ return actualFile.getCanonicalFile();
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( Messages.getString( "cantcanonicalize", actualFile.getAbsolutePath() ), e ); //$NON-NLS-1$
+ }
+
+ }
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java Thu Sep 11 16:40:21 2008
@@ -296,8 +296,7 @@
projectOutputDir = new File( outputDir, project.getArtifactId() );
}
- compareDirectoryContent( basedir, projectOutputDir, "WebContent/WEB-INF/lib/" );
- compareDirectoryContent( basedir, projectOutputDir, "WebContent/META-INF/" );
+ compareDirectoryContent( basedir, projectOutputDir );
assertFalse( "Default path should not exist because it is overridden!",
new File( basedir + "/src/main/webapp" ).exists() );
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom Thu Sep 11 16:40:21 2008
@@ -1,55 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipsetest</groupId>
- <artifactId>master-test</artifactId>
- <version>1.0</version>
- </parent>
- <packaging>jar</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-1</artifactId>
- <version>1.0</version>
- <name>multymodule-1</name>
- <dependencies>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-4</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-compile</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-test</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-provided</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-optional</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-sysdep</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/refproject-sysdep.jar</systemPath>
- </dependency>
- </dependencies>
- <distributionManagement>
- <status>verified</status>
- </distributionManagement>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-34</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>jar</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-1</artifactId>
+ <version>1.0</version>
+ <name>multymodule-1</name>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-4</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-test</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-provided</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-optional</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-sysdep</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/refproject-sysdep.jar</systemPath>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <status>verified</status>
+ </distributionManagement>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom Thu Sep 11 16:40:21 2008
@@ -1,64 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipsetest</groupId>
- <artifactId>master-test</artifactId>
- <version>1.0</version>
- </parent>
- <packaging>war</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>module-2</artifactId>
- <version>1.0</version>
- <name>module-2</name>
- <dependencies>
- <dependency>
- <!-- module -->
- <groupId>eclipsetest</groupId>
- <artifactId>module-1</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <!-- module -->
- <groupId>eclipsetest</groupId>
- <artifactId>module-1</artifactId>
- <version>1.0</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>direct-compile</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>direct-test</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>direct-provided</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>direct-optional</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>direct-sysdep</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/direct-sysdep.jar</systemPath>
- </dependency>
- </dependencies>
- <distributionManagement>
- <status>verified</status>
- </distributionManagement>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-34</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>war</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>module-2</artifactId>
+ <version>1.0</version>
+ <name>module-2</name>
+ <dependencies>
+ <dependency>
+ <!-- module -->
+ <groupId>eclipsetest</groupId>
+ <artifactId>module-1</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <!-- module -->
+ <groupId>eclipsetest</groupId>
+ <artifactId>module-1</artifactId>
+ <version>1.0</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-test</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-provided</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-optional</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-sysdep</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/direct-sysdep.jar</systemPath>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <status>verified</status>
+ </distributionManagement>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom Thu Sep 11 16:40:21 2008
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipsetest</groupId>
- <artifactId>master-test</artifactId>
- <version>1.0</version>
- </parent>
- <packaging>jar</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-4</artifactId>
- <version>1.0</version>
- <name>multymodule-4</name>
- <dependencies>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-compile</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <distributionManagement>
- <status>verified</status>
- </distributionManagement>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-34</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>jar</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-4</artifactId>
+ <version>1.0</version>
+ <name>multymodule-4</name>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <status>verified</status>
+ </distributionManagement>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project Thu Sep 11 16:40:21 2008
@@ -8,8 +8,17 @@
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
</natures>
</projectDescription>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF Thu Sep 11 16:40:21 2008
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Class-Path: refproject-compile-1.0.jar refproject-sysdep.jar multymodu
- le-4-1.0.jar refproject-optional-1.0.jar deps-refproject-compile-1.0.
+Class-Path: deps-refproject-compile-1.0.jar multymodule-4-1.0.jar refp
+ roject-compile-1.0.jar refproject-optional-1.0.jar refproject-sysdep.
jar
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml Thu Sep 11 16:40:21 2008
@@ -1,52 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipsetest</groupId>
- <artifactId>master-test</artifactId>
- <version>1.0</version>
- </parent>
- <packaging>jar</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-1</artifactId>
- <version>1.0</version>
- <name>multymodule-1</name>
- <dependencies>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-4</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-compile</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-test</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-provided</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-optional</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-sysdep</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/refproject-sysdep.jar</systemPath>
- </dependency>
- </dependencies>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-34</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>jar</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-1</artifactId>
+ <version>1.0</version>
+ <name>multymodule-1</name>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-4</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-test</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-provided</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-optional</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-sysdep</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/refproject-sysdep.jar</systemPath>
+ </dependency>
+ </dependencies>
</project>
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/refproject-sysdep.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/refproject-sysdep.jar?rev=694545&view=auto
==============================================================================
(empty)
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/direct-sysdep.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/direct-sysdep.jar?rev=694545&view=auto
==============================================================================
(empty)
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath Thu Sep 11 16:40:21 2008
@@ -2,15 +2,35 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-optional/1.0/direct-optional-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar"/>
- <classpathentry kind="src" path="/multymodule-4-1.0"/>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-optional/1.0/direct-optional-1.0.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-provided/1.0/direct-provided-1.0.jar"/>
+ <classpathentry kind="lib" path="direct-sysdep.jar"/>
<classpathentry kind="var" path="M2_REPO/eclipsetest/direct-test/1.0/direct-test-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
- <classpathentry kind="lib" path="/tmp/maven-eclipse-plugin-trunk/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar"/>
<classpathentry kind="src" path="/multymodule-1-1.0"/>
- <classpathentry kind="lib" path="direct-sysdep.jar"/>
- <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-provided/1.0/direct-provided-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar"/>
+ <classpathentry kind="src" path="/multymodule-4-1.0"/>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="D:/ide/maven/maven-eclipse-plugin/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar"/>
</classpath>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.project?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.project (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.project Thu Sep 11 16:40:21 2008
@@ -2,15 +2,24 @@
<name>multymodule-2-1.0</name>
<comment/>
<projects>
- <project>multymodule-4-1.0</project>
<project>multymodule-1-1.0</project>
+ <project>multymodule-4-1.0</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
</natures>
</projectDescription>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF Thu Sep 11 16:40:21 2008
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
-Class-Path: direct-optional-1.0.jar deps-direct-compile-1.0.jar multym
- odule-4-1.0.jar refproject-compile-1.0.jar deps-refproject-compile-1.
- 0.jar refproject-sysdep.jar direct-sysdep.jar direct-compile-1.0.jar
+Class-Path: deps-direct-compile-1.0.jar deps-refproject-compile-1.0.ja
+ r direct-compile-1.0.jar direct-optional-1.0.jar direct-sysdep.jar mu
+ ltymodule-1-1.0.jar multymodule-4-1.0.jar refproject-compile-1.0.jar
+ refproject-sysdep.jar
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml Thu Sep 11 16:40:21 2008
@@ -1,61 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipsetest</groupId>
- <artifactId>master-test</artifactId>
- <version>1.0</version>
- </parent>
- <packaging>war</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-2</artifactId>
- <version>1.0</version>
- <name>multymodule-2</name>
- <dependencies>
- <dependency>
- <!-- module -->
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-1</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <!-- module -->
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-1</artifactId>
- <version>1.0</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>direct-compile</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>direct-test</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>direct-provided</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>direct-optional</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>direct-sysdep</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/direct-sysdep.jar</systemPath>
- </dependency>
- </dependencies>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-34</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>war</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-2</artifactId>
+ <version>1.0</version>
+ <name>multymodule-2</name>
+ <dependencies>
+ <dependency>
+ <!-- module -->
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-1</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <!-- module -->
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-1</artifactId>
+ <version>1.0</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-test</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-provided</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-optional</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-sysdep</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/direct-sysdep.jar</systemPath>
+ </dependency>
+ </dependencies>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/.project?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/.project (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/.project Thu Sep 11 16:40:21 2008
@@ -4,6 +4,16 @@
<projects>
<project>multymodule-2-1.0</project>
</projects>
- <buildSpec/>
- <natures/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ </natures>
</projectDescription>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/.modulemaps
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/.modulemaps?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/.modulemaps (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/.modulemaps Thu Sep 11 16:40:21 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<modulemap:EARProjectMap xmlns:xmi="http://www.omg.org/XMI" xmlns:application="application.xmi" xmi:version="2.0" xmlns:modulemap="modulemap.xmi" xmi:id="EARProjectMap_24763620">
- <mappings projectName="multymodule-2-1.0" xmi:id="ModuleMapping_26542488">
- <module xmi:type="application:WebModule" href="META-INF/application.xml#WebModule_26542488"/>
+<modulemap:EARProjectMap xmlns:xmi="http://www.omg.org/XMI" xmlns:application="application.xmi" xmi:version="2.0" xmlns:modulemap="modulemap.xmi" xmi:id="EARProjectMap_7388808">
+ <mappings projectName="multymodule-2-1.0" xmi:id="ModuleMapping_1668655">
+ <module xmi:type="application:WebModule" href="META-INF/application.xml#WebModule_1668655"/>
</mappings>
</modulemap:EARProjectMap>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/application.xml?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/application.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/application.xml Thu Sep 11 16:40:21 2008
@@ -2,10 +2,10 @@
<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" id="Application_ID" version="1.4">
<description/>
<display-name>multymodule-3-1.0</display-name>
- <module id="WebModule_26542488">
+ <module id="WebModule_1668655">
<web>
<web-uri>multymodule-2-1.0.war</web-uri>
- <context-root>multymodule-2-1.0</context-root>
+ <context-root>/multymodule-2-1.0</context-root>
</web>
</module>
</application>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml Thu Sep 11 16:40:21 2008
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipsetest</groupId>
- <artifactId>master-test</artifactId>
- <version>1.0</version>
- </parent>
- <packaging>ear</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-3</artifactId>
- <version>1.0</version>
- <name>multymodule-3</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <defaultLibBundleDir>lib</defaultLibBundleDir>
- <modules>
- <webModule>
- <groupId>${project.groupId}</groupId>
- <artifactId>multymodule-2</artifactId>
- <contextRoot>/multymodule-2-${project.version}</contextRoot>
- </webModule>
- </modules>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-2</artifactId>
- <version>1.0</version>
- <type>war</type>
- </dependency>
- </dependencies>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-34</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>ear</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-3</artifactId>
+ <version>1.0</version>
+ <name>multymodule-3</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <defaultLibBundleDir>lib</defaultLibBundleDir>
+ <modules>
+ <webModule>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>multymodule-2</artifactId>
+ <contextRoot>/multymodule-2-${project.version}</contextRoot>
+ </webModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-2</artifactId>
+ <version>1.0</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
</project>
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath?rev=694545&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath Thu Sep 11 16:40:21 2008
@@ -0,0 +1,8 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="target\generated-resources\eclipse" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
+</classpath>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.project?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.project (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.project Thu Sep 11 16:40:21 2008
@@ -6,8 +6,17 @@
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
</natures>
</projectDescription>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF?rev=694545&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF Thu Sep 11 16:40:21 2008
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: deps-refproject-compile-1.0.jar refproject-compile-1.0.jar
+
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml Thu Sep 11 16:40:21 2008
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipsetest</groupId>
- <artifactId>master-test</artifactId>
- <version>1.0</version>
- </parent>
- <packaging>jar</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-4</artifactId>
- <version>1.0</version>
- <name>multymodule-4</name>
- <dependencies>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>refproject-compile</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-34</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>jar</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-4</artifactId>
+ <version>1.0</version>
+ <name>multymodule-4</name>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>refproject-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml Thu Sep 11 16:40:21 2008
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>eclipsetest</groupId>
- <artifactId>master-test</artifactId>
+ <artifactId>maven-eclipse-plugin-test-project-34</artifactId>
<version>1.0</version>
- <name>master</name>
+ <name>maven-eclipse-plugin-test-project-34</name>
<build>
<plugins>
<plugin>
@@ -14,7 +14,7 @@
<artifactId>maven-eclipse-plugin</artifactId>
<version>test</version>
<configuration>
- <workspace>${basedir}</workspace>
+ <workspace>D:\ide\maven\maven-eclipse-plugin\target\test-classes\projects\project-34</workspace>
<projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
<wtpmanifest>true</wtpmanifest>
<wtpapplicationxml>true</wtpapplicationxml>
@@ -27,5 +27,6 @@
<module>multymodule-1</module>
<module>multymodule-2</module>
<module>multymodule-3</module>
+ <module>multymodule-4</module>
</modules>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.jdt.core.prefs?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.jdt.core.prefs (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.jdt.core.prefs Thu Sep 11 16:40:21 2008
@@ -1,5 +1,5 @@
#Wed Nov 21 11:20:59 CET 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component Thu Sep 11 16:40:21 2008
@@ -2,13 +2,8 @@
<wb-module deploy-name="my-ear">
<wb-resource deploy-path="/" source-path="src/main/application"/>
<dependent-module archiveName="my-ejb.ejb" deploy-path="/" handle="module:/resource/my-ejb/my-ejb">
- <dependent-object>EjbModule_17743384</dependent-object>
+ <dependent-object>EjbModule_19673895</dependent-object>
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="geronimo-ejb_3.0_spec-1.0.jar" deploy-path="/" handle="module:/classpath/var/M2_REPO/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0/geronimo-ejb_3.0_spec-1.0.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <wb-resource deploy-path="/" source-path="src/main/java"/>
- <wb-resource deploy-path="/" source-path="src/main/resources"/>
</wb-module>
</project-modules>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml Thu Sep 11 16:40:21 2008
@@ -1,6 +1,4 @@
<faceted-project>
- <fixed facet="jst.java"/>
<fixed facet="jst.ear"/>
<installed facet="jst.ear" version="5.0"/>
- <installed facet="jst.java" version="1.4"/>
</faceted-project>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath Thu Sep 11 16:40:21 2008
@@ -1,9 +1,7 @@
<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="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0/geronimo-ejb_3.0_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
</classpath>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.jdt.core.prefs?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.jdt.core.prefs (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.jdt.core.prefs Thu Sep 11 16:40:21 2008
@@ -1,5 +1,5 @@
#Wed Nov 21 11:20:58 CET 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.component?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.component (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.component Thu Sep 11 16:40:21 2008
@@ -1,6 +1,5 @@
<project-modules id="moduleCoreId" project-version="2.0">
<wb-module deploy-name="my-ejb">
<wb-resource deploy-path="/" source-path="src/main/java"/>
- <wb-resource deploy-path="/" source-path="src/main/resources"/>
</wb-module>
</project-modules>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath Thu Sep 11 16:40:21 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-07-MECLIPSE-445/multymodule-1/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project Thu Sep 11 16:40:21 2008
@@ -1,5 +1,5 @@
<projectDescription>
- <name>maven-eclipse-plugin-test-project-myeclipse-06-MECLIPSE-427</name>
+ <name>multymodule-1-99.0</name>
<comment/>
<projects/>
<buildSpec>
@@ -7,11 +7,20 @@
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ <buildCommand>
<name>com.genuitec.eclipse.springframework.springbuilder</name>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>com.genuitec.eclipse.springframework.springnature</nature>
</natures>
</projectDescription>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath Thu Sep 11 16:40:21 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-07-MECLIPSE-445/multymodule-2/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project?rev=694545&r1=694544&r2=694545&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project Thu Sep 11 16:40:21 2008
@@ -1,5 +1,5 @@
<projectDescription>
- <name>maven-eclipse-plugin-test-project-myeclipse-06-MECLIPSE-427</name>
+ <name>multymodule-2-99.0</name>
<comment/>
<projects/>
<buildSpec>
@@ -7,11 +7,20 @@
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ <buildCommand>
<name>com.genuitec.eclipse.springframework.springbuilder</name>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>com.genuitec.eclipse.springframework.springnature</nature>
</natures>
</projectDescription>
\ No newline at end of file