Changeset 3178

Show
Ignore:
Timestamp:
02/15/11 09:30:14
Author:
douglm
Message:

Small fix to build

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.xml

    r3172 r3178  
    6868 
    6969  <!-- ========================= deployutil ================================ --> 
     70 
     71  <property name="org.bedework.default.lib" 
     72            location="${org.bedework.project.bedework}/lib" /> 
    7073 
    7174  <property name="bw.project.home" location="${org.bedework.project.bedework}"/> 
    …… 
    686689  <target name="cmdutil" depends="init" 
    687690          description="run the cmdline utility"> 
    688     <loadDeployConfig /> 
    689  
    690     <property name="app.dest.classes" 
    691               location="${dist.home}/temp/cmdutil/classes" /> 
    692  
    693     <delete dir="${app.dest.classes}" /> 
    694     <mkdir dir="${app.dest.classes}" /> 
    695  
    696     <property name="app.dest.properties" 
    697               location="${app.dest.classes}/properties/calendar" /> 
    698  
    699     <mkdir dir="${app.dest.properties}" /> 
    700  
    701     <copy tofile="${app.dest.properties}/options.xml" 
    702           file="${org.bedework.config.options}" /> 
    703  
    704     <copy tofile="${app.dest.classes}/sysevents.properties" 
    705           file="${org.bedework.config.home}/application.sysevents.properties" /> 
    706  
    707     <path id="run.classpath"> 
    708       <fileset dir="${org.bedework.project.bedework}/applib"> 
    709          <include name="*.jar"/> 
    710       </fileset> 
    711       <fileset dir="${org.bedework.config.home}/lib/server"> 
    712          <include name="*.jar"/> 
    713       </fileset> 
    714       <fileset dir="${org.bedework.project.bwtools}/dist"> 
    715          <include name="*.jar"/> 
    716       </fileset> 
    717       <fileset dir="${org.bedework.project.bwtools}/lib"> 
    718          <include name="*.jar"/> 
    719       </fileset> 
    720       <pathelement location="${org.bedework.project.bwtools}/resources" /> 
    721       <pathelement location="${app.dest.classes}" /> 
    722     </path> 
    723  
    724     <echo file="${app.dest.classes}/hibernate.properties"> 
    725 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    726 hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    727 hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
    728 hibernate.connection.username=${org.bedework.global.jdbcid} 
    729 hibernate.connection.password=${org.bedework.global.jdbcpw} 
    730 hibernate.connection.url=${org.bedework.global.jdbcurl} 
    731 hibernate.cglib.use_reflection_optimizer=false 
    732 hibernate.cache.use_second_level_cache=false 
    733 # 
    734 # Here for better debugging 
    735 # 
    736 hibernate.jdbc.batch_size=0 
    737     </echo> 
    738  
    739     <copy todir="${app.dest.classes}" 
    740           file="${org.bedework.project.bwtools}/resources/log4j.xml" /> 
    741  
    742     <copy todir="${app.dest.classes}"> 
    743       <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" /> 
    744       <filterset refid="property.filters" /> 
    745     </copy> 
    746  
    747     <copy todir="${app.dest.classes}"> 
    748       <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" /> 
    749       <filterset refid="property.filters" /> 
    750     </copy> 
    751  
    752     <pathconvert property="run.txt.classpath" 
    753                  refid="run.classpath" 
    754                  targetos="unix"  pathsep=":" /> 
    755          
    756         <!-- 
    757         <echo message="classpath=${run.txt.classpath}"/> 
    758         --> 
    759  
    760     <input message="Enter administrative user account:" 
    761            addproperty="org.bedework.cmdutil.arg.account" /> 
    762  
    763     <input message="Enter input file name - null for System.in:" 
    764            addproperty="org.bedework.cmdutil.arg.infile" /> 
    765  
    766  
    767     <if> 
    768       <equals arg1="${org.bedework.cmdutil.arg.infile}" 
    769               arg2="" /> 
    770       <then> 
    771         <property name="org.bedework.cmdutil.arg.infile.par" value="" /> 
    772       </then> 
    773       <else> 
    774         <property name="org.bedework.cmdutil.arg.infile.par" value="-f" /> 
    775       </else> 
    776     </if> 
    777  
    778     <!-- 
    779     <echo message="For this to work you need to do something like:"/> 
    780     <echo message="export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/douglm/drop2/java/yourkit/yjp-6.0.15/bin/linux-x86-32"/> 
    781      --> 
    782  
    783     <java classname="org.bedework.tools.cmdutil.CmdUtil" 
    784           fork="true" 
    785           failonerror="false" 
    786           resultproperty="org.bedework.cmdutil.status" > 
    787       <classpath refid="run.classpath" /> 
    788       <arg value="-user" /> 
    789       <arg value="${org.bedework.cmdutil.arg.account}" /> 
    790       <arg value="${org.bedework.cmdutil.arg.infile.par}" /> 
    791       <arg value="${org.bedework.cmdutil.arg.infile}" /> 
    792       <!-- 
    793       <jvmarg value="-agentlib:yjpagent" /> 
    794        --> 
    795     </java> 
     691    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false" 
     692         target="cmdutil" /> 
    796693  </target> 
    797694