Changeset 3463

Show
Ignore:
Timestamp:
01/17/12 22:44:39
Author:
douglm
Message:

A whole bunch of changes that somehow got missed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildTools/getJar.xml

    r3460 r3463  
    6060          <mkdir dir="${bedework.home}/dist"/> 
    6161          <echoxml file="${bedework.home}/dist/jarlicenses.xml" append="true"> 
    62             <jar-license> 
     62            <jarLicense> 
    6363              <name>@{name}</name> 
    6464              <version>${org.bedework.license.version}</version> 
    …… 
    6767              <license>${org.bedework.license.license}</license> 
    6868              <from>${project.name}</from> 
    69             </jar-license> 
     69            </jarLicense> 
    7070          </echoxml> 
    7171        </then> 

  • trunk/deployment/build.xml

    r3460 r3463  
    169169    <!-- ================= termination tasks for deployment ================ --> 
    170170 
    171     <!-- ensure has value --> 
    172     <property name="propval.app.cal.suite" value="" /> 
    173  
    174171    <ant antfile="${org.bedework.deployment.base}/termination/build.xml" 
    175172         inheritrefs="true" target="deploy" /> 
    …… 
    193190       ================================================================= --> 
    194191  <target name="build.configured.apps"> 
    195     <!-- Is this used any more? --> 
    196192    <forEachApp names="${org.bedework.install.app.names}" 
    197193                prefix="org.bedework.deploy" 
    …… 
    231227        <propertycopy name="propval.app.unauthenticated" 
    232228                      from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.guestMode" /> 
    233         <!-- ensure has value --> 
    234         <property name="propval.app.cal.suite" value="" /> 
    235  
    236229        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml" 
    237230             inheritrefs="true" target="build.configured" > 
    …… 
    280273        <propertycopy name="propval.app.unauthenticated" 
    281274                      from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.guestMode" /> 
    282         <!-- ensure has value --> 
    283         <property name="propval.app.cal.suite" value="" /> 
    284  
     275         
    285276        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml" 
    286277             inheritrefs="true" target="deploy" >