cvs commit: maven-plugins/javadoc plugin.jelly

[aheritier]

aheritier    2004/05/25 15:18:22

  Modified:    javadoc  plugin.jelly
  Log:
  use a reference to maven.compile.src.set instead of the property.
  
  Revision  Changes    Path
  1.41      +8 -20     maven-plugins/javadoc/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- plugin.jelly      24 May 2004 05:11:17 -0000      1.40
  +++ plugin.jelly      25 May 2004 22:18:22 -0000      1.41
  @@ -73,21 +73,7 @@
           
           <j:otherwise>
   
  -          <maven:get 
  -            var="maven.compile.src.set" 
  -            plugin="maven-java-plugin" 
  -            property="maven.compile.src.set"
  -            />
  -  
  -          <!-- Retreive the value of the property ${maven.compile.src.set} -->
  -          <j:if test="${maven.compile.src.set != null}">
  -            <j:set scope="parent" var="maven.compile.src.set" 
value="${maven.compile.src.set}"/>
  -          </j:if>
  -  
  -          <!-- If the property ${maven.compile.src.set} isn't defined we use 
${pom.build.sourceDirectory} -->
  -          <j:if test="${maven.compile.src.set == null}">
  -            <j:set scope="parent" var="maven.compile.src.set" 
value="${pom.build.sourceDirectory}"/>
  -          </j:if>
  +                                     <ant:property 
name="maven.javadoc.compile.src.set" refid="maven.compile.src.set"/>
   
             <!-- Create a patternset for source modifications -->
             <patternset id="source.modifications">
  @@ -107,7 +93,7 @@
             </patternset>
   
             <!-- Tokenize the set of directories -->
  -          <util:tokenize var="sources.dirs" 
delim="${path.separator}">${maven.compile.src.set}</util:tokenize>
  +          <util:tokenize var="sources.dirs" 
delim="${path.separator}">${maven.javadoc.compile.src.set}</util:tokenize>
             
             <!-- Counter used to name filesets -->
             <j:set var="src.set.counter" value="0"/>
  @@ -130,7 +116,7 @@
     
                 <j:set var="src.set.counter" value="${src.set.counter + 1}"/>
               </j:if>
  -          </j:forEach> <!-- dir in maven.compile.src.set -->
  +          </j:forEach> <!-- dir in maven.javadoc.compile.src.set -->
   
           </j:otherwise>
         </j:choose>
  @@ -217,8 +203,10 @@
           useexternalfile="${maven.javadoc.useexternalfile}"
           >
   
  +        <ant:property name="maven.javadoc.compile.src.set" 
refid="maven.compile.src.set"/>
  +
           <!-- Tokenize the set of directories -->
  -        <util:tokenize var="sources.dirs" 
delim="${path.separator}">${maven.compile.src.set}</util:tokenize>
  +        <util:tokenize var="sources.dirs" 
delim="${path.separator}">${maven.javadoc.compile.src.set}</util:tokenize>
       
           <j:forEach var="dir" items="${sources.dirs}">
           
  @@ -227,7 +215,7 @@
               <patternset refid="source.modifications"/>
             </ant:fileset> 
   
  -        </j:forEach>--> <!-- dir in maven.compile.src.set -->        
  +        </j:forEach>--> <!-- dir in maven.javadoc.compile.src.set -->        
   
           <j:if test="${context.getVariable('maven.javadoc.source') != null}">
             <ant:setProperty name="source" value="${maven.javadoc.source}" />
  @@ -361,7 +349,7 @@
         <ant:copy todir="${maven.javadoc.destdir}">
           
           <util:tokenize var="sources.dirs" delim="${path.separator}">
  -          ${maven.compile.src.set}
  +          ${maven.javadoc.compile.src.set}
           </util:tokenize>
           
           <j:forEach var="dir" items="${sources.dirs}">      
  
  
  

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