Changeset 2008

Show
Ignore:
Timestamp:
01/05/09 15:46:38
Author:
douglm
Message:

Changes to timezones had brokena clean build.

Split CalTimeZones? into an abstract class + implementation.

Changed annotation build to skip the above implemtnation.

Fix to restore to skip owner info in timezones.

Changed DirToll? to allow deletion of ldap hierarchies.

Fixes to the install process.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/quickstart/install.xml

    r1951 r2008  
    2626            b. Create a caladmin user with supplied password 
    2727            c. Create a test user 
    28           If a directory is to be copied from a previous quickstart, copy the 
     28          If an ldap directory is to be copied from a previous quickstart, copy the 
    2929          directory server files. 
    3030       ================================================================= --> 
    3131 
    32   <target name="install" depends="run.init" 
    33           description="Install the quickstart"> 
     32  <target name="install-configs" depends="run.init" 
     33          description="Install the build configuration files"> 
    3434    <echo message="Create bwbuild in user home"/> 
    3535 
    …… 
    6464    </if> 
    6565 
     66    <!-- ================================================================= 
     67         Some final reminders 
     68         ================================================================= 
     69 
     70    This should go into some sort of summary file we echo at the end. 
     71    <if> 
     72      <isset property="org.bedework.install.bwbuild.reply" /> 
     73      <then> 
     74        <echo message="========================================================" /> 
     75        <echo message="Note:" /> 
     76        <echo message="${user.home}/bwbuild was left unchanged. You may need" /> 
     77        <echo message="to update it for this release." /> 
     78        <echo message="========================================================" /> 
     79      </then> 
     80    </if>--> 
     81  </target> 
     82 
     83  <target name="install-ldap" depends="run.init" 
     84          description="Install the ldap directory server"> 
    6685    <echo message="========================================================" /> 
    67     <echo message="We need to create a new directory for the quickstart" /> 
     86    <echo message="We need to create a new ldap directory for the quickstart" /> 
    6887    <!-- This after 3.5 
    6988    <echo message="or copy a previous quickstart directory into the new quickstart" /> 
    …… 
    7190    <echo message="========================================================" /> 
    7291 
    73     <echo message="Creating a new directory for the quickstart" /> 
     92    <echo message="Creating a new ldap directory for the quickstart" /> 
    7493    <parallel> 
    7594      <daemons> 
    …… 
    7796      </daemons> 
    7897      <sequential> 
     98        <echo message="Pausing to let the ldap server start" /> 
    7999        <sleep seconds="10" /> 
    80100        <antcallback target="initDirForQuickstart" inheritrefs="true" 
    …… 
    96116          <else> 
    97117            <echo message="Initialisation failed" /> 
    98  
    99118          </else> 
    100119        </if> 
    …… 
    103122      </sequential> 
    104123    </parallel> 
    105  
    106     <!-- ================================================================= 
    107          Some final reminders 
    108          ================================================================= --> 
    109  
    110     <if> 
    111       <isset property="org.bedework.install.bwbuild.reply" /> 
    112       <then> 
    113         <echo message="========================================================" /> 
    114         <echo message="Note:" /> 
    115         <echo message="${user.home}/bwbuild was left unchanged. You may need" /> 
    116         <echo message="to update it for this release." /> 
    117         <echo message="========================================================" /> 
    118       </then> 
    119     </if> 
    120124  </target> 
    121125 

  • trunk/build/quickstart/linux/bw

    r1948 r2008  
    55# within the svn repository. 
    66# 
     7 
     8if [ -z "$JAVA_HOME" -o ! -d "$JAVA_HOME" ] ; then 
     9  errorUsage "JAVA_HOME is not defined correctly for bedework." 
     10fi 
    711 
    812ANT_HOME=`dirname "$PRG"`/apache-ant-1.7.0 
    …… 
    119123fi 
    120124 
    121 if [ -z "$JAVA_HOME" -o ! -d "$JAVA_HOME" ] ; then 
    122   errorUsage "JAVA_HOME is not defined correctly for bedework." 
    123 fi 
    124  
    125125# Make available for ant 
    126126export BWCONFIG="-Dorg.bedework.user.build.properties=$BEDEWORK_CONFIG/build.properties" 

  • trunk/build/quickstart/linux/install

    r1968 r2008  
    66# 
    77 
     8errorMsg() { 
     9  echo "*******************************************************" 
     10  echo "Error: $1" 
     11  echo "*******************************************************" 
     12  exit 1 
     13} 
     14 
     15if [ -z "$JAVA_HOME" -o ! -d "$JAVA_HOME" ] ; then 
     16  errorMsg "JAVA_HOME is not defined correctly for bedework." 
     17fi 
     18 
     19# Ant 
    820ANT_HOME=`dirname "$PRG"`/apache-ant-1.7.0 
    921ANT_HOME=`cd "$ANT_HOME" && pwd` 
    …… 
    1224export QUICKSTART_HOME=$saveddir 
    1325 
     26# Directory server 
     27export DS_HOME=$QUICKSTART_HOME/apacheds-1.5.3-fixed 
     28 
     29# ------------- Should not need to change anything below this ---------- 
     30 
     31ANT=$ANT_HOME/bin/ant 
     32 
    1433export BEDEWORK_HOME=$QUICKSTART_HOME/bedework 
    1534 
    1635libcache=$BEDEWORK_HOME/libcache 
    1736 
    18 export DS_HOME=$QUICKSTART_HOME/apacheds-1.5.3-fixed 
     37quickStartBuildFile=$QUICKSTART_HOME/build.xml 
     38 
     39qsant="$ANT -buildfile $quickStartBuildFile" 
    1940 
    2041shutdownServer() { 
    2142  echo "Stopping directory server" 
    2243  $JAVA_HOME/bin/java -jar $DS_HOME/bin/apacheds-tools.jar graceful --install-path $DS_HOME --configuration 
     44} 
     45 
     46readVal() { 
     47  val= 
     48  until [ "$val" != "" ] ; do 
     49    echo "Enter $1" 
     50    read val 
     51  done 
    2352} 
    2453 
    …… 
    4271echo "========================================================" 
    4372 
    44 if [ -d "$HOME/bwbuild" ] ; then 
    45   echo "========================================================" 
    46   echo "You already have a bwbuild in user home $HOME" 
    47   echo "Enter 'yes' to continue with the directory unchanged" 
    48   echo "(you may need to update it afterwards)" 
    49   echo "Enter anything else to terminate the install allowing " 
    50   echo "you to rename or destroy it." 
    51   echo "========================================================" 
    52  
    53   echo "Continue? yes/no" 
    54   read reply 
    55  
    56   if [ "$reply" != "yes" ] ; then 
    57     exit 1 
    58   fi 
    59 else 
    60   cp $BEDEWORK_HOME/config/bwbuild $USER_HOME 
    61 fi 
    62  
    6373# Ensure we shut down the directory server at program termination 
    6474# or after we received a signal: 
    …… 
    6676trap "exit 2" 1 2 3 15 
    6777 
     78#XXif [ -d "$HOME/bwbuild" ] ; then 
     79#XX  echo "========================================================" 
     80#XX  echo "You already have a bwbuild in user home $HOME" 
     81#XX  echo "Enter 'yes' to continue with the directory unchanged" 
     82#XX  echo "(you may need to update it afterwards)" 
     83#XX  echo "Enter anything else to terminate the install allowing " 
     84#XX  echo "you to rename or destroy it." 
     85#XX  echo "========================================================" 
     86#XX 
     87#XX  echo "Continue? yes/no" 
     88#XX  read reply 
     89#XX 
     90#XX  if [ "$reply" != "yes" ] ; then 
     91#XX    exit 1 
     92#XX  fi 
     93#XXelse 
     94#XX  cp $BEDEWORK_HOME/config/bwbuild $USER_HOME 
     95#XXfi 
     96 
     97$qsant install-configs 
     98 
    6899  echo "========================================================" 
    69100  echo "We need to create a new ldap directory for the quickstart" 
    70   #  <!-- This after 3.5 
    71   #  <echo message="or copy a previous quickstart ldap directory into the new quickstart" /> 
    72   #  --> 
     101#  <!-- This after 3.5 
     102#  <echo message="or copy a previous quickstart ldap directory into the new quickstart" /> 
     103#  --> 
    73104  echo "========================================================" 
    74105 
    …… 
    80111  echo "Pausing while the server starts" 
    81112 
    82 #  sleep 10 
     113  sleep 10 
    83114 
    84   echo "Getting directory information and creating entries" 
     115$qsant initDirForQuickstart 
     116 
     117echo "Now we invoke the adduser script to add a superuser to the system" 
     118echo "We need to know the account, first name last name and a password 
     119 
     120readVal "account" 
     121rootAccount=$val 
     122adduser_defs="-Dorg.bedework.directory.account=$val" 
     123 
     124readVal "firstname" 
     125adduser_defs="$adduser_defs -Dorg.bedework.directory.firstname=$val" 
     126 
     127readVal "lastname" 
     128adduser_defs="$adduser_defs -Dorg.bedework.directory.lastname=$val" 
     129 
     130readVal "password" 
     131adduser_defs="$adduser_defs -Dorg.bedework.directory.password=$val" 
     132 
     133$qsant addUser 
     134 
     135exit 2 
     136 
     137$qsant addUserPrompt 
    85138 
    86139  DIRTOOL_HOME=$BEDEWORK_HOME/projects/bwtools 
    …… 
    90143 
    91144#  $dirtool -initSystem 
    92  
     145superuser 
    93146  superuser= 
    94147  until [ "$superuser" != "" ] ; do 
    …… 
    107160  done 
    108161 
     162 
     163 
    109164  echo "create data"