Changeset 1968

Show
Ignore:
Timestamp:
11/14/08 01:39:17
Author:
douglm
Message:

1. Move options classes into rpiutil to make them availabkle to other packages.

2. Make changes to the WebDAV classes to facilitate building of extra WebDAV based services (such as CardDAV)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildsh.xml

    r1944 r1968  
    7272    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
    7373    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
    74     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calenv}" /> 
    7574    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
    7675    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 

  • trunk/build/buildwar.xml

    r1938 r1968  
    249249    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
    250250    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
    251     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calenv}" /> 
    252251    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
    253252    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 

  • trunk/build/quickstart/linux/install

    r1953 r1968  
    8080  echo "Pausing while the server starts" 
    8181 
    82   sleep 10 
     82#  sleep 10 
    8383 
    8484  echo "Getting directory information and creating entries" 
    …… 
    8787  DIRTOOL_CP=$libcache/commons-codec-1.3.jar:$libcache/log4j-1.2.8.jar 
    8888  DIRTOOL_CP=$DIRTOOL_CP:$BEDEWORK_HOME/dist/bw-tools-3.5.jar 
     89  dirtool="$JAVA_HOME/bin/java -classpath $DIRTOOL_CP org.bedework.tools.directory.DirTool" 
    8990 
    90   $JAVA_HOME/bin/java -classpath $DIRTOOL_CP org.bedework.tools.directory.DirTool -initSystem 
     91#  $dirtool -initSystem 
    9192 
    92   echo "Enter superuser account" 
    9393  superuser= 
    9494  until [ "$superuser" != "" ] ; do 
     95    echo "Enter superuser account" 
    9596    read superuser 
     97 
     98    if [ "$superuser" != "" ] ; then 
     99      $dirtool -userExists $superuser 
     100      dirstat=$? 
     101      echo "status is $dirstat" 
     102      if [ "$dirstat" != "0" ] ; then 
     103        echo "user $superuser does not exist" 
     104        superuser= 
     105      fi 
     106    fi 
    96107  done 
    97108 

  • trunk/deployment/appjars.xml

    r1951 r1968  
    239239 
    240240      <getJar lib="${org.bedework.app.lib}" 
    241               name="bw-calenv" version="3.5" 
    242               projecthome="${project.home}/projects/calendarapi" /> 
    243  
    244       <getJar lib="${org.bedework.app.lib}" 
    245241              name="bw-calfacade" version="3.5" 
    246242              projecthome="${project.home}/projects/calendarapi" />