diff -c binNew/dynamoEnv.sh binOrig/dynamoEnv.sh
*** binNew/dynamoEnv.sh	Thu Dec 15 10:32:31 2005
--- binOrig/dynamoEnv.sh	Thu Jun  9 17:52:48 2005
***************
*** 17,27 ****
    #
    DYNAMO_ROOT=${DYNAMO_HOME}/..
  fi
- 
- # Sebastiano: Cygwin-compatible path
- export CYG_DYNAMO_ROOT=`cygpath -wp ${DYNAMO_ROOT}`
  export DYNAMO_ROOT
- 
  # 
  # Remove the dynamo.env file because it could be 
  # left over from a previous instance of dynamo
--- 17,23 ----
***************
*** 48,56 ****
  fi
  . $DYNAMO_HOME/bin/j2eeEnv.sh
  
- # Sebastiano: Cygwin-compatible path
- CYG_DAS_ROOT=`cygpath -w $DAS_ROOT`
- 
  # UNIX type for this machine
  UNIXFLAVOR=`uname`
  
--- 44,49 ----
***************
*** 62,70 ****
  AIX_OSDIR_NAME="powerpc-ibm-aix4.2"
  LINUX_OSDIR_NAME="i486-unknown-linux2"
  
- # Sebastiano: setting of OSDIR_NAME for Cygwin
- WINDOWS_OSDIR_NAME="i486-unknown-win32"
- 
  #
  # get_flavor - determine which variant of UNIX is being run;
  # if SunOS/Solaris, HP-UX or AIX, determine the OS-specific component
--- 55,60 ----
***************
*** 86,130 ****
      esac
  fi
  
- # Sebastiano: commented out ATG's platform detection, replaced with "case" below
  # make sure we're installing on a platform we support
! #if [ $UNIXFLAVOR = Solaris ]
! #then
! #    OSDIRNAME=$SUN_OSDIR_NAME
! #elif [ $UNIXFLAVOR = AIX ]
! #then
! #    OSDIRNAME=$AIX_OSDIR_NAME
! #elif [ $UNIXFLAVOR = HP-UX ]
! #then
! #    OSDIRNAME=$HPUX_OSDIR_NAME
! #elif [ $UNIXFLAVOR = Linux ]
! #then
! #    OSDIRNAME=$LINUX_OSDIR_NAME
! #else
! #    echo "Warning: unable to determine Unix variant.  Assuming Solaris."
! #    UNIXFLAVOR=Solaris
! #    OSDIRNAME=$SUN_OSDIR_NAME
! #fi
! 
! # Sebastiano: platform detection
! case $UNIXFLAVOR in
!   Solaris)    OSDIRNAME=$SUN_OSDIR_NAME
!   ;;
!   AIX)        OSDIRNAME=$AIX_OSDIR_NAME
!   ;;
!   HP-UX)      OSDIRNAME=$HPUX_OSDIR_NAME
!   ;;
!   Linux)      OSDIRNAME=$LINUX_OSDIR_NAME
!   ;;
!   CYGWIN*)    UNIXFLAVOR=Cygwin
!               OSDIRNAME=$WINDOWS_OSDIR_NAME
!   ;;
!   *)          echo "Warning: unable to determine Unix variant.  Assuming Solaris."
!               UNIXFLAVOR=Solaris
!               OSDIRNAME=$SUN_OSDIR_NAME
!   ;;
! esac
! 
  
  #
  # Set the JAVA_VM - could be overridden by environment.sh
--- 76,99 ----
      esac
  fi
  
  # make sure we're installing on a platform we support
! if [ $UNIXFLAVOR = Solaris ]
! then
!     OSDIRNAME=$SUN_OSDIR_NAME
! elif [ $UNIXFLAVOR = AIX ]
! then
!     OSDIRNAME=$AIX_OSDIR_NAME
! elif [ $UNIXFLAVOR = HP-UX ]
! then
!     OSDIRNAME=$HPUX_OSDIR_NAME
! elif [ $UNIXFLAVOR = Linux ]
! then
!     OSDIRNAME=$LINUX_OSDIR_NAME
! else
!     echo "Warning: unable to determine Unix variant.  Assuming Solaris."
!     UNIXFLAVOR=Solaris
!     OSDIRNAME=$SUN_OSDIR_NAME
! fi
  
  #
  # Set the JAVA_VM - could be overridden by environment.sh
***************
*** 194,200 ****
  # server (e.g. weblogic) for our application server.
  #
  if [ "x$THIRD_PARTY_APP_SERVER" = "x" ] ; then
!     JAVA_ARGS=" -Djava.security.policy=${DYNAMO_HOME}/lib/java.policy -Datg.j2eeserver.root=${CYG_DAS_ROOT} $JAVA_ARGS"
  fi
  
  #
--- 163,169 ----
  # server (e.g. weblogic) for our application server.
  #
  if [ "x$THIRD_PARTY_APP_SERVER" = "x" ] ; then
!     JAVA_ARGS=" -Djava.security.policy=${DYNAMO_HOME}/lib/java.policy -Datg.j2eeserver.root=${DAS_ROOT} $JAVA_ARGS"
  fi
  
  #
***************
*** 208,221 ****
      JAVA_ARGS=" -Datg.dynamo.modulepath=${DYNAMO_ROOT} $JAVA_ARGS"
  elif [ "$DAS_ROOT" != "$DYNAMO_ROOT" ] ; then
      # Dynamo case
!     # Sebastiano: Cygwin-compatible path
!     JAVA_ARGS=" -Datg.dynamo.modulepath=`cygpath -wp ${DYNAMO_ROOT}:${DAS_ROOT}` $JAVA_ARGS"
  else
      # default case
      JAVA_ARGS=" -Datg.dynamo.modulepath=${DYNAMO_ROOT} $JAVA_ARGS"
  fi
  
! JAVA_ARGS=" -Djava.security.policy=lib/java.policy -Datg.dynamo.home=${DYNAMO_HOME} -Datg.dynamo.root=${CYG_DYNAMO_ROOT} -Datg.dynamo.display=$DISPLAY -Djava.protocol.handler.pkgs=atg.net.www.protocol -Djava.naming.factory.url.pkgs=atg.jndi.url $JAVA_ARGS"
  
  JAVA_VER=1.3
  export JAVA_VER
--- 177,189 ----
      JAVA_ARGS=" -Datg.dynamo.modulepath=${DYNAMO_ROOT} $JAVA_ARGS"
  elif [ "$DAS_ROOT" != "$DYNAMO_ROOT" ] ; then
      # Dynamo case
!     JAVA_ARGS=" -Datg.dynamo.modulepath=${DYNAMO_ROOT}:${DAS_ROOT} $JAVA_ARGS"
  else
      # default case
      JAVA_ARGS=" -Datg.dynamo.modulepath=${DYNAMO_ROOT} $JAVA_ARGS"
  fi
  
! JAVA_ARGS=" -Djava.security.policy=lib/java.policy -Datg.dynamo.home=${DYNAMO_HOME} -Datg.dynamo.root=${DYNAMO_ROOT} -Datg.dynamo.display=$DISPLAY -Djava.protocol.handler.pkgs=atg.net.www.protocol -Djava.naming.factory.url.pkgs=atg.jndi.url $JAVA_ARGS"
  
  JAVA_VER=1.3
  export JAVA_VER
***************
*** 224,237 ****
  if [ "x$CLASSPATH" != "x" ] ; then
    DYNAMO_CLASSPATH=${DYNAMO_CLASSPATH}:${CLASSPATH}
  fi
! 
! # Sebastiano: Cygwin-compatible path
! CLASSPATH=`cygpath -wp ${DYNAMO_CLASSPATH}`
  export CLASSPATH
  
- # Sebastiano: Cygwin-compatible path
  PATH=${PATH}:${DYNAMO_ROOT}/DAS/os_specific_files/${OSDIRNAME}
- PATH=`cygpath -wp $PATH`
  export PATH
  
  # Under *nix native code needs to be available from LD_LIBRARY_PATH
--- 192,201 ----
  if [ "x$CLASSPATH" != "x" ] ; then
    DYNAMO_CLASSPATH=${DYNAMO_CLASSPATH}:${CLASSPATH}
  fi
! CLASSPATH=${DYNAMO_CLASSPATH}
  export CLASSPATH
  
  PATH=${PATH}:${DYNAMO_ROOT}/DAS/os_specific_files/${OSDIRNAME}
  export PATH
  
  # Under *nix native code needs to be available from LD_LIBRARY_PATH
***************
*** 313,332 ****
      fi
  fi
  
! # Sebastiano: Cygwin-compatible path
! JAVA_ARGS="${JAVA_ARGS} -Datg.dynamo.modules=`/bin/cygpath -wp ${DYNAMO_MODULES}`"
! 
! # Sebastiano: set os.name to something other than "Windows" or the AppLauncher will produce a Windows-like .bat file
! JAVA_ARGS="${JAVA_ARGS} -Dos.name=Cygwin"
  
  if [ "${LIVECONFIG}" != "" ]; then
      JAVA_ARGS="${JAVA_ARGS} -D${LIVECONFIG}"
  fi
  
- # Sebastiano: Cygwin-compaticle paths
  TEMP_ENVIRONMENT_SCRIPT="/tmp/dynamoEnv$$.sh"
- TEMP_ENVIRONMENT_SCRIPT=`/bin/cygpath -w ${TEMP_ENVIRONMENT_SCRIPT}`
- 
  # On DAF atg.dynamo.root won't be in JAVA_ARGS so it needs to be listed here
  
  
--- 277,289 ----
      fi
  fi
  
! JAVA_ARGS="${JAVA_ARGS} -Datg.dynamo.modules=${DYNAMO_MODULES}"
  
  if [ "${LIVECONFIG}" != "" ]; then
      JAVA_ARGS="${JAVA_ARGS} -D${LIVECONFIG}"
  fi
  
  TEMP_ENVIRONMENT_SCRIPT="/tmp/dynamoEnv$$.sh"
  # On DAF atg.dynamo.root won't be in JAVA_ARGS so it needs to be listed here
  
  
***************
*** 337,349 ****
  # actually want to configure.
  
  if [ "x${DYNAMO_CLASSPATH_MODULES}" != "x" ] ; then
!   # Sebastiano: Cygwin-compaticle paths
!  DYN_CP_MOD_OPT="-classPathModules `/bin/cygpath -wp ${DYNAMO_MODULES}:${DYNAMO_CLASSPATH_MODULES}`"
  fi
  
! # Sebastiano: Cygwin-compaticle paths
! #echo "${JAVA_VM} ${JAVA_ARGS} -Datg.dynamo.root=${CYG_DYNAMO_ROOT} atg.applauncher.dynamo.DynamoServerLauncher -environment ${TEMP_ENVIRONMENT_SCRIPT} `/bin/cygpath -wp ${DYNAMO_MODULES}` ${DYN_CP_MOD_OPT} ${CONFIGPATH}"
! DYNAMO_SERVER_LAUNCHER_CMD="${JAVA_VM} ${JAVA_ARGS} -Datg.dynamo.root=${CYG_DYNAMO_ROOT} atg.applauncher.dynamo.DynamoServerLauncher -environment ${TEMP_ENVIRONMENT_SCRIPT} `/bin/cygpath -wp ${DYNAMO_MODULES}` ${DYN_CP_MOD_OPT} ${CONFIGPATH}"
  $DYNAMO_SERVER_LAUNCHER_CMD
  DYNAMO_SERVER_LAUNCHER_STATUS=$?
  if [ "$DYNAMO_SERVER_LAUNCHER_STATUS" != "0" ] ; then
--- 294,304 ----
  # actually want to configure.
  
  if [ "x${DYNAMO_CLASSPATH_MODULES}" != "x" ] ; then
!  DYN_CP_MOD_OPT="-classPathModules ${DYNAMO_MODULES}:${DYNAMO_CLASSPATH_MODULES}"
  fi
  
! DYNAMO_SERVER_LAUNCHER_CMD="${JAVA_VM} ${JAVA_ARGS} -Datg.dynamo.root=${DYNAMO_ROOT} atg.applauncher.dynamo.DynamoServerLauncher -environment ${TEMP_ENVIRONMENT_SCRIPT} ${DYNAMO_MODULES} ${DYN_CP_MOD_OPT} ${CONFIGPATH}"
! #echo "${JAVA_VM} ${JAVA_ARGS} -Datg.dynamo.root=${DYNAMO_ROOT} atg.applauncher.dynamo.DynamoServerLauncher -environment ${TEMP_ENVIRONMENT_SCRIPT} ${DYNAMO_MODULES} ${DYN_CP_MOD_OPT} ${CONFIGPATH}"
  $DYNAMO_SERVER_LAUNCHER_CMD
  DYNAMO_SERVER_LAUNCHER_STATUS=$?
  if [ "$DYNAMO_SERVER_LAUNCHER_STATUS" != "0" ] ; then
***************
*** 351,367 ****
    echo "CLASSPATH was $CLASSPATH"
    echo "DYNAMO_HOME was $DYNAMO_HOME"
    echo "DYNAMO_MODULES was $DYNAMO_MODULES"
!   /bin/rm -f $TEMP_ENVIRONMENT_SCRIPT
    return 1
  fi
! 
! # Sebastiano: before running the environment script, parse it to check if there are any scripts with Windows-specific path (like C:\ATG\ATG71p1\PublishingAgent\bin\deploymentConfig.sh)
! # and convert them to Cygwin-compatible form
! CYG_TEMP_ENVIRONMENT_SCRIPT="/tmp/cygDynamoEnv$$.sh"
! /bin/sed -e s/"^\. \([A-Z].*\.sh\)"/". \/bin\/cygpath -u \1"/g -e 's#\\#/#g' $TEMP_ENVIRONMENT_SCRIPT -e 's#/bin/cygpath#`/bin/cygpath#g' -e 's#\.sh#.sh`#g' | /bin/cat > $CYG_TEMP_ENVIRONMENT_SCRIPT
! . $CYG_TEMP_ENVIRONMENT_SCRIPT
! /bin/rm -f $TEMP_ENVIRONMENT_SCRIPT
! /bin/rm -f $CYG_TEMP_ENVIRONMENT_SCRIPT
  
  #
  # Load final modifications to environment.
--- 306,316 ----
    echo "CLASSPATH was $CLASSPATH"
    echo "DYNAMO_HOME was $DYNAMO_HOME"
    echo "DYNAMO_MODULES was $DYNAMO_MODULES"
!   rm -f $TEMP_ENVIRONMENT_SCRIPT
    return 1
  fi
! . $TEMP_ENVIRONMENT_SCRIPT
! rm -f $TEMP_ENVIRONMENT_SCRIPT
  
  #
  # Load final modifications to environment.
diff -c binNew/exportRepository binOrig/exportRepository
*** binNew/exportRepository	Thu Dec 15 10:32:31 2005
--- binOrig/exportRepository	Thu Jun  9 17:52:48 2005
***************
*** 27,46 ****
            shift
            ;;
        -m) while [ "x$2" != "x" ]
!           do
!             case $2 in
!                -*)  break;;
!            Admin*)  ADMIN_MODULES="${ADMIN_MODULES}:$2" ;;
!                 *)  if [ "${ADDITIONAL_MODULES}" == "" ] ; then
!                       # Sebastiano: strip leading ":" from ADDITIONAL_MODULES as they can confuse later cygpath invocations
!                       ADDITIONAL_MODULES="$2"
!                     else
!                       ADDITIONAL_MODULES="${ADDITIONAL_MODULES}:$2"
!                     fi
!                  ;;
!             esac
!           shift
!           done;;
         *) ARGS="${ARGS} $1"
            ;;
        esac
--- 27,40 ----
            shift
            ;;
        -m) while [ "x$2" != "x" ]
!     do
!       case $2 in
!          -*)  break;;
!      Admin*) ADMIN_MODULES="${ADMIN_MODULES}:$2" ;;
!     *) ADDITIONAL_MODULES="${ADDITIONAL_MODULES}:$2" ;;
!       esac
!     shift
!     done;;
         *) ARGS="${ARGS} $1"
            ;;
        esac
***************
*** 56,64 ****
  #
  . bin/dynamoEnv.sh
  
! # Sebastiano: temporarily reconvert the CONFIGPATH to Unix format to append the modifications, then get back to Windows format
! TEMP_CONFIGPATH=`/bin/cygpath -up ${CONFIGPATH}`
! CONFIGPATH="`/bin/cygpath -wp ${TEMP_CONFIGPATH}${SERVERCONFIGPATH}`"
  
  echo -------------------
  echo JAVA_ARGS:  ${JAVA_ARGS}
--- 50,56 ----
  #
  . bin/dynamoEnv.sh
  
! CONFIGPATH=${CONFIGPATH}$SERVERCONFIGPATH
  
  echo -------------------
  echo JAVA_ARGS:  ${JAVA_ARGS}
diff -c binNew/importRepository binOrig/importRepository
*** binNew/importRepository	Thu Dec 15 10:32:31 2005
--- binOrig/importRepository	Thu Jun  9 17:52:48 2005
***************
*** 28,45 ****
            shift
            ;;
        -m) while [ "x$2" != "x" ]
!           do
!             case $2 in
!                -*)  break;;
!            Admin*)  ADMIN_MODULES="${ADMIN_MODULES}:$2" ;;
!                 *)  if [ "${ADDITIONAL_MODULES}" == "" ] ; then
!                       # Sebastiano: strip leading ":" from ADDITIONAL_MODULES as they can confuse later cygpath invocations
!                       ADDITIONAL_MODULES="$2"
!                     else
!                       ADDITIONAL_MODULES="${ADDITIONAL_MODULES}:$2"
!                     fi
!                  ;;
!             esac
            shift
            done;;
        -noworkspace) DYNAMO_MODULES="DataLoader"
--- 28,39 ----
            shift
            ;;
        -m) while [ "x$2" != "x" ]
!     do
!       case $2 in
!          -*)  break;;
!      Admin*) ADMIN_MODULES="${ADMIN_MODULES}:$2" ;;
!     *) ADDITIONAL_MODULES="${ADDITIONAL_MODULES}:$2" ;;
!       esac
            shift
            done;;
        -noworkspace) DYNAMO_MODULES="DataLoader"
***************
*** 61,70 ****
  echo DYNAMO_MODULES: ${DYNAMO_MODULES}
  . bin/dynamoEnv.sh
  
! # Sebastiano: temporarily reconvert the CONFIGPATH to Unix format to append the modifications, then get back to Windows format
! # the "-m" switch to cygpath gives regular slashes, this is a trick to keep paths like vfs=/atg/epub/file/ConfigFileSystem
! TEMP_CONFIGPATH=`/bin/cygpath -up ${CONFIGPATH}`
! CONFIGPATH="`/bin/cygpath -mp ${TEMP_CONFIGPATH}${SERVERCONFIGPATH}`"
  
  echo -------------------
  echo JAVA_ARGS:  ${JAVA_ARGS}
--- 55,61 ----
  echo DYNAMO_MODULES: ${DYNAMO_MODULES}
  . bin/dynamoEnv.sh
  
! CONFIGPATH=${CONFIGPATH}$SERVERCONFIGPATH
  
  echo -------------------
  echo JAVA_ARGS:  ${JAVA_ARGS}
diff -c binNew/j2eeEnv.sh binOrig/j2eeEnv.sh
*** binNew/j2eeEnv.sh	Thu Dec 15 10:32:31 2005
--- binOrig/j2eeEnv.sh	Thu Jun  9 17:52:48 2005
***************
*** 3,11 ****
  # add their jarfile with J2EEAPI classes to the classpath.
  #
  if [ "x$WL_HOME" != "x" ] ; then
!   CLASSPATH=`cygpath -wp ${CLASSPATH}:${WL_HOME}/server/lib/weblogic.jar`
  fi
  if [ "x${WAS_HOME}" != "x" ] ; then
!   CLASSPATH=`cygpath -wp ${CLASSPATH}:${WAS_HOME}/lib/j2ee.jar`
  fi
  
--- 3,11 ----
  # add their jarfile with J2EEAPI classes to the classpath.
  #
  if [ "x$WL_HOME" != "x" ] ; then
!   CLASSPATH=${CLASSPATH}:${WL_HOME}/server/lib/weblogic.jar
  fi
  if [ "x${WAS_HOME}" != "x" ] ; then
!   CLASSPATH=${CLASSPATH}:${WAS_HOME}/lib/j2ee.jar
  fi
  
diff -c binNew/startDynamo binOrig/startDynamo
*** binNew/startDynamo	Thu Dec 15 10:32:31 2005
--- binOrig/startDynamo	Thu Jun  9 17:52:48 2005
***************
*** 1,20 ****
  #!/bin/sh
  
  PROGRAM=`basename $0`
! 
! # Sebastiano: initialize ORIGCLASSPATH and protect the cygpath call from an empty argument
! ORIGCLASSPATH=""
! if [ "$CLASSPATH" != "" ] ; then
!   ORIGCLASSPATH=`cygpath -w -p $CLASSPATH`
! fi
! 
! # Sebastiano: initialize ORIGCONFIG and protect the cygpath call from an empty argument
! ORIGCONFIG=""
! if [ "$CONFIGPATH" != "" ] ; then
!   ORIGCONFIG=`cygpath -w -p $CONFIGPATH`
! fi
! 
! ORIGPATH=`cygpath -w -p $PATH`
  ORIGARGS=$JAVA_ARGS
  
  usage() 
--- 1,9 ----
  #!/bin/sh
  
  PROGRAM=`basename $0`
! ORIGCLASSPATH=$CLASSPATH
! ORIGCONFIG=$CONFIGPATH
! ORIGPATH=$PATH
  ORIGARGS=$JAVA_ARGS
  
  usage() 
***************
*** 136,144 ****
      DYNAMO_MODULES=${ADMIN_MODULES}:${DYNAMO_MODULES}
  fi
  
- # Sebastiano: remove double "::" from modules list as they confuse later parts of the script
- PROCESSED_DYNAMO_MODULES=`echo "${DYNAMO_MODULES}" | sed 's/::/:/g'`
- DYNAMO_MODULES=${PROCESSED_DYNAMO_MODULES}
  
  if [ ! -d $SERVERNAME ] ; then
    echo "Cannot find server directory named: $SERVERNAME in the current directory: `pwd`"
--- 125,130 ----
***************
*** 218,226 ****
  #
  # Tack this onto the end so that it is always at the end of the config path
  #
! # Sebastiano: Cygwin-compatible path
! SERVERCONFIGPATH=`/bin/cygpath -wp ${SERVERCONFIGPATH}`
! CONFIGPATH="${CONFIGPATH};${SERVERCONFIGPATH}"
  
  #
  # append DCC to modules list if we are to run it in this VM
--- 204,210 ----
  #
  # Tack this onto the end so that it is always at the end of the config path
  #
! CONFIGPATH=${CONFIGPATH}:${SERVERCONFIGPATH}
  
  #
  # append DCC to modules list if we are to run it in this VM
***************
*** 268,276 ****
          if [ ! -d $DYNAMO_HOME/$SERVERNAME/logs/archives ] ; then
            mkdir $DYNAMO_HOME/$SERVERNAME/logs/archives
          fi
! 	/bin/mv $LOGFILENAME $DYNAMO_HOME/$SERVERNAME/logs/archives/$DYNAMO_LOGFILE_NAME.$DATE
      fi
!     /bin/touch $LOGFILENAME
  fi
  
  
--- 252,260 ----
          if [ ! -d $DYNAMO_HOME/$SERVERNAME/logs/archives ] ; then
            mkdir $DYNAMO_HOME/$SERVERNAME/logs/archives
          fi
! 	mv $LOGFILENAME $DYNAMO_HOME/$SERVERNAME/logs/archives/$DYNAMO_LOGFILE_NAME.$DATE
      fi
!     touch $LOGFILENAME
  fi
  
  
***************
*** 290,298 ****
        STARTUP_CP="${DYNAMO_ROOT}/../J2EEAPI/buildtree:${DYNAMO_ROOT}/../DAS/buildtree"
      fi
  
!     # Sebastiano: Cygwin-compatible path
!     CYG_STARTUP_CP=`/bin/cygpath -wp ${STARTUP_CP}`
!     ${JAVA_VM} ${JAVA_ARGS} -cp ${CYG_STARTUP_CP} atg.service.dynamo.Configuration -v 
      echo "" 
      if [ "x${SKIP_JAVA_VERSION}" != "xTRUE" ]; then
        ${JAVA_VM} -version 2>&1
--- 274,280 ----
        STARTUP_CP="${DYNAMO_ROOT}/../J2EEAPI/buildtree:${DYNAMO_ROOT}/../DAS/buildtree"
      fi
  
!     ${JAVA_VM} ${JAVA_ARGS} -cp ${STARTUP_CP} atg.service.dynamo.Configuration -v 
      echo "" 
      if [ "x${SKIP_JAVA_VERSION}" != "xTRUE" ]; then
        ${JAVA_VM} -version 2>&1
***************
*** 322,335 ****
  
  while [ "$STATUS" = "17" ] ; do 
    if [ "x$LOG" = "x1" ] ; then
!       dynamo_startup_info | /bin/tee -a $LOGFILENAME 2>&1
    elif [ "x$LOG" = "x2" ] ; then
        dynamo_startup_info >> $LOGFILENAME 2>&1
    else
        dynamo_startup_info
    fi 
  
!   /bin/rm -f $STATUS_FILE $DYNAMO_PIDFILE
    DYNAMO_PID=unset
  
    if [ "x$FOREGROUND" = "x1" ] ; then  
--- 304,317 ----
  
  while [ "$STATUS" = "17" ] ; do 
    if [ "x$LOG" = "x1" ] ; then
!       dynamo_startup_info | tee -a $LOGFILENAME 2>&1
    elif [ "x$LOG" = "x2" ] ; then
        dynamo_startup_info >> $LOGFILENAME 2>&1
    else
        dynamo_startup_info
    fi 
  
!   rm -f $STATUS_FILE $DYNAMO_PIDFILE
    DYNAMO_PID=unset
  
    if [ "x$FOREGROUND" = "x1" ] ; then  
***************
*** 343,349 ****
      #
      # Get the status from nucleus, if it is the magic number, restart
      #  
!     STATUS=`/bin/cat $STATUS_FILE`
    else
      STATUS=$?
    fi
--- 325,331 ----
      #
      # Get the status from nucleus, if it is the magic number, restart
      #  
!     STATUS=`cat $STATUS_FILE`
    else
      STATUS=$?
    fi
diff -c binNew/startSQLRepository binOrig/startSQLRepository
*** binNew/startSQLRepository	Thu Dec 15 10:32:31 2005
--- binOrig/startSQLRepository	Thu Jun  9 17:52:48 2005
***************
*** 57,76 ****
            shift
            ;;
        -m) while [ "x$2" != "x" ]
! 	        do
!             case $2 in
!                -*)  break;;
!            Admin*)  ADMIN_MODULES="${ADMIN_MODULES}:$2" ;;
!                 *)  if [ "${ADDITIONAL_MODULES}" == "" ] ; then
!                       # Sebastiano: strip leading ":" from ADDITIONAL_MODULES as they can confuse later cygpath invocations
!                       ADDITIONAL_MODULES="$2"
!                     else
!                       ADDITIONAL_MODULES="${ADDITIONAL_MODULES}:$2"
!                     fi
!                  ;;
!             esac
!           shift
!           done;;
         *) TPARGS="${TPARGS} $1"
            ;;
        esac
--- 57,70 ----
            shift
            ;;
        -m) while [ "x$2" != "x" ]
! 	  do
! 	    case $2 in
! 	       -*)  break;;
! 	   Admin*) ADMIN_MODULES="${ADMIN_MODULES}:$2" ;;
! 		*) ADDITIONAL_MODULES="${ADDITIONAL_MODULES}:$2" ;;
! 	    esac
! 	  shift
! 	  done;;
         *) TPARGS="${TPARGS} $1"
            ;;
        esac
***************
*** 86,98 ****
  #
  . bin/dynamoEnv.sh
  
- # Sebastiano: temporarily reconvert the CONFIGPATH to Unix format to append the modifications, then get back to Windows format
- TEMP_CONFIGPATH=`/bin/cygpath -up ${CONFIGPATH}`
- 
  if [ "x$THIRD_PARTY_APP_SERVER" = "x" ] ; then
!     CONFIGPATH="`/bin/cygpath -wp ${TEMP_CONFIGPATH}${SERVERCONFIGPATH}`"
  else
!     CONFIGPATH="`/bin/cygpath -wp ${TEMP_CONFIGPATH}${SERVERCONFIGPATH}:../DAF/config/dafconfig.jar`"
  fi
  
  echo -------------------
--- 80,89 ----
  #
  . bin/dynamoEnv.sh
  
  if [ "x$THIRD_PARTY_APP_SERVER" = "x" ] ; then
!     CONFIGPATH=${CONFIGPATH}$SERVERCONFIGPATH
  else
!     CONFIGPATH=${CONFIGPATH}$SERVERCONFIGPATH:../DAF/config/dafconfig.jar
  fi
  
  echo -------------------