Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for MPECLIPSE-22, JRE Classpath not complete

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115048 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
dion 2004-04-25 16:05:08 +00:00
parent e8bf7f313a
commit bc1eb8a3ac
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
eclipse/src/plugin-resources/templates/classpath.jelly
View File

@ -115,36 +115,36 @@
<classpathentry kind="var" path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/> <classpathentry kind="var" path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
</j:if> </j:if>
<classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<j:forEach var="lib" items="${pom.artifacts}"> <j:forEach var="lib" items="${pom.artifacts}">
<j:set var="eclipseDependency" <j:set var="eclipseDependency"
value="${lib.dependency.getProperty('eclipse.dependency')}"/> value="${lib.dependency.getProperty('eclipse.dependency')}"/>
<j:choose> <j:choose>
<j:when test="${eclipseDependency == 'true'}"> <j:when test="${eclipseDependency == 'true'}">
<classpathentry kind="src" path="/${lib.dependency.artifactId}"/> <classpathentry kind="src" path="/${lib.dependency.artifactId}"/>
</j:when> </j:when>
<j:when test="${lib.dependency.groupId == 'junit'}"> <j:when test="${lib.dependency.groupId == 'junit'}">
<!-- ignoring junit dependency as we've already created it --> <!-- ignoring junit dependency as we've already created it -->
</j:when> </j:when>
<j:otherwise> <j:otherwise>
<!-- make sure it's a classpath dependency --> <!-- make sure it's a classpath dependency -->
<j:set var="isClasspath" value="${lib.dependency.isAddedToClasspath()}"/> <j:set var="isClasspath" value="${lib.dependency.isAddedToClasspath()}"/>
<j:if test="${isClasspath}"> <j:if test="${isClasspath}">
<classpathentry kind="var" path="MAVEN_REPO${lib.urlPath}"/> <classpathentry kind="var" path="MAVEN_REPO${lib.urlPath}"/>
</j:if> </j:if>
</j:otherwise> </j:otherwise>
</j:choose> </j:choose>
</j:forEach> </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:set var="outputDir" value="${maven.eclipse.output.dir}"/>
<j:if test="${empty outputDir}"> <j:if test="${empty outputDir}">
<j:set var="outputDir" value="${maven.build.dest}"/> <j:set var="outputDir" value="${maven.build.dest}"/>
</j:if> </j:if>
<maven:makeRelativePath var="outputDir" basedir="${basedir}" path="${outputDir}" /> <maven:makeRelativePath var="outputDir" basedir="${basedir}" path="${outputDir}" />
<classpathentry kind="output" path="${outputDir}"/> <classpathentry kind="output" path="${outputDir}"/>
<ant:echo>Setting default output directory to ${outputDir}</ant:echo> <ant:echo>Setting default output directory to ${outputDir}</ant:echo>
</classpath> </classpath>
</j:whitespace> </j:whitespace>

1
eclipse/xdocs/changes.xml
View File

@ -26,6 +26,7 @@
<body> <body>
<release version="1.7-SNAPSHOT" date="in CVS"> <release version="1.7-SNAPSHOT" date="in CVS">
<action dev="brett" type="update" issue="MPECLIPSE-21">Honour sourceModifications in classpath file</action> <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>
<release version="1.6" date="2004-03-10"> <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> <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>