mcconnell    2004/02/03 03:27:31

  Modified:    util     maven.xml
  Log:
  Change from 'maven.gpg.exe' to 'maven_gpg_exe' - something really strange going on 
in jelly land.
  
  Revision  Changes    Path
  1.11      +10 -53    avalon/util/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/util/maven.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- maven.xml 3 Feb 2004 11:11:43 -0000       1.10
  +++ maven.xml 3 Feb 2004 11:27:31 -0000       1.11
  @@ -36,49 +36,6 @@
     <ant:property name="pom.organization.identifier" value="ASF"/>
     <ant:property name="pom.specificationVersion" value="1.0"/>
   
  -  <goal name="avalon:test">
  -    <echo>SOMETHING: [${something}]</echo>
  -    <j:if test="${something != null}">
  -      <echo>something != null</echo>
  -    </j:if>
  -    <j:if test="${something == null}">
  -      <echo>something == null</echo>
  -    </j:if>
  -    <j:if test="${something != ''}">
  -      <echo>something != ''</echo>
  -    </j:if>
  -    <j:if test="${something == ''}">
  -      <echo>something == ''</echo>
  -    </j:if>
  -    <echo>NOTHING: [${nothing}]</echo>
  -    <j:if test="${nothing != null}">
  -      <echo>nothing != null</echo>
  -    </j:if>
  -    <j:if test="${nothing == null}">
  -      <echo>nothing == null</echo>
  -    </j:if>
  -    <j:if test="${nothing != ''}">
  -      <echo>nothing != ''</echo>
  -    </j:if>
  -    <j:if test="${nothing == ''}">
  -      <echo>nothing == ''</echo>
  -    </j:if>
  -    <echo>maven.gpg.exe: [${maven.gpg.exe}]</echo>
  -    <j:if test="${maven.gpg.exe != null}">
  -      <echo>maven.gpg.exe != null</echo>
  -    </j:if>
  -    <j:if test="${maven.gpg.exe == null}">
  -      <echo>maven.gpg.exe == null</echo>
  -    </j:if>
  -    <j:if test="${maven.gpg.exe != ''}">
  -      <echo>maven.gpg.exe != ''</echo>
  -    </j:if>
  -    <j:if test="${maven.gpg.exe == ''}">
  -      <echo>maven.gpg.exe == ''</echo>
  -    </j:if>
  -
  -  </goal>
  -
     <!--
     ==============================================================================
     build the utilities package
  @@ -105,8 +62,8 @@
         <j:set var="path" 
             value="${child.artifactId}-${child.currentVersion}.jar"/>
         <checksum file="${maven.build.dir}/jars/${path}"/>
  -      <j:if test="${maven.gpg.exe != null}">
  -        <ant:exec executable="${maven.gpg.exe}">
  +      <j:if test="${maven_gpg_exe != null}">
  +        <ant:exec executable="${maven_gpg_exe}">
             <ant:arg value="-a"/>
             <ant:arg value="--yes"/>
             <ant:arg value="-b"/>
  @@ -182,8 +139,8 @@
       />
       <ant:delete file="${maven.dist.dir}/${build.name}-bin.tar"/>
       <checksum file="${maven.dist.dir}/${build.name}-bin.tar.gz"/>
  -    <j:if test="${maven.gpg.exe != null}">
  -      <ant:exec executable="${maven.gpg.exe}">
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
           <ant:arg value="-b"/>
           <ant:arg value="${maven.dist.dir}/${build.name}-bin.tar.gz"/>
  @@ -195,8 +152,8 @@
         <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
       </ant:zip>
       <checksum file="${maven.dist.dir}/${build.name}-bin.zip"/>
  -    <j:if test="${maven.gpg.exe != null}">
  -      <ant:exec executable="${maven.gpg.exe}">
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
           <ant:arg value="-b"/>
           <ant:arg value="${maven.dist.dir}/${build.name}-bin.zip"/>
  @@ -219,8 +176,8 @@
       />
       <ant:delete file="${maven.dist.dir}/${build.name}-src.tar"/>
       <checksum file="${maven.dist.dir}/${build.name}-src.tar.gz"/>
  -    <j:if test="${maven.gpg.exe != null}">
  -      <ant:exec executable="${maven.gpg.exe}">
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
           <ant:arg value="-b"/>
           <ant:arg value="${maven.dist.dir}/${build.name}-src.tar.gz"/>
  @@ -232,8 +189,8 @@
         <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
       </ant:zip>
       <checksum file="${maven.dist.dir}/${build.name}-src.zip"/>
  -    <j:if test="${maven.gpg.exe != null}">
  -      <ant:exec executable="${maven.gpg.exe}">
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
           <ant:arg value="-b"/>
           <ant:arg value="${maven.dist.dir}/${build.name}-src.zip"/>
  
  
  

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

Reply via email to