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 2009/06/21 09:11:21 UTC
svn commit: r786945 [1/4] - in /maven/plugins/trunk/maven-eclipse-plugin: ./
src/test/java/org/apache/maven/plugin/eclipse/it/
src/test/resources/projects/j2ee-simple/ear/expected/
src/test/resources/projects/j2ee-simple/ear/expected/.settings/ src/tes...
Author: baerrach
Date: Sun Jun 21 07:11:14 2009
New Revision: 786945
URL: http://svn.apache.org/viewvc?rev=786945&view=rev
Log:
IT overhaul.
- All manually coded comparisons removed and replaced with files in the "expected" directory - this now checks a lot more than the manual tests did.
- Created verification script to check that any generated files have a corresponding expected file.
If the expected file is missing then the generated file is used as a "seed" and copied into the src/test/resources for future use.
The seeded files need to be checked to make sure they are useful and then added to source control.
Added:
maven/plugins/trunk/maven-eclipse-plugin/maven-antrun.bsh (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/
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/j2ee-simple/ear/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.jdt.core.prefs
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/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/
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/ear/expected/target/eclipseEar/META-INF/application.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/servlets/servlet/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-1/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.wtpmodules
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-26/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-26/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-26/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-26/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-26/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-26/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-27/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-27/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-27/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-31/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-31/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-32/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (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-34/multymodule-1/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/
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/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-ear/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-ear/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-ear/expected/.settings/
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-35/multymodule-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-ear/expected/target/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-ear/expected/target/eclipseEar/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-ear/expected/target/eclipseEar/META-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-ear/expected/target/eclipseEar/META-INF/.modulemaps
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-ear/expected/target/eclipseEar/META-INF/application.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-35/multymodule-war/expected/.settings/
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-35/multymodule-war/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/
- copied from r782461, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39/
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-a/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-a/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/
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-b/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/pom.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-b/src/main/java/DummyClass.txt (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/expected/
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-39-c/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/pom.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39-c/src/main/java/DummyClass.txt (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-a/
- copied from r782461, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40/
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/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/expected/
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-b/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/pom.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-b/src/main/java/DummyClass.txt (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/expected/
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-40-c/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/pom.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40-c/src/main/java/DummyClass.txt (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/target/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/target/eclipseEar/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/target/eclipseEar/META-INF/
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-41/expected/target/eclipseEar/META-INF/application.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-42/expected/target/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-42/expected/target/eclipseEar/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-42/expected/target/eclipseEar/META-INF/
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-42/expected/target/eclipseEar/META-INF/application.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-43/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-43/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-43/expected/.wtpmodules
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.settings/org.eclipse.jdt.core.prefs
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-51-MECLIPSE-415/multymodule-1/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.jdt.core.prefs
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/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/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/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/expected/.j2ee
- copied unchanged from r782461, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/j2ee
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/expected/.project
- copied, changed from r782461, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/expected/META-INF/
- copied from r782461, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/META-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/.j2ee
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/.websettings
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/.website-config
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/src/main/webapp/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/src/main/webapp/META-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/expected/src/main/webapp/META-INF/MANIFEST.MF
- copied unchanged from r782461, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/src/main/webapp/META-INF/expected_MANIFEST.MF
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/actual/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/actual/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/ejbModule/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/ejbModule/expected/META-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/ejbModule/expected/META-INF/MANIFEST.MF
- copied unchanged from r782461, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/ejbModule/META-INF/expected_MANIFEST.MF
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/expected/.j2ee
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-4/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-4/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-4/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/expected/.j2ee
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/expected/META-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/expected/META-INF/.modulemaps
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/expected/META-INF/application.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/expected/maven-core-98.0.jar
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/expected/.j2ee
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/expected/.websettings
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/expected/.website-config
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/ejbModule/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/ejbModule/expected/META-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/ejbModule/expected/META-INF/MANIFEST.MF
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/expected/.j2ee
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/.modulemaps
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.j2ee
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.website-config
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.classpath (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.j2ee
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.project (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.websettings
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.website-config
maven/plugins/trunk/maven-eclipse-plugin/verify-integration-tests-checks.bsh (with props)
Removed:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-39/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-40/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/META-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/j2ee
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/settings
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/src/main/webapp/META-INF/expected_MANIFEST.MF
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/websettings
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/ejbModule/META-INF/expected_MANIFEST.MF
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/j2ee
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-4/classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-4/project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/META-INF-2/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/project
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
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/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/expected/META-INF/.modulemaps
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-1/expected/META-INF/application.xml
Added: maven/plugins/trunk/maven-eclipse-plugin/maven-antrun.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/maven-antrun.bsh?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/maven-antrun.bsh (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/maven-antrun.bsh Sun Jun 21 07:11:14 2009
@@ -0,0 +1,7 @@
+addMavenClasspath() {
+ maven_plugin_classpath = project.getReference("maven.test.classpath");
+ paths = maven_plugin_classpath.list();
+ for( path : paths ) {
+ addClassPath( path );
+ }
+}
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/maven-antrun.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/maven-antrun.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=786945&r1=786944&r2=786945&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Jun 21 07:11:14 2009
@@ -214,6 +214,41 @@
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>verify-integration-tests-checks</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <script language="beanshell" src="verify-integration-tests-checks.bsh" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <version>2.0b4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
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=786945&r1=786944&r2=786945&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 Sun Jun 21 07:11:14 2009
@@ -262,20 +262,48 @@
protected void testProject( String projectName, Properties properties, String cleanGoal, String genGoal )
throws Exception
{
+ testProject( projectName, properties, cleanGoal, genGoal, false );
+ }
+
+ /**
+ * Execute the eclipse:eclipse goal on a test project and verify generated files.
+ *
+ * @param projectName project directory
+ * @param properties additional properties
+ * @param cleanGoal TODO
+ * @param genGoal TODO
+ * @param withInstall true to include the install goal, false to exclude it.
+ * @throws Exception any exception generated during test
+ */
+ protected void testProject( String projectName, Properties properties, String cleanGoal, String genGoal, boolean withInstall )
+ throws Exception
+ {
File basedir = getTestFile( "target/test-classes/projects/" + projectName );
- testProject( basedir, properties, cleanGoal, genGoal );
+ testProject( basedir, properties, cleanGoal, genGoal, withInstall );
}
/**
+ * @param basedir Execute the eclipse:eclipse goal on a test project and verify generated files.
+ * @param properties additional properties
+ * @param cleanGoal TODO
+ * @param genGoal TODO
+ * @throws Exception any exception generated during test
+ */
+ protected void testProject( File basedir, Properties properties, String cleanGoal, String genGoal ) throws Exception {
+ testProject( basedir, properties, cleanGoal, genGoal, false );
+ }
+
+ /**
* Execute the eclipse:eclipse goal on a test project and verify generated files.
*
* @param basedir basedir of mvn execution
* @param properties additional properties
* @param cleanGoal TODO
* @param genGoal TODO
+ * @param withInstall true to include the install goal, false to exclude it.
* @throws Exception any exception generated during test
*/
- protected void testProject( File basedir, Properties properties, String cleanGoal, String genGoal )
+ protected void testProject( File basedir, Properties properties, String cleanGoal, String genGoal, boolean withInstall )
throws Exception
{
File pom = new File( basedir, "pom.xml" );
@@ -286,6 +314,9 @@
goals.add( pluginSpec + cleanGoal );
goals.add( pluginSpec + genGoal );
+ if ( withInstall ) {
+ goals.add( "install" );
+ }
executeMaven( pom, properties, goals );
@@ -544,7 +575,7 @@
* @param expectedFile the expected file - only used for path information
* @param expectedFileContents the contents of the expected file
* @param actualFile the actual file - only used for path information
- * @param actualFileContents the contents of the actual fiel
+ * @param actualFileContents the contents of the actual file
* @throws MojoExecutionException failures.
*/
private void assertXmlFileEquals( File expectedFile, String expectedFileContents, File actualFile,
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=786945&r1=786944&r2=786945&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 Sun Jun 21 07:11:14 2009
@@ -399,38 +399,6 @@
throws Exception
{
testProject( "project-35" );
-
- File basedir = getTestFile( "target/test-classes/projects/project-35" );
-
- checkContextRoot( basedir, "multymodule-war", "multymodule-ear", "/somethingVeryDifferent" );
-
- FileReader reader =
- new FileReader( new File( basedir, "multymodule-war/.settings/org.eclipse.wst.common.component" ) );
- Xpp3Dom warComponent = Xpp3DomBuilder.build( reader );
- Xpp3Dom[] dependentModules = warComponent.getChild( "wb-module" ).getChildren( "dependent-module" );
- assertEquals( 2, dependentModules.length );
- for ( int index = 0; index < dependentModules.length; index++ )
- {
- assertEquals( "/WEB-INF/lib", dependentModules[index].getAttribute( "deploy-path" ) );
- }
-
- reader = new FileReader( new File( basedir, "multymodule-ear/.settings/org.eclipse.wst.common.component" ) );
- Xpp3Dom earComponent = Xpp3DomBuilder.build( reader );
- dependentModules = earComponent.getChild( "wb-module" ).getChildren( "dependent-module" );
- assertEquals( 2, dependentModules.length );
- for ( int index = 0; index < dependentModules.length; index++ )
- {
- if ( dependentModules[index].getAttribute( "archiveName" ).endsWith( "war" ) )
- {
- assertEquals( "/", dependentModules[index].getAttribute( "deploy-path" ) );
- assertTrue( !dependentModules[index].getAttribute( "archiveName" ).startsWith( ".." ) );
- }
- else
- {
- assertEquals( "lib", dependentModules[index].getAttribute( "deploy-path" ) );
- assertTrue( dependentModules[index].getAttribute( "archiveName" ).startsWith( ".." ) );
- }
- }
}
public void testProject36()
@@ -467,26 +435,48 @@
testProject( "project-38" );
}
- public void testProject39()
+ public void testProject39_a()
+ throws Exception
+ {
+ checkJRESettingsWithEclipseWorkspace( "project-39-a", TempEclipseWorkspace.getFixtureEclipseWithDefault13(),
+ null );
+ }
+
+ public void testProject39_b()
+ throws Exception
+ {
+ checkJRESettingsWithEclipseWorkspace( "project-39-b", TempEclipseWorkspace.getFixtureEclipseWithDefault15(), null );
+ }
+
+ public void testProject39_c()
throws Exception
{
- checkJRESettingsWithEclipseWorkspace( "project-39", TempEclipseWorkspace.getFixtureEclipseWithDefault13(),
- "", null );
- checkJRESettingsWithEclipseWorkspace( "project-39", TempEclipseWorkspace.getFixtureEclipseWithDefault15(),
- "J2SE-1.3", null );
- checkJRESettingsWithEclipseWorkspace( "project-39", TempEclipseWorkspace.getFixtureEclipseWorkspaceWithRad7Default14(),
- "J2SE-1.3", null );
+ checkJRESettingsWithEclipseWorkspace( "project-39-c",
+ TempEclipseWorkspace.getFixtureEclipseWorkspaceWithRad7Default14(), null );
}
- public void testProject40()
+ public void testProject40_a()
+ throws Exception
+ {
+ String jre131 = new java.io.File( "target/test-classes/eclipse/dummyJDK/1.3.1/bin/javac" ).getCanonicalPath();
+ checkJRESettingsWithEclipseWorkspace( "project-40-a", TempEclipseWorkspace.getFixtureEclipseWithDefault13(),
+ jre131 );
+ }
+
+ public void testProject40_b()
throws Exception
{
String jre131 = new java.io.File( "target/test-classes/eclipse/dummyJDK/1.3.1/bin/javac" ).getCanonicalPath();
- checkJRESettingsWithEclipseWorkspace( "project-40", TempEclipseWorkspace.getFixtureEclipseWithDefault13(),
- "JVM 1.3.1", jre131 );
- checkJRESettingsWithEclipseWorkspace( "project-40", TempEclipseWorkspace.getFixtureEclipseWithDefault15(),
- "JVM 1.3.1", jre131 );
- checkJRESettingsWithEclipseWorkspace( "project-40", TempEclipseWorkspace.getFixtureEclipseWorkspaceWithRad7Default14(), "",
+ checkJRESettingsWithEclipseWorkspace( "project-40-b", TempEclipseWorkspace.getFixtureEclipseWithDefault15(),
+ jre131 );
+ }
+
+ public void testProject40_c()
+ throws Exception
+ {
+ String jre131 = new java.io.File( "target/test-classes/eclipse/dummyJDK/1.3.1/bin/javac" ).getCanonicalPath();
+ checkJRESettingsWithEclipseWorkspace( "project-40-c",
+ TempEclipseWorkspace.getFixtureEclipseWorkspaceWithRad7Default14(),
jre131 );
}
@@ -663,46 +653,10 @@
executeMaven( pom, new Properties(), goals );
// Test project
testProject( "j2ee-simple" );
- checkContextRoot( basedir, "servlets/servlet", "ear", "servlet" );
-
- }
-
- private void checkContextRoot( File basedir, String warModule, String earModule, String expectedContextRoot )
- throws FileNotFoundException, XmlPullParserException, IOException
- {
- FileReader reader =
- new FileReader( new File( basedir, warModule + "/.settings/org.eclipse.wst.common.component" ) );
- Xpp3Dom warComponent = Xpp3DomBuilder.build( reader );
- Xpp3Dom[] properties = warComponent.getChild( "wb-module" ).getChildren( "property" );
- boolean contextRootAvaliable = false;
- for ( int index = 0; index < properties.length; index++ )
- {
- if ( properties[index].getAttribute( "name" ).equals( "context-root" ) )
- {
- assertEquals( "Context root detection in org.eclipse.wst.common.component", expectedContextRoot,
- properties[index].getAttribute( "value" ) );
- contextRootAvaliable = true;
- }
- }
- assertTrue( "there must be a context root here", contextRootAvaliable );
-
- reader = new FileReader( new File( basedir, earModule + "/target/eclipseEar/META-INF/application.xml" ) );
- Xpp3Dom generatedApplicationXML = Xpp3DomBuilder.build( reader );
-
- Xpp3Dom[] modules = generatedApplicationXML.getChildren( "module" );
- for ( int index = 0; index < modules.length; index++ )
- {
- if ( modules[index].getChild( "web" ) != null )
- {
- assertEquals( "Context root detection in target/eclipseEar/META-INF/application.xml",
- expectedContextRoot,
- modules[index].getChild( "web" ).getChild( "context-root" ).getValue() );
- }
- }
}
private void checkJRESettingsWithEclipseWorkspace( String project, TempEclipseWorkspace workspace,
- String expectedJRE, String jreExec )
+ String jreExec )
throws Exception
{
Properties properties = new Properties();
@@ -712,29 +666,6 @@
properties.setProperty( "maven.compiler.executable", jreExec );
}
testProject( project, properties, "clean", "eclipse" );
-
- Xpp3Dom classpath =
- Xpp3DomBuilder.build( new FileReader( getTestFile( "target/test-classes/projects/" + project
- + "/.classpath" ) ) );
-
- boolean foundDirectCompileAsProject = false;
- String foundJRE = "";
-
- Xpp3Dom[] classpathentries = classpath.getChildren( "classpathentry" );
- for ( int index = 0; index < classpathentries.length; index++ )
- {
- if ( "/direct-compile".equals( classpathentries[index].getAttribute( "path" ) ) )
- {
- foundDirectCompileAsProject = true;
- }
- String path = classpathentries[index].getAttribute( "path" );
- if ( "con".equals( classpathentries[index].getAttribute( "kind" ) ) && path.lastIndexOf( '/' ) > 0 )
- {
- foundJRE = path.substring( path.lastIndexOf( '/' ) + 1 );
- }
- }
- assertTrue( foundDirectCompileAsProject );
- assertEquals( expectedJRE, foundJRE );
}
}
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=786945&r1=786944&r2=786945&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 Sun Jun 21 07:11:14 2009
@@ -19,28 +19,17 @@
package org.apache.maven.plugin.eclipse.it;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Properties;
-import org.apache.maven.plugin.eclipse.Constants;
-import org.apache.maven.plugin.ide.IdeUtils;
-import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @author <a href="mailto:berrach@apache.org">Barrie Treloar</a>
*/
public class RadPluginIT
extends AbstractEclipsePluginIT
{
-
- private static final String PROJECTS_BASEDIR = "target/test-classes/projects";
-
public void testProject1()
throws Exception
{
@@ -51,21 +40,12 @@
throws Exception
{
testProject( "project-rad-2", new Properties(), "rad-clean", "rad" );
- File generatedManifest = getTestFile( PROJECTS_BASEDIR + "/project-rad-2/src/main/webapp/META-INF/MANIFEST.MF" );
- File expectedManifest =
- getTestFile( PROJECTS_BASEDIR + "/project-rad-2/src/main/webapp/META-INF/expected_MANIFEST.MF" );
- assertFileEquals( expectedManifest, generatedManifest );
-
}
public void testProject3()
throws Exception
{
testProject( "project-rad-3", new Properties(), "rad-clean", "rad" );
- File generatedManifest = getTestFile( PROJECTS_BASEDIR + "/project-rad-3/ejbModule/META-INF/MANIFEST.MF" );
- File expectedManifest =
- getTestFile( PROJECTS_BASEDIR + "/project-rad-3/ejbModule/META-INF/expected_MANIFEST.MF" );
- assertFileEquals( expectedManifest, generatedManifest );
}
public void testProject4()
@@ -78,94 +58,9 @@
throws Exception
{
File basedir = getTestFile( "target/test-classes/projects/project-rad-5" );
-
FileUtils.deleteDirectory( new File( basedir, "project-rad-1/META-INF" ) );
new File( basedir, "project-rad-1/META-INF" ).mkdirs();
-
- File pom0 = new File( basedir, "pom.xml" );
-
- MavenProject project = readProject( pom0 );
-
- String outputDirPath =
- IdeUtils.getPluginSetting( project, "org.apache.maven.plugins:maven-eclipse-plugin", "outputDir", null );
- File outputDir;
-
- if ( outputDirPath == null )
- {
- outputDir = basedir;
- }
- else
- {
- outputDir = new File( basedir, outputDirPath );
- outputDir.mkdirs();
- new File( outputDir, project.getArtifactId() );
- }
-
- List goals = new ArrayList();
-
- String pluginSpec = getPluginCLISpecification();
-
- goals.add( pluginSpec + "rad-clean" );
- goals.add( pluginSpec + "rad" );
- goals.add( "install" );
-
- Properties props = new Properties();
-
- executeMaven( pom0, props, goals );
-
- assertTrue( "Expected file not found: project-rad-1/maven-core-98.0.jar",
- new File( basedir, "project-rad-1/maven-core-98.0.jar" ).exists() );
-
- Xpp3Dom applicationXml =
- Xpp3DomBuilder.build( new InputStreamReader(
- new FileInputStream(
- new File( basedir,
- "project-rad-1/META-INF/application.xml" ) ),
- "UTF-8" ) );
-
- Xpp3Dom modulesmapsXml =
- Xpp3DomBuilder.build( new InputStreamReader(
- new FileInputStream(
- new File( basedir,
- "project-rad-1/META-INF/.modulemaps" ) ),
- "UTF-8" ) );
-
- assertNotNull( modulesmapsXml );
-
- Xpp3Dom[] children = applicationXml.getChildren( "module" );
- assertEquals( 2, children.length );
- // The module children can be in ANY order.
- boolean ejbVerified = false;
- boolean warVerified = false;
- for ( int i = 0; i < children.length; i++ )
- {
- Xpp3Dom child = children[i];
-
- if ( child.getAttribute( "id" ).startsWith( "WebModule_" ) )
- {
- assertEquals( "project-rad-5_2.war", child.getChild( "web" ).getChild( "web-uri" ).getValue() );
- assertEquals( "project-rad-5_2", child.getChild( "web" ).getChild( "context-root" ).getValue() );
- warVerified = true;
- }
- else if ( child.getAttribute( "id" ).startsWith( "EjbModule_" ) )
- {
- assertEquals( "project-rad-5_3.jar", child.getChild( Constants.PROJECT_PACKAGING_EJB ).getValue() );
- ejbVerified = true;
- }
- }
- assertTrue( warVerified );
- assertTrue( ejbVerified );
-
- Xpp3Dom websettings =
- Xpp3DomBuilder.build( new InputStreamReader(
- new FileInputStream( new File( basedir,
- "project-rad-2/.websettings" ) ),
- "UTF-8" ) );
-
- assertEquals( "project-rad-5_4.jar",
- websettings.getChild( "lib-modules" ).getChild( "lib-module" ).getChild( "jar" ).getValue() );
- assertEquals( "project-rad-5_4",
- websettings.getChild( "lib-modules" ).getChild( "lib-module" ).getChild( "project" ).getValue() );
+ testProject( "project-rad-5", new Properties(), "rad-clean", "rad", true );
}
public void testProject6()
@@ -184,32 +79,8 @@
throws Exception
{
testProject( "project-rad-7", new Properties(), "rad-clean", "rad" );
-
- /*
- * testing libs in web content directory
- */
- File basedir = getTestFile( "target/test-classes/projects/project-rad-7" );
- File pom = new File( basedir, "pom.xml" );
- MavenProject project = readProject( pom );
- File outputDir;
- File projectOutputDir = basedir;
-
- String outputDirPath =
- IdeUtils.getPluginSetting( project, "org.apache.maven.plugins:maven-eclipse-plugin", "outputDir", null );
- if ( outputDirPath == null )
- {
- outputDir = basedir;
- }
- else
- {
- outputDir = new File( basedir, outputDirPath );
- outputDir.mkdirs();
- projectOutputDir = new File( outputDir, project.getArtifactId() );
- }
-
- compareDirectoryContent( basedir, projectOutputDir );
assertFalse( "Default path should not exist because it is overridden!",
- new File( basedir + "/src/main/webapp" ).exists() );
+ new File( getTestFile( "target/test-classes/projects/project-rad-7" ), "/src/main/webapp" ).exists() );
}
@@ -217,10 +88,5 @@
throws Exception
{
testProject( "project-rad-8", new Properties(), "rad-clean", "rad" );
- File generatedManifest = getTestFile( PROJECTS_BASEDIR + "/project-rad-8/src/main/webapp/META-INF/MANIFEST.MF" );
- File expectedManifest =
- getTestFile( PROJECTS_BASEDIR + "/project-rad-8/src/main/webapp/META-INF/expected_MANIFEST.MF" );
- assertFileEquals( expectedManifest, generatedManifest );
-
}
}
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=786945&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 Sun Jun 21 07:11:14 2009
@@ -0,0 +1,22 @@
+<projectDescription>
+ <name>ear-1.0-SNAPSHOT</name>
+ <comment/>
+ <projects>
+ <project>ejbs-1.0-SNAPSHOT</project>
+ <project>logging-1.0-SNAPSHOT</project>
+ <project>primary-source-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
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.jdt.core.prefs?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.jdt.core.prefs (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.jdt.core.prefs Sun Jun 21 07:11:14 2009
@@ -0,0 +1,5 @@
+#Sat Jun 20 07:44:55 CST 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
Added: 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=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.component (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.component Sun Jun 21 07:11:14 2009
@@ -0,0 +1,19 @@
+<project-modules id="moduleCoreId" project-version="2.0">
+ <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>
+ <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">
+ <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">
+ <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">
+ <dependent-object>WebModule_00000000</dependent-object>
+ <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/j2ee-simple/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/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml Sun Jun 21 07:11:14 2009
@@ -0,0 +1,4 @@
+<faceted-project>
+ <fixed facet="jst.ear"/>
+ <installed facet="jst.ear" version="1.4"/>
+</faceted-project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/.modulemaps (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/.modulemaps Sun Jun 21 07:11:14 2009
@@ -0,0 +1,11 @@
+<?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">
+ <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"/>
+ <mappings projectName="servlet-1.0-SNAPSHOT" xmi:id="ModuleMapping_00000000">
+ <module xmi:type="application:WebModule" href="META-INF/application.xml#WebModule_00000000"/>
+ </mappings>
+</modulemap:EARProjectMap>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/application.xml?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/application.xml Sun Jun 21 07:11:14 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>ear-1.0-SNAPSHOT</display-name>
+ <module id="EjbModule_00000000">
+ <ejb>ejbs-1.0-SNAPSHOT.jar</ejb>
+ </module>
+ <module id="WebModule_00000000">
+ <web>
+ <web-uri>servlet-1.0-SNAPSHOT.war</web-uri>
+ <context-root>servlet</context-root>
+ </web>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ear/expected/target/eclipseEar/META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.classpath Sun Jun 21 07:11:14 2009
@@ -0,0 +1,11 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="target/generated-resources/eclipse"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <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"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.project Sun Jun 21 07:11:14 2009
@@ -0,0 +1,25 @@
+<projectDescription>
+ <name>ejbs-1.0-SNAPSHOT</name>
+ <comment/>
+ <projects>
+ <project>logging-1.0-SNAPSHOT</project>
+ <project>primary-source-1.0-SNAPSHOT</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
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.project
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.jdt.core.prefs?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.jdt.core.prefs (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.jdt.core.prefs Sun Jun 21 07:11:14 2009
@@ -0,0 +1,5 @@
+#Sat Jun 20 07:44:54 CST 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/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/ejbs/expected/.settings/org.eclipse.wst.common.component?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.wst.common.component (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.wst.common.component Sun Jun 21 07:11:14 2009
@@ -0,0 +1,7 @@
+<project-modules id="moduleCoreId" project-version="2.0">
+ <wb-module deploy-name="ejbs-1.0-SNAPSHOT">
+ <wb-resource deploy-path="/" source-path="src/main/java"/>
+ <wb-resource deploy-path="/" source-path="src/main/resources"/>
+ <wb-resource deploy-path="/" source-path="target/generated-resources/eclipse"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/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/j2ee-simple/ejbs/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.wst.common.project.facet.core.xml Sun Jun 21 07:11:14 2009
@@ -0,0 +1,6 @@
+<faceted-project>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.ejb"/>
+ <installed facet="jst.ejb" version="2.1"/>
+ <installed facet="jst.java" version="1.4"/>
+</faceted-project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/ejbs/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/expected/.project?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/expected/.project Sun Jun 21 07:11:14 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>j2ee-simple</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/expected/.project
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath Sun Jun 21 07:11:14 2009
@@ -0,0 +1,9 @@
+<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="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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.project?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.project Sun Jun 21 07:11:14 2009
@@ -0,0 +1,24 @@
+<projectDescription>
+ <name>primary-source-1.0-SNAPSHOT</name>
+ <comment/>
+ <projects>
+ <project>logging-1.0-SNAPSHOT</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
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.project
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.jdt.core.prefs?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.jdt.core.prefs (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.jdt.core.prefs Sun Jun 21 07:11:14 2009
@@ -0,0 +1,5 @@
+#Sat Jun 20 07:44:54 CST 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/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/primary-source/expected/.settings/org.eclipse.wst.common.component?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.wst.common.component (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.wst.common.component Sun Jun 21 07:11:14 2009
@@ -0,0 +1,6 @@
+<project-modules id="moduleCoreId" project-version="2.0">
+ <wb-module deploy-name="primary-source-1.0-SNAPSHOT">
+ <wb-resource deploy-path="/" source-path="src/main/java"/>
+ <wb-resource deploy-path="/" source-path="target/generated-resources/eclipse"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/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/j2ee-simple/primary-source/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.wst.common.project.facet.core.xml Sun Jun 21 07:11:14 2009
@@ -0,0 +1,6 @@
+<faceted-project>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.utility"/>
+ <installed facet="jst.utility" version="1.0"/>
+ <installed facet="jst.java" version="1.4"/>
+</faceted-project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/primary-source/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.classpath?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.classpath Sun Jun 21 07:11:14 2009
@@ -0,0 +1,6 @@
+<classpath>
+ <classpathentry kind="src" path="target/generated-resources/eclipse"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.project?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.project Sun Jun 21 07:11:14 2009
@@ -0,0 +1,22 @@
+<projectDescription>
+ <name>logging-1.0-SNAPSHOT</name>
+ <comment/>
+ <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
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.project
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.settings/org.eclipse.jdt.core.prefs?rev=786945&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.settings/org.eclipse.jdt.core.prefs (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/j2ee-simple/projects/logging/expected/.settings/org.eclipse.jdt.core.prefs Sun Jun 21 07:11:14 2009
@@ -0,0 +1,5 @@
+#Sat Jun 20 07:44:53 CST 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4