Changeset 3176

Show
Ignore:
Timestamp:
02/14/11 10:32:49
Author:
douglm
Message:

Some changes that didn't make it through for the last update.

In addition to the below changes to try to get a stack trace out of jsp when rendering fails.

Further changes to the build. Attempt to catch changed libraries and force a rebuild.

Also use outofdate to suppress running of apt when sources have not changed.

Minor but widespread change to remove debug parameter from a number of classes. For those debugging now depends on log4j level.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildTools/deftasks.xml

    r3174 r3176  
    376376 
    377377      <if> 
    378         <uptodate targetfile="@{jar-file}" > 
    379           <srcfiles refid="buildjar.java.sources" /> 
    380           <srcfiles refid="buildjar.generated.java.sources" /> 
    381           <srcfiles refid="buildjar.resource.files"/> 
    382           <srcfiles refid="dependency.fileset"/> 
    383         </uptodate> 
     378        <and> 
     379          <not> 
     380            <equals arg1="${org.bedework.libraries.changed}" arg2="true" /> 
     381          </not> 
     382          <uptodate targetfile="@{jar-file}" > 
     383            <srcfiles refid="buildjar.java.sources" /> 
     384            <srcfiles refid="buildjar.generated.java.sources" /> 
     385            <srcfiles refid="buildjar.resource.files"/> 
     386            <srcfiles refid="dependency.fileset"/> 
     387          </uptodate> 
     388        </and> 
    384389        <then> 
    385390          <noisyMsg message="**** @{jar-file} is up to date" /> 

  • trunk/build/buildTools/getJar.xml

    r3174 r3176  
    153153                 
    154154              <copy file="@{libcache}/${org.bedework.getjar.jarname}" 
    155                     todir="@{lib}" overwrite="yes" /> 
     155                    todir="@{lib}" overwrite="yes" preservelastmodified="true" /> 
    156156            </else> 
    157157          </if> 

  • trunk/build/buildTools/xjc.xml

    r3174 r3176  
    4545        </then> 
    4646        <else> 
    47           <noisyMsg message="**** @{jar.file} needs rebuilding" /> 
     47          <noisyMsg message="**** @{jar-file} needs rebuilding" /> 
    4848 
    4949          <delete dir="${sourcedestdir}" />