You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ep...@apache.org on 2004/10/08 17:46:48 UTC

cvs commit: maven-plugins/eclipse/xdocs changes.xml

epugh       2004/10/08 08:46:48

  Modified:    eclipse/src/plugin-resources/templates classpath.jelly
               eclipse/xdocs changes.xml
  Log:
  MPECLIPSE-46 Overriden jar that resides outside maven repo doesn't get resolved properly
  
  Revision  Changes    Path
  1.22      +7 -1      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- classpath.jelly	24 Sep 2004 15:51:01 -0000	1.21
  +++ classpath.jelly	8 Oct 2004 15:46:48 -0000	1.22
  @@ -150,7 +150,13 @@
           <j:set var="isClasspath" value="${lib.dependency.isAddedToClasspath()}"/>
           <j:if test="${isClasspath}">
             <maven:makeRelativePath var="relativePath" basedir="${maven.repo.local}" path="${lib.path}"/>
  -          <classpathentry kind="var" path="MAVEN_REPO/${relativePath}"/>
  +          <u:file var="checkExist" name="${maven.repo.local}/${relativePath}" />
  +          <j:if test="${checkExist.exists()}">
  +            <classpathentry kind="var" path="MAVEN_REPO/${relativePath}"/>
  +	      </j:if>
  +          <j:if test="${!checkExist.exists()}">
  +	        <classpathentry kind="lib" path="${lib.path}"/>
  +	      </j:if>
           </j:if>
         </j:otherwise>
       </j:choose>
  
  
  
  1.31      +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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- changes.xml	24 Sep 2004 15:51:01 -0000	1.30
  +++ changes.xml	8 Oct 2004 15:46:48 -0000	1.31
  @@ -25,6 +25,7 @@
     </properties>
     <body>
       <release version="1.9" date="in cvs">
  +      <action dev="epugh" type="fix" issue="MPECLIPSE-46" due-to="Archimedes Trajano">Overriden jar that resides outside maven repo doesn't get resolved properly.</action>
         <action dev="epugh" type="fix" issue="MPECLIPSE-38">Jar overrides are now properly supported.</action>
       </release>
       <release version="1.8" date="2004-08-14">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org