From 4c8f23c0a0192c719ed21b3565149e98f5cf06f5 Mon Sep 17 00:00:00 2001
From: Brett Leslie Porter <brett@apache.org>
Date: Sun, 23 Oct 2005 20:14:59 +0000
Subject: [PATCH] PR: MNG-937 Submitted by: Johnny R. Ruiz III fix incorrect
 JRE classpath entry in eclipse .classpath file

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327852 13f79535-47bb-0310-9956-ffa450edef68
---
 .../plugin/eclipse/EclipseClasspathWriter.java |  6 ++----
 .../src/test/projects/project-1/classpath      | 12 ++++++------
 .../src/test/projects/project-2/classpath      | 18 +++++++++---------
 .../src/test/projects/project-3/classpath      | 14 +++++++-------
 .../src/test/projects/project-4/classpath      | 16 ++++++++--------
 .../src/test/projects/project-5/classpath      | 12 ++++++------
 .../src/test/projects/project-6/classpath      | 10 +++++-----
 7 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java b/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java
index 9fcfdaf806..d8ca44b93e 100644
--- a/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java
+++ b/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java
@@ -116,10 +116,8 @@ public class EclipseClasspathWriter
         // ----------------------------------------------------------------------
 
         writer.startElement( "classpathentry" ); //$NON-NLS-1$
-        writer.addAttribute( "kind", "var" ); //$NON-NLS-1$ //$NON-NLS-2$
-        writer.addAttribute( "rootpath", "JRE_SRCROOT" ); //$NON-NLS-1$ //$NON-NLS-2$
-        writer.addAttribute( "path", "JRE_LIB" ); //$NON-NLS-1$ //$NON-NLS-2$
-        writer.addAttribute( "sourcepath", "JRE_SRC" ); //$NON-NLS-1$ //$NON-NLS-2$
+        writer.addAttribute( "kind", "con" ); //$NON-NLS-1$ //$NON-NLS-2$
+        writer.addAttribute( "path", "org.eclipse.jdt.launching.JRE_CONTAINER" ); //$NON-NLS-1$ //$NON-NLS-2$
         writer.endElement();
 
         // ----------------------------------------------------------------------
diff --git a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/classpath b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/classpath
index 8842628275..94341a21e0 100644
--- a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/classpath
+++ b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/classpath
@@ -1,6 +1,6 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB" sourcepath="JRE_SRC"/>
-  <classpathentry kind="var" path="M2_REPO/maven/jars/maven-core-98.0.jar" sourcepath="M2_REPO/maven/java-sources/maven-core-98.0-sources.jar"/>
-</classpath>
+<classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/maven/jars/maven-core-98.0.jar" sourcepath="M2_REPO/maven/java-sources/maven-core-98.0-sources.jar"/>
+</classpath>
diff --git a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/classpath b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/classpath
index ba7e527a5e..250b7f370c 100644
--- a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/classpath
+++ b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/classpath
@@ -1,9 +1,9 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources"/>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
-  <classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB" sourcepath="JRE_SRC"/>
-  <classpathentry kind="var" path="M2_REPO/junit/jars/junit-2.0.jar"/>
-</classpath>
+<classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/jars/junit-2.0.jar"/>
+</classpath>
diff --git a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/classpath b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/classpath
index b5cac3a5ee..a4c4693978 100644
--- a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/classpath
+++ b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/classpath
@@ -1,8 +1,8 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources" output="target/main-resources"/>
-  <classpathentry kind="src" path="src/test/resources" output="target/test-output-dir"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB" sourcepath="JRE_SRC"/>
-  <classpathentry kind="var" path="M2_REPO/junit/jars/junit-2.0.jar"/>
+<classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources" output="target/main-resources"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-output-dir"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/jars/junit-2.0.jar"/>
 </classpath>
\ No newline at end of file
diff --git a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/classpath b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/classpath
index cb84627c22..61fa88b932 100644
--- a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/classpath
+++ b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/classpath
@@ -1,9 +1,9 @@
-<classpath>
-  <classpathentry kind="src" path="src-main-java"/>
-  <classpathentry kind="src" path="src-main-resources" output="target/main-resources"/>
-  <classpathentry kind="src" path="src-test-java" output="target/test-classes-dir"/>
-  <classpathentry kind="src" path="src-test-resources" output="target/test-classes-dir"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB" sourcepath="JRE_SRC"/>
-  <classpathentry kind="var" path="M2_REPO/junit/jars/junit-2.0.jar"/>
+<classpath>
+  <classpathentry kind="src" path="src-main-java"/>
+  <classpathentry kind="src" path="src-main-resources" output="target/main-resources"/>
+  <classpathentry kind="src" path="src-test-java" output="target/test-classes-dir"/>
+  <classpathentry kind="src" path="src-test-resources" output="target/test-classes-dir"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/jars/junit-2.0.jar"/>
 </classpath>
\ No newline at end of file
diff --git a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/classpath b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/classpath
index 8842628275..94341a21e0 100644
--- a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/classpath
+++ b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/classpath
@@ -1,6 +1,6 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB" sourcepath="JRE_SRC"/>
-  <classpathentry kind="var" path="M2_REPO/maven/jars/maven-core-98.0.jar" sourcepath="M2_REPO/maven/java-sources/maven-core-98.0-sources.jar"/>
-</classpath>
+<classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/maven/jars/maven-core-98.0.jar" sourcepath="M2_REPO/maven/java-sources/maven-core-98.0-sources.jar"/>
+</classpath>
diff --git a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/classpath b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/classpath
index a51b722676..fb6ca29ab4 100644
--- a/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/classpath
+++ b/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/classpath
@@ -1,6 +1,6 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB" sourcepath="JRE_SRC"/>
-  <classpathentry kind="var" path="M2_REPO/maven/jars/maven-core-98.0.jar" sourcepath="M2_REPO/maven/java-sources/maven-core-98.0-sources.jar"/>
+<classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/maven/jars/maven-core-98.0.jar" sourcepath="M2_REPO/maven/java-sources/maven-core-98.0-sources.jar"/>
 </classpath>
\ No newline at end of file