From 4c524848138e692eb1775d64e88b4c9a86d87560 Mon Sep 17 00:00:00 2001
From: Fabrizio Giustina <fgiust@apache.org>
Date: Mon, 31 Oct 2005 17:44:27 +0000
Subject: [PATCH] final fix for expected results

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@329869 13f79535-47bb-0310-9956-ffa450edef68
---
 .../EclipsePluginMasterProjectTest.java       |  6 ++
 .../projects/master-test/module-1/classpath   |  2 +-
 .../projects/master-test/module-2/classpath   |  5 +-
 .../projects/master-test/module-2/wtpmodules  | 63 ++++++++++---------
 4 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java b/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
index 3b5cf4cf54..a706e2eedc 100644
--- a/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
+++ b/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
@@ -73,12 +73,18 @@ public class EclipsePluginMasterProjectTest
         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" ) );
 
     }
diff --git a/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath b/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath
index bc03521bae..5684624dbf 100644
--- a/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath
+++ b/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath
@@ -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"/>
diff --git a/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath b/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath
index b4259b5529..fa355c055d 100644
--- a/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath
+++ b/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath
@@ -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>
\ No newline at end of file
diff --git a/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/wtpmodules b/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/wtpmodules
index f6a5fe0df9..280d0f2c9d 100644
--- a/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/wtpmodules
+++ b/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/wtpmodules
@@ -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>
\ No newline at end of file