Changeset 10773

Show
Ignore:
Timestamp:
26.10.2005 13:40:16 (14 years ago)
Author:
kjdon
Message:

added a help message for the get password targets, also shifted the password prompt for windows stopping mysql into a new target - get-mysql-root-password-windows

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl3/build.xml

    r10770 r10773  
    651651   
    652652  <target name="get-mysql-root-password" depends="init,init-mysql-vars" if="mysql.islocal.usepassword" unless="mysql.root.password"> 
     653    <echo>(Enter password in the Java popup)</echo> 
    653654    <getuserandpassword message="Please specify a password for the root mysql user: this is to secure your database."  username="root" pwordproperty="mysql.root.password"/> 
    654655  </target> 
    655656   
     657  <target name="get-mysql-root-password-windows" depends="init,init-mysql-vars" if="mysql.islocal.usepassword.windows" unless="mysql.root.password"> 
     658    <echo>(Enter password in the Java popup)</echo> 
     659    <getuserandpassword message="Please enter the mysql root password"  username="root" pwordproperty="mysql.root.password"/> 
     660  </target> 
     661   
    656662  <target name="get-mysql-reader-password" depends="init,init-mysql-vars" if="mysql.islocal.usepassword" unless="mysql.reader.password" > 
     663    <echo>(Enter password in the Java popup)</echo> 
    657664    <getuserandpassword message="Please specify the password for the gsdl3reader mysql user: this is used by greenstone" username="gsdl3reader" pwordproperty="mysql.reader.password"/> 
    658665  </target> 
    659666   
    660667  <target name="get-mysql-admin-password" depends="init,init-mysql-vars" if="mysql.islocal.usepassword" unless="mysql.admin.password" > 
     668    <echo>(Enter password in the Java popup)</echo> 
    661669    <getuserandpassword message="Please specify the password for the gsdl3admin mysql user: this is used by greenstone" username="gsdl3admin" pwordproperty="mysql.admin.password"/> 
    662670  </target> 
     
    836844  </target> 
    837845   
    838   <target name="stop-mysql-use-password-windows" depends="init" if="mysql.islocal.usepassword.windows"> 
    839     <!--<antcall target="get-mysql-root-password"/> 
    840     antcall doesn't set the property in teh callign project. if put this in the depends list, it will always be called, even if not windows. so copy it in here.--> 
    841      <condition property="ask.root.password"> 
    842       <or> 
    843     <not> 
    844       <isset property="mysql.root.password"/> 
    845     </not> 
    846     <equals arg1="" arg2="${mysql.root.password}"/> 
    847       </or> 
    848     </condition> 
    849     <getuserandpassword message="Please enter the mysql root password:" if="ask.root.password" username="root" pwordproperty="mysql.root.password"/> 
     846  <target name="stop-mysql-use-password-windows" depends="init,get-mysql-root-password-windows" if="mysql.islocal.usepassword.windows"> 
    850847    <!-- on windows it doesn't work unless the password is specified here --> 
    851848    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"