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 2011/09/22 07:53:26 UTC
svn commit: r1173952 [1/3] - in /maven/plugins/trunk/maven-eclipse-plugin:
./ src/main/java/org/apache/maven/plugin/eclipse/writers/
src/main/java/org/apache/maven/plugin/eclipse/writers/rad/
src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/ s...
Author: baerrach
Date: Thu Sep 22 05:53:22 2011
New Revision: 1173952
URL: http://svn.apache.org/viewvc?rev=1173952&view=rev
Log:
[MECLIPSE-388]
.classpath files are now checked using assertXMLIdentical.
Configured surefire-report plugin to look at both the surefire report and failsafe reports
Added maven.test.jvmargs property to invocations of surefire and failsafe plugins.
Added documentation on testing
Deleted EclipseWriterConfig.getDepsOrdered(), all code now uses getDeps()
Deleted comment as dependencies should no longer be ordered - // TODO if (..magic property equals orderDependencies..)
AbstractIdeSupportMojo.getProjectArtifacts() preserves dependency order via LinkedHashSet.
Things that are now ordered correctly:
* AbstractEclipseManifestWriter.java: META-INF/MANIFEST.MF
* EclipseClasspathWriter.java: .classpath
* EclipseOSGiManifestWriter.java: (deprecated anyway)
* EclipseProjectWriter.java: .project
* RadApplicationXMLWriter.java: META-INF/.modulemaps
* RadLibCopier.java: (library files aren't ordered on disk)
* RadWebSettingsWriter.java: .websettings
* AbstractWtpResourceWriter.java: .settings/org.eclipse.wst.common.component
* EclipseWtpApplicationXMLWriter.java: target/eclipseEar/META-INF/application.xml, target/eclipseEar/META-INF/.modulemaps
[MECLIPSE-696]
Noted which tests fail because of this bug.
Added:
maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.wtpmodules
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-ear/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-a/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-42/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-45/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-53-MECLIPSE-551/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-56-MECLIPSE-603/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/expected/.settings/org.eclipse.jdt.core.prefs (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/pom.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/main/java/com/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/main/java/com/mycompany/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/main/java/com/mycompany/HomePage.java (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/main/resources/log4j.properties (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/main/webapp/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/main/webapp/WEB-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/main/webapp/WEB-INF/web.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/test/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/test/java/com/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/test/java/com/mycompany/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/test/java/com/mycompany/Start.java (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-63-MECLIPSE-388/src/test/java/com/mycompany/TestHomePage.java (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/expected/.settings/org.eclipse.jdt.core.prefs (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/pom.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/main/java/com/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/main/java/com/mycompany/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/main/java/com/mycompany/HomePage.java (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/main/resources/log4j.properties (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/main/webapp/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/main/webapp/WEB-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/main/webapp/WEB-INF/web.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/test/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/test/java/com/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/test/java/com/mycompany/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/test/java/com/mycompany/Start.java (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-64-MECLIPSE-388/src/test/java/com/mycompany/TestHomePage.java (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-01/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-02/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-03/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-04/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-05/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-06/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-07/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-08/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-09/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-10-MECLIPSE-538/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-11-MECLIPSE-104/expected/.classpath (with props)
Removed:
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-51-MECLIPSE-415/multymodule-1/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.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/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadLibCopier.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.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/EclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/.modulemaps
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.project
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/.settings/org.eclipse.wst.common.component
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-4/expected/.classpath
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-35/multymodule-war/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/target/eclipseEar/META-INF/.modulemaps
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-42/expected/target/eclipseEar/META-INF/.modulemaps
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-04/expected/.settings/org.eclipse.ajdt.ui.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt-05/expected/.settings/org.eclipse.ajdt.ui.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/pom.xml
Added: maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt?rev=1173952&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt Thu Sep 22 05:53:22 2011
@@ -0,0 +1,101 @@
+Testing maven-eclipse-plugin
+
+ This is a complicated beast, it generates a bunch of different files (all in different formats: text, xml)
+ that have hard coded paths and other junk in them.
+
+ Most of the work is done in the integration tests.
+
+ Use
+ mvn -Prun-its verify
+ to run the integration tests
+
+ One day these tests will be unified into whatever "sanctioned" way of doing integration tests becomes.
+
+PluginTestTool
+ The bulk of the integration tests are using the old (and obsoleted) method of PluginTestTool.
+ These IT tests are invoked via maven-failsafe-plugin:integration-test which looks for JUnit test cases
+ from the ${project.build.testSourceDirectory} of the form:
+ (see http://maven.apache.org/plugins/maven-failsafe-plugin/integration-test-mojo.html#includes)
+ <includes>
+ <include>**/IT*.java</include>
+ <include>**/*IT.java</include>
+ <include>**/*ITCase.java</include>
+ </includes>
+
+ The test classes all extends AbstractEclipsePluginIT which initialised the testing area with a test
+ version of the plugin under test. Each actual test then needs to specify which test project should be run
+ in a test method. e.g. EclipsePluginIT has methods like:
+ public void testProject63()
+ throws Exception
+ {
+ testProject( "project-63-MECLIPSE-388" );
+ }
+ which delegates to AbstractEclipsePluginIT.testProject() and specifies the test project directory that should
+ be used. All test projects are located in src/test/resources/projects/, so in this example it would be
+ src/test/resources/projects/project-63-MECLIPSE-388
+
+ Each test project needs a pom.xml file. It's easiest to copy and hack an existing file from another working test project.
+ These test projects will not pollute your local ~/.m2/repository. A separate test repository inside target/ is created
+ that will house all the downloaded artifacts and installed test projects.
+
+ A negative consequence of using PluginTestTool is that anything downloaded from central is not stored in
+ your ~/.m2/repository which means wasted bandwidth after doing "mvn clean".
+
+ Remember that your build/plugins/plugin for maven-eclipse-plugin needs:
+ <version>test</version>
+ for PluginTestTool to work. You may need additional configuration settings,
+ like workspace so that you dont accidentally pollute your tests with settings
+ from your actual eclipse workspace used to develop this plugin.
+
+* Validating a successful test
+
+ Each test will automatically run a comparison of the generated files.
+ A generated file will only be verified if the same file (including path hierarchy) exists in the
+ under the "expected" directory. e.g. src/test/resources/project-63-MECLIPSE-388/expected contains:
+ * settings/org.eclipse.jdt.core.prefs
+ * .classpath
+ * .project
+
+ Before comparison is done, each file (both expected and actual) is preprocessed via
+ AbstractEclipsePluginIT.preprocess( File file, Map variables ) which
+ * removes windows drive details
+ * replaces any variables with their values, currently only "${basedir}" and "${M2_REPO}" are supported variable.
+ * specific hacks for specific files like eclipse *.prefs files and wst files.
+ See the method for more details.
+
+ The comparator read the first few bytes of the actual file to see if it contains an XML header, and
+ if so uses XMLAssert to compare the contents of the file. This allows for variation in ordering
+ but the contents must be the same.
+
+ If the file name is ".classpath" then an assertXMLIdentical comparison is made, otherwise XMLAssert.assertXMLEqual
+ is used (which is lenient about the ordering of the XML but requires the same contents)
+
+ All other cases do a text file comparison.
+
+Invoker
+ Some tests are done via invoker.
+
+ (TODO: Confirm this is invoker that requires this file)
+ If you are behind a firewall then you must configure src/it/settings.xml
+
+ (TODO: Someone who understands how invoker works - can you complete this section)
+
+Running surefire-report:report-only
+
+ After running the integration tests you can run surefire-report:report-only to build a report of the test success/failures.
+ Then open target\site\surefire-report.html for more details.
+
+Creating expected files
+
+ The antrun plugin has been bound to the phase "post-integration-test" and will invoke the bean shell script
+ "verify-integration-tests-checks.bsh". This script will ensure that each generated file (that is knows about)
+ that exists in your test project directories has a corresponding expected file.
+
+ When the expected file does not yet exist it will "seed" the src/test/resources project expected directory with the
+ one actually generated by the test run.
+
+ YOU MUST CHECK THIS FILE.
+
+ When you go to check in changes these files should show up as requiring adding to version control.
+ Please make sure you ensure that these files have been customized with variables so they work in anyones environment.
+
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Thu Sep 22 05:53:22 2011
@@ -53,6 +53,7 @@ under the License.
<properties>
<mavenVersion>2.0.8</mavenVersion>
<maven.test.jvmargs>-Xmx1024m</maven.test.jvmargs>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
@@ -220,6 +221,17 @@ under the License.
<artifactId>maven-resources-plugin</artifactId>
<version>2.3</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <reportsDirectories>
+ <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+ <reportsDirectory>${project.build.directory}/failsafe-reports</reportsDirectory>
+ </reportsDirectories>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -319,6 +331,9 @@ under the License.
<systemPropertyVariables>
<maven.repo.local>${maven.repo.local}</maven.repo.local>
</systemPropertyVariables>
+ <configuration>
+ <argLine>${maven.test.jvmargs}</argLine>
+ </configuration>
</configuration>
</plugin>
</plugins>
@@ -358,6 +373,9 @@ under the License.
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
+ <configuration>
+ <argLine>${maven.test.jvmargs}</argLine>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -379,4 +397,27 @@ under the License.
</build>
</profile>
</profiles>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.9</version>
+ <reportSets>
+ <reportSet>
+ <id>integration-tests</id>
+ <reports>
+ <report>report-only</report>
+ </reports>
+ <configuration>
+ <outputName>failsafe-report</outputName>
+ <reportsDirectories>
+ <reportsDirectory>${project.build.directory}/failsafe-reports</reportsDirectory>
+ </reportsDirectories>
+ </configuration>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java Thu Sep 22 05:53:22 2011
@@ -194,7 +194,7 @@ public abstract class AbstractEclipseMan
protected String constructManifestClasspath()
{
StringBuffer stringBuffer = new StringBuffer();
- IdeDependency[] deps = this.config.getDepsOrdered();
+ IdeDependency[] deps = this.config.getDeps();
for ( int index = 0; index < deps.length; index++ )
{
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?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- 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 Thu Sep 22 05:53:22 2011
@@ -348,13 +348,12 @@ public class EclipseClasspathWriter
writer.endElement();
Set addedDependencies = new HashSet();
- // TODO if (..magic property equals orderDependencies..)
-
+
// ----------------------------------------------------------------------
- // Java API dependencies that may complete the classpath container so must
- // be declared BEFORE so that container access rules don't fail
+ // Java API dependencies that may complete the classpath container must
+ // be declared BEFORE all other dependencies so that container access rules don't fail
// ----------------------------------------------------------------------
- IdeDependency[] depsToWrite = config.getDepsOrdered();
+ IdeDependency[] depsToWrite = config.getDeps();
for ( int j = 0; j < depsToWrite.length; j++ )
{
IdeDependency dep = depsToWrite[j];
@@ -376,7 +375,7 @@ public class EclipseClasspathWriter
}
// ----------------------------------------------------------------------
- // The dependencies
+ // The project's dependencies
// ----------------------------------------------------------------------
for ( int j = 0; j < depsToWrite.length; j++ )
{
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java Thu Sep 22 05:53:22 2011
@@ -27,7 +27,6 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.util.Arrays;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.eclipse.Messages;
@@ -242,11 +241,7 @@ public class EclipseOSGiManifestWriter
// @todo handle expanded plugins
bundleClasspathSb.append( " ." );
- IdeDependency[] deps = config.getDepsOrdered();
-
- // since Manifest is supposed to be in SVN, having the order of classpath entries shuffled at each run is very
- // annoying. For now just sort them by using groupId/artifactId
- Arrays.sort( deps );
+ IdeDependency[] deps = config.getDeps();
for ( int j = 0; j < deps.length; j++ )
{
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java Thu Sep 22 05:53:22 2011
@@ -211,13 +211,15 @@ public class EclipseProjectWriter
writer.startElement( "projects" ); //$NON-NLS-1$
+ IdeDependency[] dependencies = config.getDeps();
+
// referenced projects should not be added for plugins
if ( !config.isPde() )
{
List duplicates = new ArrayList();
- for ( int j = 0; j < config.getDepsOrdered().length; j++ )
+ for ( int j = 0; j < dependencies.length; j++ )
{
- IdeDependency dep = config.getDepsOrdered()[j];
+ IdeDependency dep = dependencies[j];
// Avoid duplicates entries when same project is refered using multiple types
// (ejb, test-jar ...)
if ( dep.isReferencedProject() && !duplicates.contains( dep.getEclipseProjectName() ) )
@@ -254,7 +256,7 @@ public class EclipseProjectWriter
boolean addLinks = !config.getProjectBaseDir().equals( config.getEclipseProjectDirectory() );
- if ( addLinks || ( config.isPde() && config.getDepsOrdered().length > 0 ) || linkedResources.size() > 0 )
+ if ( addLinks || ( config.isPde() && dependencies.length > 0 ) || linkedResources.size() > 0 )
{
writer.startElement( "linkedResources" ); //$NON-NLS-1$
// preserve the symbolic links
@@ -286,9 +288,9 @@ public class EclipseProjectWriter
if ( config.isPde() )
{
- for ( int j = 0; j < config.getDepsOrdered().length; j++ )
+ for ( int j = 0; j < dependencies.length; j++ )
{
- IdeDependency dep = config.getDepsOrdered()[j];
+ IdeDependency dep = dependencies[j];
if ( dep.isAddedToClasspath() && !dep.isProvided() && !dep.isReferencedProject()
&& !dep.isTestDependency() && !dep.isOsgiBundle() )
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java Thu Sep 22 05:53:22 2011
@@ -19,8 +19,6 @@
package org.apache.maven.plugin.eclipse.writers;
import java.io.File;
-import java.util.Arrays;
-import java.util.Comparator;
import java.util.List;
import java.util.Map;
@@ -68,11 +66,6 @@ public class EclipseWriterConfig
private IdeDependency[] deps = new IdeDependency[0];
/**
- * List of IDE dependencies ordered.
- */
- private IdeDependency[] orderedDeps = new IdeDependency[0];
-
- /**
* Source directories.
*/
private EclipseSourceDir[] sourceDirs;
@@ -189,48 +182,6 @@ public class EclipseWriterConfig
public void setDeps( IdeDependency[] deps )
{
this.deps = deps;
- if ( deps != null )
- {
- // TODO get the right comparator depending on orderDependencies={name,nearness..};
- // if none specified it could use a NullComparator to reduce the number of
- // conditions that have to be checked
- Comparator depsByArtifactId = new Comparator()
- {
- public int compare( Object o1, Object o2 )
- {
- int result =
- ( (IdeDependency) o1 ).getArtifactId().compareToIgnoreCase(
- ( (IdeDependency) o2 ).getArtifactId() );
- if ( result != 0 )
- {
- return result;
- }
- if ( ( (IdeDependency) o1 ).getClassifier() != null
- && ( (IdeDependency) o2 ).getClassifier() != null )
- {
- result =
- ( (IdeDependency) o1 ).getClassifier().compareToIgnoreCase(
- ( (IdeDependency) o2 ).getClassifier() );
- if ( result != 0 )
- {
- return result;
- }
- }
- result = ( (IdeDependency) o1 ).getType().compareToIgnoreCase( ( (IdeDependency) o2 ).getType() );
- if ( result != 0 )
- {
- return result;
- }
- result =
- ( (IdeDependency) o1 ).getGroupId().compareToIgnoreCase( ( (IdeDependency) o2 ).getGroupId() );
- return result;
- }
- };
-
- orderedDeps = new IdeDependency[deps.length];
- System.arraycopy( deps, 0, orderedDeps, 0, deps.length );
- Arrays.sort( orderedDeps, depsByArtifactId );
- }
}
/**
@@ -590,14 +541,6 @@ public class EclipseWriterConfig
}
/**
- * @return an ordered list of dependencies
- */
- public IdeDependency[] getDepsOrdered()
- {
- return orderedDeps;
- }
-
- /**
* Returns the ajdtVersion.
*
* @return the ajdtVersion.
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java Thu Sep 22 05:53:22 2011
@@ -157,7 +157,7 @@ public class RadApplicationXMLWriter
IdeUtils.getPluginConfigurationDom( config.getProject(), JeeUtils.ARTIFACT_MAVEN_EAR_PLUGIN,
new String[] { "modules", "webModule" } );
- IdeDependency[] deps = config.getDepsOrdered();
+ IdeDependency[] deps = config.getDeps();
for ( int index = 0; index < deps.length; index++ )
{
updateApplicationXml( applicationXmlDom, modulemapsXmlDom, deps[index] );
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadLibCopier.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadLibCopier.java?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadLibCopier.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadLibCopier.java Thu Sep 22 05:53:22 2011
@@ -50,7 +50,7 @@ public class RadLibCopier
public void write()
throws MojoExecutionException
{
- IdeDependency[] deps = config.getDepsOrdered();
+ IdeDependency[] deps = config.getDeps();
String packaging = config.getPackaging();
if ( Constants.PROJECT_PACKAGING_EAR.equals( packaging ) )
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java Thu Sep 22 05:53:22 2011
@@ -179,7 +179,7 @@ public class RadWebSettingsWriter
writer.startElement( WEBSETTINGS_LIBMODULES );
// iterate relevant dependencies (non-test, non-provided, project)
- IdeDependency[] deps = config.getDepsOrdered();
+ IdeDependency[] deps = config.getDeps();
if ( deps != null )
{
for ( int i = 0; i < deps.length; i++ )
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java Thu Sep 22 05:53:22 2011
@@ -298,9 +298,9 @@ public abstract class AbstractWtpResourc
deployDir = "/WEB-INF/lib";
}
// dependencies
- for ( int j = 0; j < config.getDepsOrdered().length; j++ )
+ for ( int j = 0; j < config.getDeps().length; j++ )
{
- IdeDependency dep = config.getDepsOrdered()[j];
+ IdeDependency dep = config.getDeps()[j];
String type = dep.getType();
// NB war is needed for ear projects, we suppose nobody adds a war dependency to a war/jar project
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java Thu Sep 22 05:53:22 2011
@@ -146,7 +146,7 @@ public class EclipseWtpApplicationXMLWri
IdeUtils.getPluginConfigurationDom( config.getProject(), JeeUtils.ARTIFACT_MAVEN_EAR_PLUGIN,
new String[] { "modules", "webModule" } );
- IdeDependency[] deps = this.config.getDepsOrdered();
+ IdeDependency[] deps = this.config.getDeps();
for ( int index = 0; index < deps.length; index++ )
{
updateApplicationXml( applicationXmlDom, modulemapsXmlDom, deps[index] );
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java Thu Sep 22 05:53:22 2011
@@ -25,10 +25,10 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeSet;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
@@ -734,8 +734,8 @@ public abstract class AbstractIdeSupport
private Set getProjectArtifacts()
throws MojoExecutionException
{
- // keep it sorted, this should avoid random classpath order in tests
- Set artifacts = new TreeSet();
+ // [MECLIPSE-388] Don't sort this, the order should be identical to getProject.getDependencies()
+ Set artifacts = new LinkedHashSet();
for ( Iterator dependencies = getProject().getDependencies().iterator(); dependencies.hasNext(); )
{
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=1173952&r1=1173951&r2=1173952&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 22 05:53:22 2011
@@ -62,6 +62,7 @@ import org.codehaus.plexus.PlexusContain
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
+import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
import org.xml.sax.EntityResolver;
@@ -123,6 +124,11 @@ public abstract class AbstractEclipsePlu
private static final String XML_HEADER = "<?xml";
/**
+ * .classpath file name
+ */
+ private static final String CLASSPATH_FILENAME = ".classpath";
+
+ /**
* @see org.codehaus.plexus.PlexusTestCase#setUp()
*/
protected void setUp()
@@ -539,13 +545,7 @@ public abstract class AbstractEclipsePlu
File expectedFile = expectedFilesToCompare[j];
File actualFile = getActualFile( projectOutputDir, basedir, expectedFile );
- if ( !actualFile.exists() )
- {
- throw new AssertionFailedError( "Expected file not found: " + actualFile.getAbsolutePath() );
- }
-
assertFileEquals( expectedFile, actualFile );
-
}
}
}
@@ -555,7 +555,7 @@ public abstract class AbstractEclipsePlu
{
if ( !actualFile.exists() )
{
- throw new AssertionFailedError( "Expected file not found: " + actualFile.getAbsolutePath() );
+ throw new AssertionFailedError( "Generated file not found: " + actualFile.getAbsolutePath() );
}
HashMap variableReplacement = new HashMap();
@@ -592,8 +592,16 @@ public abstract class AbstractEclipsePlu
{
try
{
- XMLAssert.assertXMLEqual( "Comparing '" + IdeUtils.getCanonicalPath( actualFile ) + "' against '"
- + IdeUtils.getCanonicalPath( expectedFile ), expectedFileContents, actualFileContents );
+ String message =
+ "Comparing '" + IdeUtils.getCanonicalPath(actualFile) + "' against '"
+ + IdeUtils.getCanonicalPath(expectedFile);
+ if (CLASSPATH_FILENAME.equals(actualFile.getName())) {
+ Diff diff = new Diff(expectedFileContents, actualFileContents);
+ XMLAssert.assertXMLIdentical( message, diff, true );
+ }
+ else {
+ XMLAssert.assertXMLEqual( message, expectedFileContents, actualFileContents );
+ }
}
catch ( IOException e )
{
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java Thu Sep 22 05:53:22 2011
@@ -510,6 +510,8 @@ public class EclipsePluginIT
/**
* [MECLIPSE-219]
+ * Note: This fails behind a firewall, See [MECLIPSE-696]
+ * See EclipsePlugin.writeAdditionalConfig() - inStream = file.getURL().openConnection().getInputStream()
*
* @since 2.5
* @throws Exception
@@ -736,6 +738,29 @@ public class EclipsePluginIT
{
testProject( "project-62-MECLIPSE-561" );
}
+
+ /**
+ * [MECLIPSE-338] Correct classpath ordering in .classpath
+ *
+ * @throws Exception
+ */
+ public void testProject63()
+ throws Exception
+ {
+ testProject( "project-63-MECLIPSE-388" );
+ }
+
+ /**
+ * [MECLIPSE-338] Correct classpath ordering in .classpath
+ *
+ * @throws Exception
+ */
+ public void testProject64()
+ throws Exception
+ {
+ testProject( "project-64-MECLIPSE-388" );
+ }
+
public void testGroovy()
throws Exception {
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.project?rev=1173952&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.project Thu Sep 22 05:53:22 2011
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ear-1.0-SNAPSHOT</name>
+ <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects>
+ <project>ejbs-1.0-SNAPSHOT</project>
+ <project>primary-source-1.0-SNAPSHOT</project>
+ <project>logging-1.0-SNAPSHOT</project>
+ <project>servlet-1.0-SNAPSHOT</project>
+ </projects>
+ <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
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.project
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.project
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.component?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.component (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.component Thu Sep 22 05:53:22 2011
@@ -3,13 +3,13 @@
<wb-module deploy-name="ear-1.0-SNAPSHOT">
<wb-resource deploy-path="/" source-path="target/eclipseEar"/>
<dependent-module archiveName="ejbs-1.0-SNAPSHOT.jar" deploy-path="/" handle="module:/resource/ejbs-1.0-SNAPSHOT/ejbs-1.0-SNAPSHOT">
- <dependent-object>EjbModule_16200795</dependent-object>
+ <dependent-object>EjbModule_000000</dependent-object>
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="logging-1.0-SNAPSHOT.jar" deploy-path="/" handle="module:/resource/logging-1.0-SNAPSHOT/logging-1.0-SNAPSHOT">
+ <dependent-module archiveName="primary-source-1.0-SNAPSHOT.jar" deploy-path="/" handle="module:/resource/primary-source-1.0-SNAPSHOT/primary-source-1.0-SNAPSHOT">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="primary-source-1.0-SNAPSHOT.jar" deploy-path="/" handle="module:/resource/primary-source-1.0-SNAPSHOT/primary-source-1.0-SNAPSHOT">
+ <dependent-module archiveName="logging-1.0-SNAPSHOT.jar" deploy-path="/" handle="module:/resource/logging-1.0-SNAPSHOT/logging-1.0-SNAPSHOT">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="servlet-1.0-SNAPSHOT.war" deploy-path="/" handle="module:/resource/servlet-1.0-SNAPSHOT/servlet-1.0-SNAPSHOT">
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/.modulemaps
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/.modulemaps?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/.modulemaps (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/.modulemaps Thu Sep 22 05:53:22 2011
@@ -1,10 +1,10 @@
<?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_0000000">
- <mappings projectName="ejbs-1.0-SNAPSHOT" xmi:id="ModuleMapping_16200795">
+ <mappings projectName="ejbs-1.0-SNAPSHOT" xmi:id="ModuleMapping_000000">
<module xmi:type="application:EjbModule" href="META-INF/application.xml#EjbModule_00000000"/>
</mappings>
- <utilityJARMappings uri="logging-1.0-SNAPSHOT.jar" projectName="logging-1.0-SNAPSHOT" xmi:id="UtilityJARMapping_0000000"/>
- <utilityJARMappings uri="primary-source-1.0-SNAPSHOT.jar" projectName="primary-source-1.0-SNAPSHOT" xmi:id="UtilityJARMapping_0000000"/>
+ <utilityJARMappings uri="primary-source-1.0-SNAPSHOT.jar" projectName="primary-source-1.0-SNAPSHOT" xmi:id="UtilityJARMapping_25658023"/>
+ <utilityJARMappings uri="logging-1.0-SNAPSHOT.jar" projectName="logging-1.0-SNAPSHOT" xmi:id="UtilityJARMapping_26400260"/>
<mappings projectName="servlet-1.0-SNAPSHOT" xmi:id="ModuleMapping_00000000">
<module xmi:type="application:WebModule" href="META-INF/application.xml#WebModule_00000000"/>
</mappings>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.classpath?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.classpath Thu Sep 22 05:53:22 2011
@@ -5,8 +5,8 @@
<classpathentry kind="src" path="target/generated-resources/eclipse"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="/primary-source-1.0-SNAPSHOT"/>
+ <classpathentry kind="src" path="/logging-1.0-SNAPSHOT"/>
<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.1/geronimo-ejb_2.1_spec-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/logging-1.0-SNAPSHOT"/>
- <classpathentry kind="src" path="/primary-source-1.0-SNAPSHOT"/>
</classpath>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.project?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.project (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.project Thu Sep 22 05:53:22 2011
@@ -3,8 +3,8 @@
<name>ejbs-1.0-SNAPSHOT</name>
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
- <project>logging-1.0-SNAPSHOT</project>
<project>primary-source-1.0-SNAPSHOT</project>
+ <project>logging-1.0-SNAPSHOT</project>
</projects>
<buildSpec>
<buildCommand>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath Thu Sep 22 05:53:22 2011
@@ -5,6 +5,6 @@
<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-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="src" path="/logging-1.0-SNAPSHOT"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
</classpath>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.classpath?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.classpath Thu Sep 22 05:53:22 2011
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/logging-1.0-SNAPSHOT"/>
<classpathentry kind="src" path="/primary-source-1.0-SNAPSHOT"/>
+ <classpathentry kind="src" path="/logging-1.0-SNAPSHOT"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
</classpath>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.project?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.project (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.project Thu Sep 22 05:53:22 2011
@@ -3,8 +3,8 @@
<name>servlet-1.0-SNAPSHOT</name>
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
- <project>logging-1.0-SNAPSHOT</project>
<project>primary-source-1.0-SNAPSHOT</project>
+ <project>logging-1.0-SNAPSHOT</project>
</projects>
<buildSpec>
<buildCommand>
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath?rev=1173952&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath Thu Sep 22 05:53:22 2011
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0-tests.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-test-sources.jar"/>
+</classpath>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.wtpmodules
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.wtpmodules?rev=1173952&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.wtpmodules (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.wtpmodules Thu Sep 22 05:53:22 2011
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId">
+ <wb-module deploy-name="maven-eclipse-plugin-test-project-7">
+ <module-type module-type-id="jst.web">
+ <version>2.4</version>
+ <property name="context-root" value="maven-eclipse-plugin-test-project-7"/>
+ </module-type>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+ <dependent-module archiveName="maven-core-98.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="maven-core-98.0-tests.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/maven/maven-core/98.0/maven-core-98.0-tests.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath?rev=1173952&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath Thu Sep 22 05:53:22 2011
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0-tests.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-test-sources.jar"/>
+</classpath>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath?rev=1173952&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath Thu Sep 22 05:53:22 2011
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="target/generated-resources/eclipse"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="/multymodule-4-1.0"/>
+ <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="var" path="M2_REPO/eclipsetest/refproject-test/1.0/refproject-test-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-provided/1.0/refproject-provided-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-optional/1.0/refproject-optional-1.0.jar"/>
+ <classpathentry kind="lib" path="refproject-sysdep.jar"/>
+</classpath>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.classpath
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=1173952&r1=1173951&r2=1173952&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 22 05:53:22 2011
@@ -3,7 +3,9 @@
<classpathentry kind="src" path="src/main/java" including="**/*.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-direct-compile/1.0/deps-direct-compile-1.0.jar">
+ <classpathentry kind="src" path="/prefix-multymodule-1-1.0"/>
+ <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>
@@ -13,25 +15,23 @@
<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"/>
<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">
+ <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/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="src" path="/prefix-multymodule-1-1.0"/>
- <classpathentry kind="src" path="/multymodule-4-1.0"/>
- <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.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-optional/1.0/direct-optional-1.0.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="${basedir}/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar"/>
+ <classpathentry kind="lib" path="direct-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/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component Thu Sep 22 05:53:22 2011
@@ -4,31 +4,31 @@
<property name="context-root" value="/multymodule-2-1.0"/>
<wb-resource deploy-path="/" source-path="src/main/webapp"/>
<property name="java-output-path" value="/target/classes"/>
- <dependent-module archiveName="deps-direct-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar">
+ <dependent-module archiveName="prefix-multymodule-1-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/prefix-multymodule-1-1.0/prefix-multymodule-1-1.0">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="deps-refproject-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar">
+ <dependent-module archiveName="multymodule-4-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/multymodule-4-1.0/multymodule-4-1.0">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="direct-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar">
+ <dependent-module archiveName="refproject-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="direct-optional-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/direct-optional/1.0/direct-optional-1.0.jar">
+ <dependent-module archiveName="deps-refproject-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="direct-sysdep.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/direct-sysdep.jar">
+ <dependent-module archiveName="refproject-sysdep.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/D:/ide/maven/maven-eclipse-plugin/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="prefix-multymodule-1-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/prefix-multymodule-1-1.0/prefix-multymodule-1-1.0">
+ <dependent-module archiveName="direct-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="multymodule-4-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/multymodule-4-1.0/multymodule-4-1.0">
+ <dependent-module archiveName="deps-direct-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="refproject-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar">
+ <dependent-module archiveName="direct-optional-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/direct-optional/1.0/direct-optional-1.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="refproject-sysdep.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/${basedir}/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar">
+ <dependent-module archiveName="direct-sysdep.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/direct-sysdep.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
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=1173952&r1=1173951&r2=1173952&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 22 05:53:22 2011
@@ -1,6 +1,6 @@
-Manifest-Version: 1.0
-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 pr
- efix-multymodule-1-1.0.jar multymodule-4-1.0.jar refproject-compile-1
- .0.jar refproject-sysdep.jar
-
+Manifest-Version: 1.0
+Class-Path: prefix-multymodule-1-1.0.jar multymodule-4-1.0.jar refproj
+ ect-compile-1.0.jar deps-refproject-compile-1.0.jar refproject-sysdep
+ .jar direct-compile-1.0.jar deps-direct-compile-1.0.jar direct-option
+ al-1.0.jar direct-sysdep.jar
+
Modified: 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=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath Thu Sep 22 05:53:22 2011
@@ -4,6 +4,6 @@
<classpathentry kind="src" path="target/generated-resources/eclipse"/>
<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"/>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
</classpath>
\ No newline at end of file
Modified: 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=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF (original)
+++ 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 22 05:53:22 2011
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
-Class-Path: deps-refproject-compile-1.0.jar refproject-compile-1.0.jar
+Class-Path: refproject-compile-1.0.jar deps-refproject-compile-1.0.jar
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-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-35/multymodule-ear/expected/.settings/org.eclipse.wst.common.component?rev=1173952&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-ear/expected/.settings/org.eclipse.wst.common.component (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-ear/expected/.settings/org.eclipse.wst.common.component Thu Sep 22 05:53:22 2011
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="2.0">
+ <wb-module deploy-name="multymodule-ear-1.0">
+ <wb-resource deploy-path="/" source-path="target/eclipseEar"/>
+ <dependent-module archiveName="multymodule-war-1.0.war" deploy-path="/" handle="module:/resource/multymodule-war-1.0/multymodule-war-1.0">
+ <dependent-object>WebModule_00000000</dependent-object>
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="../maven-core-98.0.jar" deploy-path="lib" handle="module:/classpath/var/M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.classpath?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.classpath Thu Sep 22 05:53:22 2011
@@ -2,12 +2,12 @@
<classpath>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar">
+ <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-compile/1.0/direct-compile-1.0.jar">
+ <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>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.settings/org.eclipse.wst.common.component?rev=1173952&r1=1173951&r2=1173952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.settings/org.eclipse.wst.common.component (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.settings/org.eclipse.wst.common.component Thu Sep 22 05:53:22 2011
@@ -4,10 +4,10 @@
<property name="context-root" value="/somethingVeryDifferent"/>
<wb-resource deploy-path="/" source-path="src/main/webapp"/>
<property name="java-output-path" value="/target/classes"/>
- <dependent-module archiveName="deps-direct-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar">
+ <dependent-module archiveName="direct-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="direct-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar">
+ <dependent-module archiveName="deps-direct-compile-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
</wb-module>
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath?rev=1173952&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath Thu Sep 22 05:53:22 2011
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="/direct-compile"/>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar"/>
+</classpath>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.classpath
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath?rev=1173952&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath Thu Sep 22 05:53:22 2011
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.3"/>
+ <classpathentry kind="src" path="/direct-compile"/>
+ <classpathentry kind="var" path="M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar"/>
+</classpath>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.classpath
------------------------------------------------------------------------------
svn:mime-type = text/plain