maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r327852 - in /maven/components/trunk/maven-plugins/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ test/projects/project-1/ test/projects/project-2/ test/projects/project-3/ test/projects/project-4/ test/projects/projec...
Date Sun, 23 Oct 2005 20:15:06 GMT
Author: brett
Date: Sun Oct 23 13:14:59 2005
New Revision: 327852

URL: http://svn.apache.org/viewcvs?rev=327852&view=rev
Log:
PR: MNG-937
Submitted by: Johnny R. Ruiz III
fix incorrect JRE classpath entry in eclipse .classpath file

Modified:
    maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java
    maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/classpath
    maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/classpath
    maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/classpath
    maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/classpath
    maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/classpath
    maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/classpath

Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java?rev=327852&r1=327851&r2=327852&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java
(original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseClasspathWriter.java
Sun Oct 23 13:14:59 2005
@@ -116,10 +116,8 @@
         // ----------------------------------------------------------------------
 
         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();
 
         // ----------------------------------------------------------------------

Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/classpath
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/classpath?rev=327852&r1=327851&r2=327852&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/classpath
(original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/classpath
Sun Oct 23 13:14:59 2005
@@ -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>

Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/classpath
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/classpath?rev=327852&r1=327851&r2=327852&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/classpath
(original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/classpath
Sun Oct 23 13:14:59 2005
@@ -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>

Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/classpath
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/classpath?rev=327852&r1=327851&r2=327852&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/classpath
(original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/classpath
Sun Oct 23 13:14:59 2005
@@ -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>

Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/classpath
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/classpath?rev=327852&r1=327851&r2=327852&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/classpath
(original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/classpath
Sun Oct 23 13:14:59 2005
@@ -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>

Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/classpath
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/classpath?rev=327852&r1=327851&r2=327852&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/classpath
(original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/classpath
Sun Oct 23 13:14:59 2005
@@ -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>

Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/classpath
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/classpath?rev=327852&r1=327851&r2=327852&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/classpath
(original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/classpath
Sun Oct 23 13:14:59 2005
@@ -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>



Mime
View raw message