jvanzyl     2002/07/11 11:53:09

  Modified:    src/bin  driver.jelly
  Log:
  o This change adds support for the 'Craig' feature :-)
  
    If you have:
  
    maven.jar.override = on
  
    set then you can specify properties like the following:
  
    maven.jar.commons-beanutils = /path/to/commons-beanutils.jar
    maven.jar.commons-digester = /path/to/commons-digester.jar
  
    And they will override the dependency specified in the POM.
  
    This is preliminary but is working and shouldn't affect anyone
    because the maven.jar.override needs to be present and on and
    you need the special properties as well.
  
  Revision  Changes    Path
  1.16      +23 -1     jakarta-turbine-maven/src/bin/driver.jelly
  
  Index: driver.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/bin/driver.jelly,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- driver.jelly      11 Jul 2002 16:05:30 -0000      1.15
  +++ driver.jelly      11 Jul 2002 18:53:09 -0000      1.16
  @@ -130,9 +130,31 @@
   
     <path id="maven.dependency.classpath">
       <j:forEach var="dep" items="${pom.dependencies}">
  -      <pathelement location="${maven.repo.local}/${dep.id}/jars/${dep.jar}"/>
  +      <j:choose>
  +        <j:when test="${maven.jar.override == 'on'}">
  +          <j:set var="maven.jar.property__" value="maven.jar.${dep.id}"/>
  +          <j:set var="jar__" value="${context.getVariable(value__)}"/>
  +          <j:set var="test__" value="${jar__}X"/>
  +          <j:choose>
  +            <j:when test="${test__ != 'X'}">
  +              <pathelement location="${jar__}"/>
  +            </j:when>
  +            <j:otherwise>
  +              <pathelement 
location="${maven.repo.local}/${dep.id}/jars/${dep.jar}"/>
  +            </j:otherwise>
  +          </j:choose>
  +        </j:when>
  +        <j:otherwise>
  +          <pathelement location="${maven.repo.local}/${dep.id}/jars/${dep.jar}"/>
  +        </j:otherwise>
  +      </j:choose>
       </j:forEach>
     </path>
  +
  +  <property 
  +    name="maven.dependency.classpath"
  +    refid="maven.dependency.classpath"
  +  />
   
     <path id="maven-classpath">
       <fileset dir="${maven.home}/lib"/>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to