dion        2002/06/06 08:19:36

  Modified:    src/templates/build/plugins/docs build.xml
               src/templates/build/plugins/iutest build.xml
               src/templates/build/plugins/metrics build.xml
               src/templates/build/plugins/j2ee build.xml
               src/templates/build/plugins/reactor build.xml
  Log:
  Rework callback mechanism
  
  Revision  Changes    Path
  1.13      +354 -242  jakarta-turbine-maven/src/templates/build/plugins/docs/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/docs/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml 6 Jun 2002 15:04:00 -0000       1.12
  +++ build.xml 6 Jun 2002 15:19:35 -0000       1.13
  @@ -58,6 +58,237 @@
       <mkdir dir="${maven.jxr.destdir}"/>
       <mkdir dir="${maven.javadoc.destdir}"/>
   
  +    <!-- activity-log -->
  +    <condition property="maven.docs.callback.pre-activity-log.ok">
  +      <and>
  +        <available file="${maven.docs.callback.pre-activity-log.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.pre-activity-log.buildTarget}"
  +                  arg2="$${maven.docs.callback.pre-activity-log.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.docs.callback.post-activity-log.ok">
  +      <and>
  +        <available file="${maven.docs.callback.post-activity-log.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.post-activity-log.buildTarget}"
  +                  arg2="$${maven.docs.callback.post-activity-log.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <!-- change-log -->
  +    <condition property="maven.docs.callback.pre-change-log.ok">
  +      <and>
  +        <available file="${maven.docs.callback.pre-change-log.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.pre-change-log.buildTarget}"
  +                  arg2="$${maven.docs.callback.pre-change-log.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.docs.callback.post-change-log.ok">
  +      <and>
  +        <available file="${maven.docs.callback.post-change-log.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.post-change-log.buildTarget}"
  +                  arg2="$${maven.docs.callback.post-change-log.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <!-- cross-ref -->
  +    <condition property="maven.docs.callback.pre-cross-ref.ok">
  +      <and>
  +        <available file="${maven.docs.callback.pre-cross-ref.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.pre-cross-ref.buildTarget}"
  +                  arg2="$${maven.docs.callback.pre-cross-ref.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.docs.callback.post-cross-ref.ok">
  +      <and>
  +        <available file="${maven.docs.callback.post-cross-ref.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.post-cross-ref.buildTarget}"
  +                  arg2="$${maven.docs.callback.post-cross-ref.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +
  +    <!-- deploy-site -->
  +    <condition property="maven.docs.callback.pre-deploy-site.ok">
  +      <and>
  +        <available file="${maven.docs.callback.pre-deploy-site.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.pre-deploy-site.buildTarget}"
  +                  arg2="$${maven.docs.callback.pre-deploy-site.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.docs.callback.post-deploy-site.ok">
  +      <and>
  +        <available file="${maven.docs.callback.post-deploy-site.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.post-deploy-site.buildTarget}"
  +                  arg2="$${maven.docs.callback.post-deploy-site.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +
  +    <!-- docs -->
  +    <condition property="maven.docs.callback.pre-docs.ok">
  +      <and>
  +        <available file="${maven.docs.callback.pre-docs.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.pre-docs.buildTarget}"
  +                  arg2="$${maven.docs.callback.pre-docs.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.docs.callback.post-docs.ok">
  +      <and>
  +        <available file="${maven.docs.callback.post-docs.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.post-docs.buildTarget}"
  +                  arg2="$${maven.docs.callback.post-docs.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <!-- docs-quick -->
  +    <condition property="maven.docs.callback.pre-docs-quick.ok">
  +      <and>
  +        <available file="${maven.docs.callback.pre-docs-quick.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.pre-docs-quick.buildTarget}"
  +                  arg2="$${maven.docs.callback.pre-docs-quick.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.docs.callback.post-docs-quick.ok">
  +      <and>
  +        <available file="${maven.docs.callback.post-docs-quick.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.post-docs-quick.buildTarget}"
  +                  arg2="$${maven.docs.callback.post-docs-quick.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +
  +    <!-- fo -->
  +    <condition property="maven.docs.callback.pre-fo.ok">
  +      <and>
  +        <available file="${maven.docs.callback.pre-fo.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.pre-fo.buildTarget}"
  +                  arg2="$${maven.docs.callback.pre-fo.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.docs.callback.post-fo.ok">
  +      <and>
  +        <available file="${maven.docs.callback.post-fo.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.post-fo.buildTarget}"
  +                  arg2="$${maven.docs.callback.post-fo.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +
  +    <!-- javadocs -->
  +    <condition property="maven.docs.callback.pre-javadocs.ok">
  +      <and>
  +        <available file="${maven.docs.callback.pre-javadocs.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.pre-javadocs.buildTarget}"
  +                  arg2="$${maven.docs.callback.pre-javadocs.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.docs.callback.post-javadocs.ok">
  +      <and>
  +        <available file="${maven.docs.callback.post-javadocs.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.post-javadocs.buildTarget}"
  +                  arg2="$${maven.docs.callback.post-javadocs.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +
  +    <!-- pdf -->
  +    <condition property="maven.docs.callback.pre-pdf.ok">
  +      <and>
  +        <available file="${maven.docs.callback.pre-pdf.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.pre-pdf.buildTarget}"
  +                  arg2="$${maven.docs.callback.pre-pdf.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.docs.callback.post-pdf.ok">
  +      <and>
  +        <available file="${maven.docs.callback.post-pdf.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.post-pdf.buildTarget}"
  +                  arg2="$${maven.docs.callback.post-pdf.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <!-- site -->
  +    <condition property="maven.docs.callback.pre-site.ok">
  +      <and>
  +        <available file="${maven.docs.callback.pre-site.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.pre-site.buildTarget}"
  +                  arg2="$${maven.docs.callback.pre-site.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.docs.callback.post-site.ok">
  +      <and>
  +        <available file="${maven.docs.callback.post-site.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.post-site.buildTarget}"
  +                  arg2="$${maven.docs.callback.post-site.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +
  +    <!-- task-list -->
  +    <condition property="maven.docs.callback.pre-task-list.ok">
  +      <and>
  +        <available file="${maven.docs.callback.pre-task-list.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.pre-task-list.buildTarget}"
  +                  arg2="$${maven.docs.callback.pre-task-list.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.docs.callback.post-task-list.ok">
  +      <and>
  +        <available file="${maven.docs.callback.post-task-list.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.docs.callback.post-task-list.buildTarget}"
  +                  arg2="$${maven.docs.callback.post-task-list.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +
     </target>
   
     <target
  @@ -68,28 +299,16 @@
       description="o Generate html project documentation xdoc sources">
     </target>
     
  -  <target name="pre-docs-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.pre-docs.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.pre-docs.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-docs.buildTarget" />
  -    </maven-ant>
  -  </target>
  -  
  -  <target name="post-docs-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.post-docs.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.post-docs.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.post-docs.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-docs-callback" if="maven.docs.callback.pre-docs.ok">
  +    <maven-ant antfile="${maven.docs.callback.pre-docs.buildFile}" 
  +      target="${maven.docs.callback.pre-docs.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
  +  </target>
  +  
  +  <target name="post-docs-callback" if="maven.docs.callback.post-docs.ok">
  +    <maven-ant antfile="${maven.docs.callback.post-docs.buildFile}" 
  +      target="${maven.docs.callback.post-docs.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <target
  @@ -99,28 +318,18 @@
       description="o Generates documentation that are quickly generated.">
     </target>
   
  -  <target name="pre-docs-quick-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.pre-docs-quick.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.pre-docs-quick.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-docs-quick.buildTarget" />
  -    </maven-ant>
  -  </target>
  -  
  -  <target name="post-docs-quick-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.post-docs-quick.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.post-docs-quick.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.post-docs-quick.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-docs-quick-callback"
  +    if="maven.docs.callback.pre-docs-quick.ok">
  +    <maven-ant antfile="${maven.docs.callback.pre-docs-quick.buildFile}" 
  +      target="${maven.docs.callback.pre-docs-quick.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
  +  </target>
  +  
  +  <target name="post-docs-quick-callback"
  +    if="maven.docs.callback.post-docs-quick.ok">
  +    <maven-ant antfile="${maven.docs.callback.post-docs-quick.buildFile}" 
  +      target="${maven.docs.callback.post-docs-quick.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     
  @@ -159,28 +368,18 @@
       name="cross-ref"
       
depends="local-init,pre-cross-ref-callback,do-cross-ref,post-cross-ref-callback"/>
   
  -  <target name="pre-cross-ref-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.pre-cross-ref.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.pre-cross-ref.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-cross-ref.buildTarget" />
  -    </maven-ant>
  -  </target>
  -  
  -  <target name="post-cross-ref-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.post-cross-ref.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.post-cross-ref.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.post-cross-ref.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-cross-ref-callback"
  +    if="maven.docs.callback.pre-cross-ref.ok">
  +    <maven-ant antfile="${maven.docs.callback.pre-cross-ref.buildFile}" 
  +      target="${maven.docs.callback.pre-cross-ref.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
  +  </target>
  +  
  +  <target name="post-cross-ref-callback"
  +    if="maven.docs.callback.post-cross-ref.ok">
  +    <maven-ant antfile="${maven.docs.callback.post-cross-ref.buildFile}" 
  +      target="${maven.docs.callback.post-cross-ref.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <target
  @@ -212,28 +411,18 @@
       depends="local-init, pre-task-list-callback, do-task-list,
         post-task-list-callback"/>
   
  -  <target name="pre-task-list-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.pre-task-list.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.pre-task-list.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-task-list.buildTarget" />
  -    </maven-ant>
  -  </target>
  -  
  -  <target name="post-task-list-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.post-task-list.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.post-task-list.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-task-list.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-task-list-callback"
  +    if="maven.docs.callback.pre-task-list.ok">
  +    <maven-ant antfile="${maven.docs.callback.pre-task-list.buildFile}" 
  +      target="${maven.docs.callback.pre-task-list.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
  +  </target>
  +  
  +  <target name="post-task-list-callback"
  +    if="maven.docs.callback.post-task-list.ok">
  +    <maven-ant antfile="${maven.docs.callback.post-task-list.buildFile}" 
  +      target="${maven.docs.callback.post-task-list.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <target name="do-task-list">
  @@ -256,28 +445,18 @@
       depends="local-init, pre-change-log-callback, do-change-log, 
         post-change-log-callback"/>
   
  -  <target name="pre-change-log-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.pre-change-log.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.pre-change-log.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-change-log.buildTarget" />
  -    </maven-ant>
  -  </target>
  -  
  -  <target name="post-change-log-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.post-change-log.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.post-change-log.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.post-change-log.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-change-log-callback"
  +    if="maven.docs.callback.pre-change-log.ok">
  +    <maven-ant antfile="${maven.docs.callback.pre-change-log.buildFile}" 
  +      target="${maven.docs.callback.pre-change-log.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
  +  </target>
  +  
  +  <target name="post-change-log-callback"
  +    if="maven.docs.callback.post-change-log.ok">
  +    <maven-ant antfile="${maven.docs.callback.post-change-log.buildFile}" 
  +      target="${maven.docs.callback.post-change-log.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <target name="do-change-log">
  @@ -301,28 +480,18 @@
       depends="local-init, pre-activity-log-callback, do-activity-log,
         post-activity-log-callback"/>
   
  -  <target name="pre-activity-log-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.pre-activity-log.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.pre-activity-log.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-activity-log.buildTarget" />
  -    </maven-ant>
  -  </target>
  -  
  -  <target name="post-activity-log-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.post-activity-log.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.post-activity-log.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.post-activity-log.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-activity-log-callback"
  +    if="maven.docs.callback.pre-activity-log.ok">
  +    <maven-ant antfile="${maven.docs.callback.pre-activity-log.buildFile}" 
  +      target="${maven.docs.callback.pre-activity-log.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
  +  </target>
  +  
  +  <target name="post-activity-log-callback"
  +    if="maven.docs.callback.post-activity-log.ok">
  +    <maven-ant antfile="${maven.docs.callback.post-activity-log.buildFile}" 
  +      target="${maven.docs.callback.post-activity-log.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <target name="do-activity-log">
  @@ -521,28 +690,16 @@
       depends="local-init, pre-fo-callback, do-fo, post-fo-callback"
       description="o Generate XSL:FO project documentation"/>
   
  -  <target name="pre-fo-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.pre-fo.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.pre-fo.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-fo.buildTarget" />
  -    </maven-ant>
  -  </target>
  -  
  -  <target name="post-fo-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.post-fo.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.post-fo.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.post-fo.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-fo-callback" if="maven.docs.callback.pre-fo.ok">
  +    <maven-ant antfile="${maven.docs.callback.pre-fo.buildFile}" 
  +      target="${maven.docs.callback.pre-fo.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
  +  </target>
  +  
  +  <target name="post-fo-callback" if="maven.docs.callback.post-fo.ok">
  +    <maven-ant antfile="${maven.docs.callback.post-fo.buildFile}" 
  +      target="${maven.docs.callback.post-fo.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
     
     <target name="do-fo">
  @@ -576,28 +733,16 @@
       depends="fo, pre-pdf-callback, do-pdf, post-pdf-callback"
       description="o Generate PDF project documentation"/>
   
  -  <target name="pre-pdf-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.pre-pdf.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.pre-pdf.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-pdf.buildTarget" />
  -    </maven-ant>
  -  </target>
  -  
  -  <target name="post-pdf-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.post-pdf.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.post-pdf.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.post-pdf.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-pdf-callback" if="maven.docs.callback.pre-pdf.ok">
  +    <maven-ant antfile="${maven.docs.callback.pre-pdf.buildFile}" 
  +      target="${maven.docs.callback.pre-pdf.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
  +  </target>
  +  
  +  <target name="post-pdf-callback" if="maven.docs.callback.post-pdf.ok">
  +    <maven-ant antfile="${maven.docs.callback.post-pdf.buildFile}" 
  +      target="${maven.docs.callback.post-pdf.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
     
     <target name="do-pdf">
  @@ -623,28 +768,16 @@
       name="site"
       depends="local-init, pre-site-callback, do-site, post-site-callback"/>
   
  -  <target name="pre-site-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.pre-site.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.pre-site.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-site.buildTarget" />
  -    </maven-ant>
  -  </target>
  -  
  -  <target name="post-site-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.post-site.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.post-site.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.post-site.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-site-callback" if="maven.docs.callback.pre-site.ok">
  +    <maven-ant antfile="${maven.docs.callback.pre-site.buildFile}" 
  +      target="${maven.docs.callback.pre-site.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
  +  </target>
  +  
  +  <target name="post-site-callback" if="maven.docs.callback.post-site.ok">
  +    <maven-ant antfile="${maven.docs.callback.post-site.buildFile}" 
  +      target="${maven.docs.callback.post-site.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
     
     <target
  @@ -677,28 +810,18 @@
       depends="check-maven-username, site, pre-deploy-site-callback,
         do-deploy-site, post-deploy-site-callback"/>
   
  -  <target name="pre-deploy-site-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.pre-deploy-site.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.pre-deploy-site.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-deploy-site.buildTarget" />
  -    </maven-ant>
  -  </target>
  -  
  -  <target name="post-deploy-site-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.post-deploy-site.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.post-deploy-site.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.post-deploy-site.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-deploy-site-callback"
  +    if="maven.docs.callback.pre-deploy-site.ok">
  +    <maven-ant antfile="${maven.docs.callback.pre-deploy-site.buildFile}" 
  +      target="${maven.docs.callback.pre-deploy-site.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
  +  </target>
  +  
  +  <target name="post-deploy-site-callback"
  +    if="maven.docs.callback.post-deploy-site.ok">
  +    <maven-ant antfile="${maven.docs.callback.post-deploy-site.buildFile}" 
  +      target="${maven.docs.callback.post-deploy-site.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
       
  @@ -741,28 +864,17 @@
         post-javadocs-callback"
       description="o Generates the Javadoc API documentation"/>
   
  -  <target name="pre-javadocs-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.pre-javadocs.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.pre-javadocs.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.pre-javadocs.buildTarget" />
  -    </maven-ant>
  -  </target>
  -  
  -  <target name="post-javadocs-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.docs.callback.post-javadocs.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.docs.callback.post-javadocs.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.docs.callback.post-javadocs.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-javadocs-callback" if="maven.docs.callback.pre-javadocs.ok">
  +    <maven-ant antfile="${maven.docs.callback.pre-javadocs.buildFile}" 
  +      target="${maven.docs.callback.pre-javadocs.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
  +  </target>
  +  
  +  <target name="post-javadocs-callback"
  +    if="maven.docs.callback.post-javadocs.ok">
  +    <maven-ant antfile="${maven.docs.callback.post-javadocs.buildFile}" 
  +      target="${maven.docs.callback.post-javadocs.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <target
  
  
  
  1.7       +31 -21    
jakarta-turbine-maven/src/templates/build/plugins/iutest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/iutest/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml 6 Jun 2002 15:04:00 -0000       1.6
  +++ build.xml 6 Jun 2002 15:19:36 -0000       1.7
  @@ -60,6 +60,28 @@
          tomcat.home ----> ${maven.tomcat.home}
          test.port ------> ${maven.test.port}
       </echo>
  +    
  +    <!-- iutest -->
  +    <condition property="maven.iutest.callback.pre-iutest.ok">
  +      <and>
  +        <available file="${maven.iutest.callback.pre-iutest.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.iutest.callback.pre-iutest.buildTarget}"
  +                  arg2="$${maven.iutest.callback.pre-iutest.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.iutest.callback.post-iutest.ok">
  +      <and>
  +        <available file="${maven.iutest.callback.post-iutest.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.iutest.callback.post-iutest.buildTarget}"
  +                  arg2="$${maven.iutest.callback.post-iutest.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +
     </target>
   
     <!-- ================================================================== -->
  @@ -97,19 +119,13 @@
   
     <target 
       name="iutest"
  -    depends="init,pre-iutest-callback,do-iutest,post-iutest-callback"
  +    depends="iutest-init,pre-iutest-callback,do-iutest,post-iutest-callback"
       description="==> runs in-container tests via jakarta-cactus"/>
   
  -  <target name="pre-iutest-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportAll="false" exportRefs="false">
  -      <property name="buildFile" 
  -        value="${maven.iutest.callback.pre-iutest.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.iutest.callback.pre-iutest.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.iutest.callback.pre-iutest.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-iutest-callback" if="maven.iutest.callback.pre-iutest.ok">
  +    <maven-ant antfile="${maven.iutest.callback.pre-iutest.buildFile}" 
  +      target="${maven.iutest.callback.pre-iutest.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>  
       
     <target 
  @@ -118,16 +134,10 @@
       if="maven.integrationUnitTestSourceDirectory">
     </target>
   
  -  <target name="post-iutest-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportAll="false" exportRefs="false">
  -      <property name="buildFile" 
  -        value="${maven.iutest.callback.post-iutest.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.iutest.callback.post-iutest.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.iutest.callback.post-iutest.buildTarget" />
  -    </maven-ant>
  +  <target name="post-iutest-callback" if="maven.iutest.callback.post-iutest.ok">
  +    <maven-ant antfile="${maven.iutest.callback.post-iutest.buildFile}" 
  +      target="${maven.iutest.callback.post-iutest.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>  
   
     <target
  
  
  
  1.8       +30 -20    
jakarta-turbine-maven/src/templates/build/plugins/metrics/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/metrics/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml 6 Jun 2002 15:04:00 -0000       1.7
  +++ build.xml 6 Jun 2002 15:19:36 -0000       1.8
  @@ -50,6 +50,26 @@
       depends="init">
   
       <mkdir dir="${maven.build.dest}"/>
  +    <!-- metrics -->
  +    <condition property="maven.metrics.callback.pre-metrics.ok">
  +      <and>
  +        <available file="${maven.metrics.callback.pre-metrics.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.metrics.callback.pre-metrics.buildTarget}"
  +                  arg2="$${maven.metrics.callback.pre-metrics.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.metrics.callback.post-metrics.ok">
  +      <and>
  +        <available file="${maven.metrics.callback.post-metrics.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.metrics.callback.post-metrics.buildTarget}"
  +                  arg2="$${maven.metrics.callback.post-metrics.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
   
     </target>
   
  @@ -74,28 +94,18 @@
       depends="local-init,pre-metrics-callback,do-metrics,post-metrics-callback"
       description="o Gathers the code metrics"/>
   
  -  <target name="pre-metrics-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
  -      <property name="buildFile" 
  -        value="${maven.metrics.callback.pre-metrics.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.metrics.callback.pre-metrics.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.metrics.callback.pre-metrics.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-metrics-callback"
  +    if="maven.metrics.callback.pre-metrics.ok">
  +    <maven-ant antfile="${maven.metrics.callback.pre-metrics.buildFile}" 
  +      target="${maven.metrics.callback.pre-metrics.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
     
  -  <target name="post-metrics-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportAll="false" exportRefs="false">
  -      <property name="buildFile" 
  -        value="${maven.metrics.callback.post-metrics.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.metrics.callback.post-metrics.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.metrics.callback.post-metrics.buildTarget" />
  -    </maven-ant>
  +  <target name="post-metrics-callback"
  +    if="maven.metrics.callback.post-metrics.ok">
  +    <maven-ant antfile="${maven.metrics.callback.post-metrics.buildFile}" 
  +      target="${maven.metrics.callback.post-metrics.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
       
     <target
  
  
  
  1.17      +119 -80   jakarta-turbine-maven/src/templates/build/plugins/j2ee/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/j2ee/build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.xml 6 Jun 2002 15:04:00 -0000       1.16
  +++ build.xml 6 Jun 2002 15:19:36 -0000       1.17
  @@ -48,6 +48,91 @@
     <target name="local-init" depends="init">
       <!-- Pick up tool specific defaults -->
       <property file="${maven.home}/plugins/j2ee/default.properties"/>
  +    
  +    <!-- ear -->
  +    <condition property="maven.j2ee.callback.pre-ear.ok">
  +      <and>
  +        <available file="${maven.j2ee.callback.pre-ear.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.j2ee.callback.pre-ear.buildTarget}"
  +                  arg2="$${maven.j2ee.callback.pre-ear.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.j2ee.callback.post-ear.ok">
  +      <and>
  +        <available file="${maven.j2ee.callback.post-ear.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.j2ee.callback.post-ear.buildTarget}"
  +                  arg2="$${maven.j2ee.callback.post-ear.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <!-- ejb -->
  +    <condition property="maven.j2ee.callback.pre-ejb.ok">
  +      <and>
  +        <available file="${maven.j2ee.callback.pre-ejb.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.j2ee.callback.pre-ejb.buildTarget}"
  +                  arg2="$${maven.j2ee.callback.pre-ejb.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.j2ee.callback.post-ejb.ok">
  +      <and>
  +        <available file="${maven.j2ee.callback.post-ejb.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.j2ee.callback.post-ejb.buildTarget}"
  +                  arg2="$${maven.j2ee.callback.post-ejb.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <!-- validate-war -->
  +    <condition property="maven.j2ee.callback.pre-validate-war.ok">
  +      <and>
  +        <available file="${maven.j2ee.callback.pre-validate-war.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.j2ee.callback.pre-validate-war.buildTarget}"
  +                  arg2="$${maven.j2ee.callback.pre-validate-war.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.j2ee.callback.post-validate-war.ok">
  +      <and>
  +        <available file="${maven.j2ee.callback.post-validate-war.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.j2ee.callback.post-validate-war.buildTarget}"
  +                  arg2="$${maven.j2ee.callback.post-validate-war.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <!-- war -->
  +    <condition property="maven.j2ee.callback.pre-war.ok">
  +      <and>
  +        <available file="${maven.j2ee.callback.pre-war.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.j2ee.callback.pre-war.buildTarget}"
  +                  arg2="$${maven.j2ee.callback.pre-war.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +    
  +    <condition property="maven.j2ee.callback.post-war.ok">
  +      <and>
  +        <available file="${maven.j2ee.callback.post-war.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.j2ee.callback.post-war.buildTarget}"
  +                  arg2="$${maven.j2ee.callback.post-war.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +
     </target>
   
     <!-- ================================================================== -->
  @@ -97,16 +182,10 @@
     </target>
         
     <!-- process any user specified pre-war callback -->
  -  <target name="pre-war-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportAll="false" exportRefs="false">
  -      <property name="buildFile" 
  -        value="${maven.j2ee.callback.pre-war.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.j2ee.callback.pre-war.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.j2ee.callback.pre-war.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-war-callback" if="maven.j2ee.callback.pre-war.ok">
  +    <maven-ant antfile="${maven.j2ee.callback.pre-war.buildFile}" 
  +      target="${maven.j2ee.callback.pre-war.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
     
     <!-- build the war file from the various sources -->
  @@ -151,16 +230,10 @@
     </target>
     
     <!-- process any user specified post-war callback -->
  -  <target name="post-war-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportAll="false" exportRefs="false">
  -      <property name="buildFile" 
  -        value="${maven.j2ee.callback.post-war.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.j2ee.callback.post-war.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.j2ee.callback.post-war.buildTarget" />
  -    </maven-ant>
  +  <target name="post-war-callback" if="maven.j2ee.callback.post-war.ok">
  +    <maven-ant antfile="${maven.j2ee.callback.post-war.buildFile}" 
  +      target="${maven.j2ee.callback.post-war.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <!-- ================================================================== -->
  @@ -196,16 +269,11 @@
     </target>
     
     <!-- process any user specified pre-validate war callback -->
  -  <target name="pre-validate-war-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportAll="false" exportRefs="false">
  -      <property name="buildFile" 
  -        value="${maven.j2ee.callback.pre-validate-war.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.j2ee.callback.pre-validate-war.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.j2ee.callback.pre-validate-war.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-validate-war-callback"
  +    if="maven.j2ee.callback.pre-validate-war.ok">
  +    <maven-ant antfile="${maven.j2ee.callback.pre-validate-war.buildFile}" 
  +      target="${maven.j2ee.callback.pre-validate-war.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <!-- perform the validation using our custom task -->
  @@ -218,16 +286,11 @@
     </target>
   
     <!-- process any user specified post-validate war callback -->
  -  <target name="post-validate-war-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportAll="false" exportRefs="false">
  -      <property name="buildFile" 
  -        value="${maven.j2ee.callback.post-validate-war.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.j2ee.callback.post-validate-war.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.j2ee.callback.post-validate-war.buildTarget" />
  -    </maven-ant>
  +  <target name="post-validate-war-callback"
  +    if="maven.j2ee.callback.post-validate-war.ok">
  +    <maven-ant antfile="${maven.j2ee.callback.post-validate-war.buildFile}" 
  +      target="${maven.j2ee.callback.post-validate-war.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
       
     <!-- ================================================================== -->
  @@ -272,16 +335,10 @@
     </target>
           
     <!-- process any user specified pre ear callback -->
  -  <target name="pre-ear-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportAll="false" exportRefs="false">
  -      <property name="buildFile" 
  -        value="${maven.j2ee.callback.pre-ear.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.j2ee.callback.pre-ear.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.j2ee.callback.pre-ear.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-ear-callback" if="maven.j2ee.callback.pre-ear.ok">
  +    <maven-ant antfile="${maven.j2ee.callback.pre-ear.buildFile}" 
  +      target="${maven.j2ee.callback.pre-ear.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <!-- run the ear task -->
  @@ -315,16 +372,10 @@
     </target>
       
     <!-- process any user specified post ear callback -->
  -  <target name="post-ear-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportAll="false" exportRefs="false">
  -      <property name="buildFile" 
  -        value="${maven.j2ee.callback.post-ear.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.j2ee.callback.post-ear.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.j2ee.callback.post-ear.buildTarget" />
  -    </maven-ant>
  +  <target name="post-ear-callback" if="maven.j2ee.callback.post-ear.ok">
  +    <maven-ant antfile="${maven.j2ee.callback.post-ear.buildFile}" 
  +      target="${maven.j2ee.callback.post-ear.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <!-- ================================================================== -->
  @@ -371,16 +422,10 @@
     </target>
     
     <!-- process any user defined pre ejb jar callback -->
  -  <target name="pre-ejb-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportAll="false" exportRefs="false">
  -      <property name="buildFile" 
  -        value="${maven.j2ee.callback.pre-ejb.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.j2ee.callback.pre-ejb.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.j2ee.callback.pre-ejb.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-ejb-callback" if="maven.j2ee.callback.pre-ejb.ok">
  +    <maven-ant antfile="${maven.j2ee.callback.pre-ejb.buildFile}" 
  +      target="${maven.j2ee.callback.pre-ejb.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <!-- produce the ejb jar a remote and local jar -->
  @@ -509,16 +554,10 @@
     </target>
   
     <!-- process any user defined post ejb jar callback -->
  -  <target name="post-ejb-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritRefs="true" exportAll="false" exportRefs="false">
  -      <property name="buildFile" 
  -        value="${maven.j2ee.callback.post-ejb.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.j2ee.callback.post-ejb.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.j2ee.callback.post-ejb.buildTarget" />
  -    </maven-ant>
  +  <target name="post-ejb-callback" if="maven.j2ee.callback.post-ejb.ok">
  +    <maven-ant antfile="${maven.j2ee.callback.post-ejb.buildFile}" 
  +      target="${maven.j2ee.callback.post-ejb.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
       
   </project>
  
  
  
  1.6       +35 -21    
jakarta-turbine-maven/src/templates/build/plugins/reactor/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/reactor/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml 6 Jun 2002 15:04:00 -0000       1.5
  +++ build.xml 6 Jun 2002 15:19:36 -0000       1.6
  @@ -41,6 +41,30 @@
         
     </target>
   
  +  <target name="local-init">
  +    <!-- generate-reactor -->
  +    <condition property="maven.reactor.callback.pre-generate-reactor.ok">
  +      <and>
  +        <available file="${maven.reactor.callback.pre-generate-reactor.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.reactor.callback.pre-generate-reactor.buildTarget}"
  +                  
arg2="$${maven.reactor.callback.pre-generate-reactor.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +
  +    <condition property="maven.reactor.callback.post-generate-reactor.ok">
  +      <and>
  +        <available 
file="${maven.reactor.callback.post-generate-reactor.buildFile}"/>
  +        <not>
  +          <equals arg1="${maven.reactor.callback.post-generate-reactor.buildTarget}"
  +                  
arg2="$${maven.reactor.callback.post-generate-reactor.buildTarget}" />
  +        </not>
  +      </and>
  +    </condition>
  +
  +  </target>
  +  
     <!-- ================================================================== -->
     <!-- R E A C T O R  G E N E R A T O R                                   -->
     <!-- ================================================================== -->
  @@ -51,31 +75,21 @@
   
     <target 
       name="generate-reactor"
  -    depends="pre-generate-reactor-callback, do-generate-reactor, 
  +    depends="local-init, pre-generate-reactor-callback, do-generate-reactor, 
         post-generate-reactor-callback"/>
         
  -  <target name="pre-generate-reactor-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritAll="true" inheritRefs="true">
  -      <property name="buildFile" 
  -        value="${maven.reactor.callback.pre-generate-reactor.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.reactor.callback.pre-generate-reactor.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.reactor.callback.pre-generate-reactor.buildTarget" />
  -    </maven-ant>
  +  <target name="pre-generate-reactor-callback"
  +    if="maven.reactor.callback.pre-generate-reactor.ok">
  +    <maven-ant antfile="${maven.reactor.callback.pre-generate-reactor.buildFile}" 
  +      target="${maven.reactor.callback.pre-generate-reactor.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
     
  -  <target name="post-generate-reactor-callback">
  -    <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
  -      target="callback" inheritAll="true" inheritRefs="true">
  -      <property name="buildFile" 
  -        value="${maven.reactor.callback.post-generate-reactor.buildFile}" />
  -      <property name="buildTarget" 
  -        value="${maven.reactor.callback.post-generate-reactor.buildTarget}" />
  -      <property name="buildTargetName" 
  -        value="maven.reactor.callback.post-generate-reactor.buildTarget" />
  -    </maven-ant>
  +  <target name="post-generate-reactor-callback"
  +    if="maven.reactor.callback.post-generate-reactor.ok">
  +    <maven-ant antfile="${maven.reactor.callback.post-generate-reactor.buildFile}" 
  +      target="${maven.reactor.callback.post-generate-reactor.buildTarget}"
  +      inheritRefs="true" exportAll="false" exportRefs="false"/>
     </target>
   
     <target name="do-generate-reactor">
  
  
  

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

Reply via email to