You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2004/04/25 18:05:08 UTC
cvs commit: maven-plugins/eclipse/src/plugin-resources/templates classpath.jelly
dion 2004/04/25 09:05:08
Modified: eclipse/xdocs changes.xml
eclipse/src/plugin-resources/templates classpath.jelly
Log:
Fix for MPECLIPSE-22, JRE Classpath not complete
Revision Changes Path
1.15 +1 -0 maven-plugins/eclipse/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/xdocs/changes.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- changes.xml 25 Apr 2004 03:15:28 -0000 1.14
+++ changes.xml 25 Apr 2004 16:05:08 -0000 1.15
@@ -26,6 +26,7 @@
<body>
<release version="1.7-SNAPSHOT" date="in CVS">
<action dev="brett" type="update" issue="MPECLIPSE-21">Honour sourceModifications in classpath file</action>
+ <action dev="dion" type="fix" issue="MPECLIPSE-22">used container for JRE classpath</action>
</release>
<release version="1.6" date="2004-03-10">
<action dev="vmassol" type="fix" issue="MPECLIPSE-15">Fixed Cactus support (there were problems due to the move of the Cactus plugin outside of the Maven project).</action>
1.12 +29 -29 maven-plugins/eclipse/src/plugin-resources/templates/classpath.jelly
Index: classpath.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/src/plugin-resources/templates/classpath.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- classpath.jelly 25 Apr 2004 03:15:28 -0000 1.11
+++ classpath.jelly 25 Apr 2004 16:05:08 -0000 1.12
@@ -115,36 +115,36 @@
<classpathentry kind="var" path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
</j:if>
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="eclipseDependency"
- value="${lib.dependency.getProperty('eclipse.dependency')}"/>
- <j:choose>
- <j:when test="${eclipseDependency == 'true'}">
- <classpathentry kind="src" path="/${lib.dependency.artifactId}"/>
- </j:when>
- <j:when test="${lib.dependency.groupId == 'junit'}">
- <!-- ignoring junit dependency as we've already created it -->
- </j:when>
- <j:otherwise>
- <!-- make sure it's a classpath dependency -->
- <j:set var="isClasspath" value="${lib.dependency.isAddedToClasspath()}"/>
- <j:if test="${isClasspath}">
- <classpathentry kind="var" path="MAVEN_REPO${lib.urlPath}"/>
- </j:if>
- </j:otherwise>
- </j:choose>
- </j:forEach>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="eclipseDependency"
+ value="${lib.dependency.getProperty('eclipse.dependency')}"/>
+ <j:choose>
+ <j:when test="${eclipseDependency == 'true'}">
+ <classpathentry kind="src" path="/${lib.dependency.artifactId}"/>
+ </j:when>
+ <j:when test="${lib.dependency.groupId == 'junit'}">
+ <!-- ignoring junit dependency as we've already created it -->
+ </j:when>
+ <j:otherwise>
+ <!-- make sure it's a classpath dependency -->
+ <j:set var="isClasspath" value="${lib.dependency.isAddedToClasspath()}"/>
+ <j:if test="${isClasspath}">
+ <classpathentry kind="var" path="MAVEN_REPO${lib.urlPath}"/>
+ </j:if>
+ </j:otherwise>
+ </j:choose>
+ </j:forEach>
- <!-- add the unit test build directory so that any files generated via Maven are available -->
+ <!-- add the unit test build directory so that any files generated via Maven are available -->
- <j:set var="outputDir" value="${maven.eclipse.output.dir}"/>
- <j:if test="${empty outputDir}">
- <j:set var="outputDir" value="${maven.build.dest}"/>
- </j:if>
- <maven:makeRelativePath var="outputDir" basedir="${basedir}" path="${outputDir}" />
- <classpathentry kind="output" path="${outputDir}"/>
- <ant:echo>Setting default output directory to ${outputDir}</ant:echo>
- </classpath>
+ <j:set var="outputDir" value="${maven.eclipse.output.dir}"/>
+ <j:if test="${empty outputDir}">
+ <j:set var="outputDir" value="${maven.build.dest}"/>
+ </j:if>
+ <maven:makeRelativePath var="outputDir" basedir="${basedir}" path="${outputDir}" />
+ <classpathentry kind="output" path="${outputDir}"/>
+ <ant:echo>Setting default output directory to ${outputDir}</ant:echo>
+</classpath>
</j:whitespace>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org