Author: fgiust
Date: Mon Oct 31 09:44:27 2005
New Revision: 329869
URL: http://svn.apache.org/viewcvs?rev=329869&view=rev
Log:
final fix for expected results
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/wtpmodules
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java?rev=329869&r1=329868&r2=329869&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
Mon Oct 31 09:44:27 2005
@@ -73,12 +73,18 @@
executeMaven2CommandLine( basedir );
assertFileEquals( null, new File( basedir, "module-1/project" ), new
File( basedir, "module-1/.project" ) );
+
+ // @fixme missing direct optional dependency
assertFileEquals( null, new File( basedir, "module-1/classpath" ), new
File( basedir, "module-1/.classpath" ) );
assertFileEquals( null, new File( basedir, "module-1/wtpmodules" ),
new File( basedir, "module-1/.wtpmodules" ) );
// the real test: this should include any sort of direct/transitive
dependency handled by mvn
assertFileEquals( null, new File( basedir, "module-2/project" ), new
File( basedir, "module-2/.project" ) );
+
+ // @fixme missing direct optional dependency + unneeded transitive
dependencies
assertFileEquals( null, new File( basedir, "module-2/classpath" ), new
File( basedir, "module-2/.classpath" ) );
+
+ // @fixme the list of dependencies in .wtpmodules should be the same
added by the war plugin
assertFileEquals( null, new File( basedir, "module-2/wtpmodules" ),
new File( basedir, "module-2/.wtpmodules" ) );
}
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath?rev=329869&r1=329868&r2=329869&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath
Mon Oct 31 09:44:27 2005
@@ -4,7 +4,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/refproject-test/1.0/refproject-test-1.0.jar"/>
- <classpathentry kind="lib"
path="D:/apps/maven-2/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/refproject-sysdep.jar"/>
+ <classpathentry kind="lib"
path="${basedir}/src/test/projects/master-test/module-1/refproject-sysdep.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-provided/1.0/refproject-provided-1.0.jar"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/refproject-optional/1.0/refproject-optional-1.0.jar"/>
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath?rev=329869&r1=329868&r2=329869&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath
Mon Oct 31 09:44:27 2005
@@ -3,13 +3,10 @@
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/direct-provided/1.0/direct-provided-1.0.jar"/>
- <classpathentry kind="lib"
path="D:/apps/maven-2/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/direct-sysdep.jar"/>
- <classpathentry kind="var"
path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
+ <classpathentry kind="lib"
path="${basedir}/src/test/projects/master-test/module-2/direct-sysdep.jar"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/direct-test/1.0/direct-test-1.0.jar"/>
- <classpathentry kind="lib"
path="D:/apps/maven-2/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/refproject-sysdep.jar"/>
<classpathentry kind="src" path="/module-1"/>
<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/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/direct-optional/1.0/direct-optional-1.0.jar"/>
</classpath>
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/wtpmodules
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/wtpmodules?rev=329869&r1=329868&r2=329869&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/wtpmodules
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/wtpmodules
Mon Oct 31 09:44:27 2005
@@ -1,31 +1,34 @@
-<project-modules id="moduleCoreId">
- <wb-module deploy-name="module-2">
- <module-type module-type-id="jst.web">
- <version>2.4</version>
- <property name="context-root" value="module-2"/>
- </module-type>
- <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
- <dependent-module deploy-path="/WEB-INF/lib"
handle="module:/classpath/var/M2_REPO/eclipsetest/direct-provided/1.0/direct-provided-1.0.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module deploy-path="/WEB-INF/lib"
handle="module:/classpath/var/M2_REPO/D:/apps/maven-2/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/direct-sysdep.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module 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 deploy-path="/WEB-INF/lib"
handle="module:/classpath/var/M2_REPO/eclipsetest/direct-test/1.0/direct-test-1.0.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module deploy-path="/WEB-INF/lib"
handle="module:/classpath/var/M2_REPO/D:/apps/maven-2/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/refproject-sysdep.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module deploy-path="/WEB-INF/lib"
handle="module:/resource/module-1/module-1">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module 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>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
- </wb-module>
+<project-modules id="moduleCoreId">
+ <wb-module deploy-name="module-2">
+ <module-type module-type-id="jst.web">
+ <version>2.4</version>
+ <property name="context-root" value="module-2"/>
+ </module-type>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+ <dependent-module deploy-path="/WEB-INF/lib"
handle="module:/classpath/lib/${basedir}/src/test/projects/master-test/module-2/direct-sysdep.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module 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 deploy-path="/WEB-INF/lib"
handle="module:/classpath/lib/${basedir}/src/test/projects/master-test/module-1/refproject-sysdep.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib"
handle="module:/resource/module-1/module-1">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module 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 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 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 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>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
+ </wb-module>
</project-modules>
