Changeset 2026

Show
Ignore:
Timestamp:
01/16/09 14:47:59
Author:
douglm
Message:

Make it build again after cmdutil changes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/build.xml

    r2025 r2026  
    5858  <property name="org.bedework.project.webdav" 
    5959            location="${org.bedework.projects}/webdav" /> 
     60 
     61  <import file="${org.bedework.project.bedework}/build/buildfilters.xml" /> 
     62  <import file="${org.bedework.project.bedework}/build/loadDeployConfig.xml"/> 
    6063 
    6164  <target name="README" depends="init" 
     
    709712  <target name="cmdutil" depends="init" 
    710713          description="run the cmdline utility"> 
    711     <antfetch antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false" 
    712               inheritrefs="true" 
    713               target="cmdutil" 
    714               return="org.bedework.cmdutil.status" > 
    715       <propertyset> 
    716         <propertyref prefix="org.bedework.global."/> 
    717         <propertyref prefix="org.bedework.config.options"/> 
    718         <propertyref prefix="org.bedework.project.bedework"/> 
    719         <propertyref prefix="org.bedework.project.calendarapi"/> 
    720       </propertyset> 
    721     </antfetch> 
     714    <loadDeployConfig /> 
     715 
     716    <property name="app.dest.classes" 
     717              location="${dist.home}/temp/classes" /> 
     718 
     719    <property name="app.dest.properties" 
     720              location="${app.dest.classes}/properties/calendar" /> 
     721 
     722    <mkdir dir="${app.dest.properties}" /> 
     723 
     724    <copy tofile="${app.dest.properties}/options.xml" 
     725          file="${org.bedework.config.options}" /> 
     726 
     727    <path id="run.classpath"> 
     728      <fileset dir="${org.bedework.project.bedework}/applib"> 
     729         <include name="*.jar"/> 
     730      </fileset> 
     731      <pathelement location="${app.dest.classes}" /> 
     732    </path> 
     733 
     734    <echo file="${app.dest.classes}/hibernate.properties"> 
     735hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
     736hibernate.dialect=${org.bedework.global.hibernate.dialect} 
     737hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
     738hibernate.connection.username=${org.bedework.global.jdbcid} 
     739hibernate.connection.password=${org.bedework.global.jdbcpw} 
     740hibernate.connection.url=${org.bedework.global.jdbcurl} 
     741hibernate.cglib.use_reflection_optimizer=false 
     742hibernate.cache.use_second_level_cache=false 
     743
     744# Here for better debugging 
     745
     746hibernate.jdbc.batch_size=0 
     747    </echo> 
     748 
     749    <copy todir="${app.dest.classes}"> 
     750      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" /> 
     751      <filterset refid="property.filters" /> 
     752    </copy> 
     753 
     754    <copy todir="${app.dest.classes}"> 
     755      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" /> 
     756      <filterset refid="property.filters" /> 
     757    </copy> 
     758 
     759    <pathconvert property="run.txt.classpath" 
     760                 refid="run.classpath" 
     761                 targetos="unix"  pathsep=":" /> 
     762 
     763    <input message="Enter administrative user account:" 
     764           addproperty="org.bedework.cmdutil.arg.account" /> 
     765 
     766    <java classname="org.bedework.tools.cmdutil.CmdUtil" 
     767          fork="true" 
     768          failonerror="false" 
     769          resultproperty="org.bedework.cmdutil.status" > 
     770      <classpath refid="run.classpath" /> 
     771      <arg value="-user" /> 
     772      <arg value="${org.bedework.cmdutil.arg.account}" /> 
     773    </java> 
    722774  </target> 
    723775