SONAR-2291 Implemented cache on Sonar Runner side (for bootstrap JARs).

3 files changed, 0 insertions, 226 deletions

diff --git a/src/main/assembly/bin/sonar-runner b/src/main/assembly/bin/sonar-runner
deleted file mode 100755
index 5470ee0..0000000
--- a/src/main/assembly/bin/sonar-runner
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-#
-# Sonar Runner Startup Script for Unix
-#
-# Optional ENV vars:
-#   SONAR_RUNNER_HOME - location of runner's installed home dir
-#   SONAR_RUNNER_OPTS - parameters passed to the Java VM when running Sonar
-
-# The following notice only apply to real_path function copied from
-# https://sites.google.com/site/jdisnard/realpath
-# Copyright 2010 Jon Disnard. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-# conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-# of conditions and the following disclaimer in the documentation and/or other materials
-# provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY Jon Disnard ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# The views and conclusions contained in the software and documentation are those of the
-# authors and should not be interpreted as representing official policies, either expressed
-# or implied, of Jon Disnard.
-real_path () {
-  OIFS=$IFS
-  IFS='/'
-  for I in $1
-  do
-    # Resolve relative path punctuation.
-    if [ "$I" = "." ] || [ -z "$I" ]
-      then continue
-    elif [ "$I" = ".." ]
-      then FOO="${FOO%%/${FOO##*/}}"
-           continue
-      else FOO="${FOO}/${I}"
-    fi
-
-    # Dereference symbolic links.
-    if [ -h "$FOO" ] && [ -x "/bin/ls" ]
-      then IFS=$OIFS
-           set `/bin/ls -l "$FOO"`
-           while shift ;
-           do
-             if [ "$1" = "->" ]
-               then FOO=$2
-                    shift $#
-                    break
-             fi
-           done
-    fi
-  done
-  IFS=$OIFS
-  echo "$FOO"
-}
-
-if [ -z "$SONAR_RUNNER_HOME" ] ; then
-  PRG="$0"
-
-  # resolve symlinks
-  PRG=`real_path "$PRG"`
-
-  SONAR_RUNNER_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  SONAR_RUNNER_HOME=`cd "$SONAR_RUNNER_HOME" && pwd`
-fi
-
-# check that the SONAR_RUNNER_HOME has been correctly set
-if [ ! -e "$SONAR_RUNNER_HOME/lib/sonar-runner-${project.version}.jar" ] ; then
-  echo '$SONAR_RUNNER_HOME' does not point to a valid installation directory: $SONAR_RUNNER_HOME
-  exit 1
-fi
-
-JAVA_CMD="`which java`"
-JAVA_CLASSPATH="${SONAR_RUNNER_HOME}"/lib/sonar-runner-${project.version}.jar
-PROJECT_HOME=`pwd`
-
-#echo "Info: Using sonar-runner at $SONAR_RUNNER_HOME"
-#echo "Info: Using java at $JAVA_CMD"
-#echo "Info: Using classpath $JAVA_CLASSPATH"
-#echo "Info: Using project $PROJECT_HOME"
-
-exec "$JAVA_CMD" \
-  $SONAR_RUNNER_OPTS \
-  -classpath $JAVA_CLASSPATH \
-  "-Drunner.home=\${SONAR_RUNNER_HOME}" \
-  "-Dproject.home=\${PROJECT_HOME}" \
-  org.sonar.runner.Main "$@"
-
diff --git a/src/main/assembly/bin/sonar-runner.bat b/src/main/assembly/bin/sonar-runner.bat
deleted file mode 100644
index 3b444e6..0000000
--- a/src/main/assembly/bin/sonar-runner.bat
+++ /dev/null
@@ -1,97 +0,0 @@
-@REM Sonar Runner Startup Script for Windows
-@REM
-@REM Required ENV vars:
-@REM   JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars:
-@REM   SONAR_RUNNER_HOME - location of runner's installed home dir
-@REM   SONAR_RUNNER_OPTS - parameters passed to the Java VM when running Sonar
-
-@echo off
-
-set ERROR_CODE=0
-
-@REM set local scope for the variables with windows NT shell
-@setlocal
-
-@REM ==== START VALIDATION ====
-@REM *** JAVA EXEC VALIDATION ***
-if not "%JAVA_HOME%" == "" goto foundJavaHome
-
-for %%i in (java.exe) do set JAVA_EXEC=%%~$PATH:i
-
-if not "%JAVA_EXEC%" == "" (
-  set JAVA_EXEC="%JAVA_EXEC%"
-  goto OkJava
-)
-
-if not "%JAVA_EXEC%" == "" goto OkJava
-
-echo.
-echo ERROR: JAVA_HOME not found in your environment, and no Java
-echo        executable present in the PATH.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation, or add "java.exe" to the PATH
-echo.
-goto error
-
-:foundJavaHome
-if EXIST "%JAVA_HOME%\bin\java.exe" goto foundJavaExeFromJavaHome
-
-echo.
-echo ERROR: JAVA_HOME exists but does not point to a valid Java home
-echo        folder. No "\bin\java.exe" file can be found there.
-echo.
-goto error
-
-:foundJavaExeFromJavaHome
-set JAVA_EXEC="%JAVA_HOME%\bin\java.exe"
-
-@REM *** SONAR RUNNER HOME VALIDATION ***
-:OkJava
-if NOT "%SONAR_RUNNER_HOME%"=="" goto cleanSonarRunnerHome
-set SONAR_RUNNER_HOME=%~dp0..
-goto run
-
-:cleanSonarRunnerHome
-@REM If the property has a trailing backslash, remove it
-if %SONAR_RUNNER_HOME:~-1%==\ set SONAR_RUNNER_HOME=%SONAR_RUNNER_HOME:~0,-1%
-
-@REM Check if the provided SONAR_RUNNER_HOME is a valid install dir
-IF EXIST "%SONAR_RUNNER_HOME%\lib\sonar-runner-${project.version}.jar" goto run
-
-echo.
-echo ERROR: SONAR_RUNNER_HOME exists but does not point to a valid install
-echo        directory: %SONAR_RUNNER_HOME%
-echo.
-goto error
-
-
-
-@REM ==== START RUN ====
-:run
-echo %SONAR_RUNNER_HOME%
-
-set PROJECT_HOME=%CD%
-
-%JAVA_EXEC% %SONAR_RUNNER_OPTS% -classpath "%SONAR_RUNNER_HOME%\lib\sonar-runner-${project.version}.jar" "-Drunner.home=%SONAR_RUNNER_HOME%" "-Dproject.home=%PROJECT_HOME%" org.sonar.runner.Main %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-@REM ==== END EXECUTION ====
-
-:end
-@REM set local scope for the variables with windows NT shell
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-@REM see http://code-bear.com/bearlog/2007/06/01/getting-the-exit-code-from-a-batch-file-that-is-run-from-a-python-program/
-goto exit
-
-:returncode
-exit /B %1
-
-:exit
-call :returncode %ERROR_CODE%
diff --git a/src/main/assembly/conf/sonar-runner.properties b/src/main/assembly/conf/sonar-runner.properties
deleted file mode 100644
index 5744269..0000000
--- a/src/main/assembly/conf/sonar-runner.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#Configure here general information about the environment, such as Sonar DB details for example
-#No information about specific project should appear here
-
-#----- Default Sonar server
-#sonar.host.url=http://localhost:9000
-
-#----- PostgreSQL
-#sonar.jdbc.url=jdbc:postgresql://localhost/sonar
-#sonar.jdbc.driver=org.postgresql.Driver
-
-#----- MySQL
-#sonar.jdbc.url=jdbc:mysql://localhost:3306/sonar?useUnicode=true&amp;characterEncoding=utf8
-#sonar.jdbc.driver=com.mysql.jdbc.Driver
-
-#----- Oracle
-#sonar.jdbc.url=jdbc:oracle:thin:@localhost/XE
-#sonar.jdbc.driver=oracle.jdbc.driver.OracleDriver
-
-#----- Global database settings
-#sonar.jdbc.username=sonar
-#sonar.jdbc.password=sonar
-
-#----- Default source code encoding
-#sonar.sourceEncoding=UTF-8
-
-#----- Security (when 'sonar.forceAuthentication' is set to 'true')
-#sonar.login=admin
-#sonar.password=admin