initial trunk import

Former-commit-id: 35ffc2a13868992e962a3adf624a0da44c7e5f80

Install_dotCMS_Release.txt

@@ -0,0 +1,6 @@
+Installing dotCMS from Release
+
+See:
+
+http://dotcms.com/docs/1.9/Installation
+

bin/ant/ant.jar.REMOVED.git-id

@@ -0,0 +1 @@
+704717779f6d0d7eb026dc7af78a35e51adeec8b

bin/ant/xercesImpl.jar.REMOVED.git-id

@@ -0,0 +1 @@
+e0a4c2e373887f4230f2296b2d1dfb4e358f0e0c

bin/autoupdater/autoUpdater.bat

@@ -0,0 +1,85 @@
+@ECHO OFF
+
+REM Some constants
+SET JARFILE=autoUpdater.jar
+SET NEWFILE=autoUpdater.new
+SET OLDFILE=autoUpdater.old
+
+REM save the parameters for later
+set CMD_LINE_ARGS=
+:setArgs
+if ""%1""=="""" goto doneSetArgs
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto setArgs
+:doneSetArgs
+
+
+
+echo %CMD_LINE_ARGS%|findstr /i "-url" >nul:
+if %errorlevel%==1 goto :url_not_found
+:url_not_found
+set CMD_LINE_ARGS= ""%CMD_LINE_ARGS% -url http://www.dotcms.com:8080/servlets/upgrade""
+
+
+echo %CMD_LINE_ARGS%|findstr /i "-home" >nul:
+if %errorlevel%==1 goto :home_not_found
+:home_not_found
+SET CurrDir=%CD%
+CD..
+SET InstPath=%CD%
+CD..
+SET RootPath=%CD%
+CD %CurrDir%
+set CMD_LINE_ARGS= ""%CMD_LINE_ARGS% -home %RootPath%""
+
+IF NOT EXIST "%JAVA_HOME%\bin\java.exe" GOTO nojava
+
+
+REM Get directory where we need to run from
+IF EXIST %JARFILE% SET PRGDIR=%CD%\bin
+IF EXIST %PRGDIR%\%JARFILE% GOTO gotprg
+IF EXIST %CD%\%JARFILE% SET PRGDIR=%CD%
+IF EXIST %PRGDIR%\%JARFILE% GOTO gotprg
+
+ECHO Couldn't find %JARFILE%. Aborting.
+GOTO end
+
+
+:gotprg
+ECHO Running from: %PRGDIR%
+
+REM Make sure we're clear to start
+IF EXIST %PRGDIR%\%NEWFILE% GOTO newjar
+
+
+GOTO run
+
+
+
+:run
+REM RUN
+"%JAVA_HOME%\bin\java" -jar "%PRGDIR%\%JARFILE%" %CMD_LINE_ARGS%
+IF EXIST "%PRGDIR%\%NEWFILE%" GOTO updatejar
+GOTO end
+
+:updatejar
+ECHO %NEWFILE% exists, updating agent.
+DEL "%PRGDIR%\%OLDFILE%"
+COPY "%PRGDIR%\%JARFILE%" "%PRGDIR%\%OLDFILE%"
+DEL "%PRGDIR%\%JARFILE%"
+COPY "%PRGDIR%\%NEWFILE%" "%PRGDIR%\%JARFILE%"
+DEL "%PRGDIR%\%NEWFILE%"
+ECHO "autoUpdater upgraded, restarting process."
+"%JAVA_HOME%\bin\java" -jar "%PRGDIR%\%JARFILE%" %CMD_LINE_ARGS%
+GOTO end
+
+:newjar
+ECHO %NEWFILE% exists, it was most likely left by a failed attempt.  Please remove before starting again. Aborting.
+GOTO end
+
+:nojava
+ECHO "JAVA_HOME needs to be set.  Aborting."
+GOTO end
+
+:end

bin/autoupdater/autoUpdater.sh

@@ -0,0 +1,86 @@
+#!/bin/sh
+
+#Some constants
+JARFILE=autoUpdater.jar
+NEWFILE=autoUpdater.new
+OLDFILE=autoUpdater.old
+if [ ! -e  $JAVA_HOME/bin/java ]
+then
+	echo "JAVA_HOME needs to be set.  Aborting."
+	exit 1
+fi
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`/"$link"
+  fi
+done
+
+# Get directory where we need to run from
+PRGDIR=`dirname "$PRG"`
+
+if [ ! -e $PRGDIR/$JARFILE ] 
+then  
+  echo "Couldn't find $JARFILE. Aborting."
+  exit 1
+fi
+
+# Save the parameters for later
+CMD_LINE_ARGS=""
+while [ "$1" != "" ]
+do
+        CMD_LINE_ARGS="$CMD_LINE_ARGS $1"
+        shift
+done
+
+
+SOURCE="-home"
+if echo "$CMD_LINE_ARGS" | grep -q "$SOURCE"; then
+  echo "home parameter not found setting default";
+else
+  DIRECTORY=$(cd `dirname $0` && pwd)
+  cd $DIRECTORY/../..
+  DIRECTORY2=$(cd `dirname $0` && pwd)
+  cd $DIRECTORY
+  CMD_LINE_ARGS="$CMD_LINE_ARGS -home $DIRECTORY2"
+fi
+
+SOURCE="-url"
+if echo "$CMD_LINE_ARGS" | grep -q "$SOURCE"; then
+  echo "url parameter not found setting default";
+else
+  CMD_LINE_ARGS="$CMD_LINE_ARGS -url http://www.dotcms.com:8080/servlets/upgrade"
+fi
+
+
+echo "Running from $PRGDIR"
+
+#Make sure we're clear to start
+if [ -e $PRGDIR/$NEWFILE ]
+then
+  echo "$NEWFILE exists, it was most likely left by a failed attempt.  Please remove before starting again. Aborting."
+  exit 1
+fi
+
+$JAVA_HOME/bin/java -jar $PRGDIR/autoUpdater.jar $CMD_LINE_ARGS
+
+
+if [ -e $PRGDIR/$NEWFILE ]
+then
+  # Make sure file is not zero length
+  if [ -s $PRGDIR/$NEWFILE ]
+  then
+    echo "$NEWFILE exists, updating agent."
+    mv $PRGDIR/$JARFILE $PRGDIR/$OLDFILE
+    mv $PRGDIR/$NEWFILE $PRGDIR/$JARFILE
+    echo "autoUpdater upgraded, restarting process."
+    $JAVA_HOME/bin/java -jar $PRGDIR/autoUpdater.jar $CMD_LINE_ARGS
+  fi 
+fi

bin/deploy-plugins.bat

@@ -0,0 +1,29 @@
+@echo off
+
+if "%OS%" == "Windows_NT" setlocal
+
+rem Guess DOTCMS_HOME if not defined
+set CURRENT_DIR=%cd%
+if not "%DOTCMS_HOME%" == "" goto gotHome
+set DOTCMS_HOME=%CURRENT_DIR%
+if exist "%DOTCMS_HOME%\bin\startup.bat" goto okHome
+cd ..
+set DOTCMS_HOME=%cd%
+cd %CURRENT_DIR%
+:gotHome
+if exist "%DOTCMS_HOME%\bin\startup.bat" goto okHome
+echo The DOTCMS_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+:okHome
+
+rem Get standard environment variables
+if exist "%DOTCMS_HOME%\bin\setenv.bat" call "%DOTCMS_HOME%\bin\setenv.bat"
+
+echo Using DOTCMS_HOME:   %DOTCMS_HOME%
+echo Using JAVA_HOME:       %JAVA_HOME%
+
+cd "%DOTCMS_HOME%"
+%JAVA_HOME%/bin/java -jar "%DOTCMS_HOME%\bin\ant\ant-launcher.jar" deploy-plugins
+cd "%CURRENT_DIR%"
+

bin/deploy-plugins.sh

@@ -0,0 +1,100 @@
+#!/bin/sh
+
+
+cygwin=false
+os400=false
+darwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+Darwin*) darwin=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`/"$link"
+  fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set DOTCMS_HOME if not already set
+[ -z "$DOTCMS_HOME" ] && DOTCMS_HOME=`cd "$PRGDIR/.." ; pwd`
+
+BASEDIR="$DOTCMS_HOME"
+
+if [ -r "$DOTCMS_HOME"/bin/setenv.sh ]; then
+echo setting env
+  . "$DOTCMS_HOME"/bin/setenv.sh
+fi
+
+if [ -r "$DOTCMS_HOME"/bin/setclasspath.sh ]; then
+echo setting class
+  . "$DOTCMS_HOME"/bin/setclasspath.sh
+fi
+
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
+  [ -n "$DOTCMS_HOME" ] && DOTCMS_HOME=`cygpath --unix "$DOTCMS_HOME"`
+  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+  [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --absolute --unix "$JSSE_HOME"`
+fi
+
+# For OS400
+if $os400; then
+  # Set job priority to standard for interactive (interactive - 6) by using
+  # the interactive priority - 6, the helper threads that respond to requests
+  # will be running at the same priority as interactive jobs.
+  COMMAND='chgjob job('$JOBNAME') runpty(6)'
+  system $COMMAND
+
+  # Enable multi threading
+  export QIBM_MULTI_THREADED=Y
+fi
+
+if [ -z "$DOTCMS_HOME" ] ; then
+  DOTCMS_HOME="$DOTCMS_HOME"
+fi
+
+# Bugzilla 37848: When no TTY is available, don't output to console
+have_tty=0
+if [ "`tty`" != "not a tty" ]; then
+    have_tty=1
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
+  JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
+  DOTCMS_HOME=`cygpath --absolute --windows "$DOTCMS_HOME"`
+  DOTCMS_TMPDIR=`cygpath --absolute --windows "$DOTCMS_TMPDIR"`
+  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --absolute --windows "$JSSE_HOME"`
+  JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
+fi
+
+# ----- Execute The Requested Command -----------------------------------------
+if [ $have_tty -eq 1 ]; then
+  echo "Using DOTCMS_HOME:   $DOTCMS_HOME"
+  echo "Using JAVA_HOME:       $JAVA_HOME"
+fi
+
+CURRENT_PWD=`pwd`
+cd $DOTCMS_HOME
+
+echo Deploying plugins
+
+$JAVA_HOME/bin/java -jar "$DOTCMS_HOME/bin/ant/ant-launcher.jar" deploy-plugins
+
+

bin/shutdown.bat

@@ -0,0 +1,46 @@
+@echo off
+
+rem -----------------------------------------------------------------------------
+rem Stop Script for the dotCMS Server
+rem -----------------------------------------------------------------------------
+
+if "%OS%" == "Windows_NT" setlocal
+
+rem Guess DOTCMS_HOME if not defined
+set "CURRENT_DIR=%cd%"
+if not "%DOTCMS_HOME%" == "" goto gotHome
+set "DOTCMS_HOME=%CURRENT_DIR%"
+if exist "%DOTCMS_HOME%\bin\startup.bat" goto okHome
+cd ..
+set "DOTCMS_HOME=%cd%"
+cd "%CURRENT_DIR%"
+:gotHome
+if exist "%DOTCMS_HOME%\bin\startup.bat" goto okHome
+echo The DOTCMS_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+:okHome
+
+set "EXECUTABLE=%DOTCMS_HOME%\tomcat\bin\catalina.bat"
+
+rem Check that target executable exists
+if exist "%EXECUTABLE%" goto okExec
+echo Cannot find "%EXECUTABLE%"
+echo This file is needed to run this program
+goto end
+:okExec
+
+rem Get remaining unshifted command line arguments and save them in the
+set CMD_LINE_ARGS=
+:setArgs
+if ""%1""=="""" goto doneSetArgs
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto setArgs
+:doneSetArgs
+
+cd %DOTCMS_HOME%\tomcat\bin
+call "%EXECUTABLE%" stop %CMD_LINE_ARGS%
+cd "%CURRENT_DIR%"
+
+:end