Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed May 30, 2018
2 parents 58b989b + 336070b commit 923739a
Show file tree
Hide file tree
Showing 48 changed files with 1,395 additions and 349 deletions.
4 changes: 2 additions & 2 deletions build-system/pom.xml
View file
Expand Up @@ -1466,8 +1466,8 @@
<!-- it's used for bamboo build to load jdbc libraries which can not
be installed to public maven repository (MS SQL, ORACLE) -->
<additionalClasspathElements>
<additionalClasspathElement>/opt/Bamboo_db_configs/mssqljdbc4.jar</additionalClasspathElement>
<additionalClasspathElement>/opt/Bamboo_db_configs/ojdbc6.jar</additionalClasspathElement>
<additionalClasspathElement>/opt/jenkins_db_configs/mssqljdbc4.jar</additionalClasspathElement>
<additionalClasspathElement>/opt/jenkins_db_configs/ojdbc7.jar</additionalClasspathElement>
<!-- used running tests on windows machines -->
<additionalClasspathElement>c:\Program Files\Microsoft JDBC DRIVER
4.0 for SQL Server\sqljdbc_4.0\enu\sqljdbc4.jar</additionalClasspathElement>
Expand Down
2 changes: 1 addition & 1 deletion config/sql/_all/sqlserver-3.8-all.sql
View file
Expand Up @@ -560,7 +560,7 @@ CREATE TABLE m_focus (
validityStatus INT,
costCenter NVARCHAR(255) COLLATE database_default,
emailAddress NVARCHAR(255) COLLATE database_default,
hasPhoto BIT DEFAULT FALSE NOT NULL,
hasPhoto BIT DEFAULT 0 NOT NULL,
locale NVARCHAR(255) COLLATE database_default,
locality_norm NVARCHAR(255) COLLATE database_default,
locality_orig NVARCHAR(255) COLLATE database_default,
Expand Down
101 changes: 49 additions & 52 deletions dist/src/main/bin/midpoint.bat
View file
Expand Up @@ -2,71 +2,68 @@

setlocal

set "BIN_DIR=%~dp0%~2"
if not "%MIDPOINT_HOME%" == "" goto gotHome
cd "%BIN_DIR%.."
mkdir var
cd var
mkdir log
cd "%BIN_DIR%.."
set "MIDPOINT_HOME=%cd%\var"
echo %MIDPOINT_HOME%
echo %BIN_DIR%
:gotHome

rem if script for start and stop exists
if exist "%BIN_DIR%\midpoint.bat" goto okBoot
echo %BIN_DIR%
echo The midpoint.bat file is not in \bin directory or is no accessible
goto end
:okBoot

rem if start/stop out file exists
if not "%BOOT_OUT%" == "" goto okOut
set "BOOT_OUT=%MIDPOINT_HOME%\log\midpoint.out"
echo %BOOT_OUT%
:okOut

rem MIDPOINT_WAR if not defined
if exist "%cd%\lib\midpoint.war" goto gotWar
echo The midpoint.war is not in \lib directory
echo Can not start midPoint
if "%1" == "start" goto doStart
if "%1" == "stop" goto doStop

echo Error: No command given. Specify either start or stop.
goto end
:gotWar

if "%MIDPOINT_HOME%" == "%MIDPOINT_HOME:;=%" goto homeNoSemicolon
:doStart
set BIN_DIR=%~dp0
set LIB_DIR=%BIN_DIR%..\lib

if "%MIDPOINT_HOME%" == "" (
cd "%BIN_DIR%.."
if not exist var mkdir var
if not exist var\log mkdir var\log
set "MIDPOINT_HOME=%BIN_DIR%..\var"
)
echo Using MIDPOINT_HOME: "%MIDPOINT_HOME%"
echo Unable to start as MIDPOINT_HOME contains a semicolon (;) character
goto end
:homeNoSemicolon

if not exist "%BIN_DIR%midpoint.bat" (
echo Error: The midpoint.bat file is not in bin directory or is not accessible.
goto end
)

rem ----- Execute The Requested Command ---------------------------------------
if not exist "%LIB_DIR%\midpoint.war" (
echo Error: The midpoint.war is not in the lib directory
goto end
)

echo Using MIDPOINT_HOME: "%MIDPOINT_HOME%"
if not "%MIDPOINT_HOME%" == "%MIDPOINT_HOME:;=%" (
echo Error: MIDPOINT_HOME contains a semicolon ";" character.
goto end
)

set _EXECJAVA=%_RUNJAVA%
set _NOHUP=nohup
set ACTION=start
if "%BOOT_OUT%" == "" set BOOT_OUT=%MIDPOINT_HOME%\log\midpoint.out
echo Using BOOT_OUT: "%BOOT_OUT%"

if ""%1"" == ""start"" goto doStart
if ""%1"" == ""stop"" goto doStop
rem ----- Execute The Requested Start Command ---------------------------------------

:doStart
shift
goto execStart
set RUN_JAVA=javaw
if not "%JAVA_HOME%" == "" set RUN_JAVA=%JAVA_HOME%\bin\javaw

echo Using RUN_JAVA: "%RUN_JAVA%"
echo Using JAVA_OPTS: "%JAVA_OPTS%"
echo Using parameters: "%*"
echo.
echo Starting midPoint.
start /b %RUN_JAVA% -jar %JAVA_OPTS% -Xms2048M -Xmx2048M -Dpython.cachedir="%MIDPOINT_HOME%\tmp" -Djavax.net.ssl.trustStore="%MIDPOINT_HOME%\keystore.jceks" -Djavax.net.ssl.trustStoreType=jceks -Dmidpoint.home="%MIDPOINT_HOME%" "%LIB_DIR%\midpoint.war" %* > "%BOOT_OUT%" 2>&1
goto end

:doStop
shift
goto execStop

:execStart
echo "%cd%\lib\midpoint.war"
start /b javaw -jar -Xms2048M -Xmx2048M -Dpython.cachedir="%MIDPOINT_HOME%\tmp" -Djavax.net.ssl.trustStore="%MIDPOINT_HOME%\keystore.jceks" -Djavax.net.ssl.trustStoreType=jceks -Dmidpoint.home="%MIDPOINT_HOME%" "%cd%\lib\midpoint.war" > "%BOOT_OUT%" 2>&1 &
goto end
set MIDPOINT_PORT=8080

:execStop
echo "%cd%\lib\midpoint.war"
FOR /F "usebackq tokens=5" %%i IN (`netstat -aon ^| findstr "0.0.0.0:8080"`) DO taskkill /F /PID %%i
shift
echo Trying to find and stop a process listening on port %MIDPOINT_PORT%...
set MIDPOINT_FOUND=
FOR /F "usebackq tokens=5" %%i IN (`netstat -aon ^| findstr "0.0.0.0:%MIDPOINT_PORT% "`) DO (
taskkill /F /PID %%i
set MIDPOINT_FOUND=true
)
if not "%MIDPOINT_FOUND%" == "true" echo No process listening on %MIDPOINT_PORT% was found.
goto end

:end
85 changes: 47 additions & 38 deletions dist/src/main/bin/ninja.bat
View file
Expand Up @@ -2,50 +2,59 @@

setlocal

set "BIN_DIR=%~dp0"

rem if script for execution is in bin directory
if exist "%BIN_DIR%\ninja.bat" goto okBoot
echo %BIN_DIR%
echo The keys.bat file is not in \bin
goto end
:okBoot

rem set midpoint.home
if not "%MIDPOINT_HOME%" == "" goto gotHome
cd "%BIN_DIR%.."
if exist "%BIN_DIR%..\var" goto setHome
echo %BIN_DIR%
echo ERROR: midpoint.home directory desn't exist
goto end
:setHome

set "MIDPOINT_HOME=%cd%\var"
echo %MIDPOINT_HOME%
echo %BIN_DIR%
:gotHome

rem NINJA_JAR if not defined
if exist "%cd%\lib\ninja.jar" goto gotJar
echo The ninja.jar is not in \lib directory
echo Can not start ninja
goto end
:gotJar

if "%MIDPOINT_HOME%" == "%MIDPOINT_HOME:;=%" goto homeNoSemicolon
set NINJA_JAR=ninja.jar

set BIN_DIR=%~dp0
set ROOT_DIR=%BIN_DIR%..
set VAR_DIR=%ROOT_DIR%\var
set NINJA_JAR_PATH=%ROOT_DIR%\lib\%NINJA_JAR%

set PARAMETERS=%*

set LOADER_PATH=
:argloop
IF NOT "%1"=="" (
IF "%1"=="-j" (
SET LOADER_PATH="-Dloader.path=%2"
SHIFT
)
IF "%1"=="--jdbc" (
SET LOADER_PATH="-Dloader.path=%2"
SHIFT
)
SHIFT
GOTO :argloop
)

if "%MIDPOINT_HOME%" == "" (
if not exist "%VAR_DIR%" (
echo Error: Default midpoint.home directory "%VAR_DIR%" does not exist.
goto end
)
set MIDPOINT_HOME=%VAR_DIR%
)

if not "%MIDPOINT_HOME%" == "%MIDPOINT_HOME:;=%" (
echo Error: Unable to start as MIDPOINT_HOME contains a semicolon ";" character
goto end
)

echo Using MIDPOINT_HOME: "%MIDPOINT_HOME%"
echo Unable to start as MIDPOINT_HOME contains a semicolon (;) character
goto end
:homeNoSemicolon

if not exist "%NINJA_JAR_PATH%" (
echo Error: %NINJA_JAR% is not in the lib directory.
echo Cannot start ninja
goto end
)

rem ----- Execute The Requested Command ---------------------------------------

echo Using MIDPOINT_HOME: "%MIDPOINT_HOME%"
set RUN_JAVA=java
if not "%JAVA_HOME%" == "" set RUN_JAVA=%JAVA_HOME%\bin\java

start /b java -jar "%cd%\lib\ninja.jar" -m "%MIDPOINT_HOME%" %*
goto end
echo Using LOADER_PATH: %LOADER_PATH%
echo Using RUN_JAVA: "%RUN_JAVA%"

"%RUN_JAVA%" %LOADER_PATH% -jar "%NINJA_JAR_PATH%" -m "%MIDPOINT_HOME%" %PARAMETERS%

:end

17 changes: 14 additions & 3 deletions dist/src/main/bin/ninja.sh
View file
Expand Up @@ -46,9 +46,9 @@ fi

[ -z "$MIDPOINT_HOME" ] && MIDPOINT_HOME=`cd "$SCRIPT_PATH../var" >/dev/null; pwd`

cd "$SCRIPT_PATH../lib"
#cd "$SCRIPT_PATH../lib"

if [ ! -f ninja.jar ] ; then
if [ ! -f lib/ninja.jar ] ; then
echo "ERROR: ninja.jar is not in /lib directory"
exit 1
fi
Expand All @@ -65,7 +65,18 @@ else
_RUNJAVA="$JAVA_HOME"/bin/java
fi

while getopts ":j:" opt; do
case $opt in
j)
JDBC_DRIVER=$OPTARG
;;
esac
done

if [ ! -z "$JDBC_DRIVER" ] ; then
JDBC_DRIVER="-Dloader.path=$JDBC_DRIVER"
fi

exec "$_RUNJAVA" -jar $SCRIPT_PATH../lib/ninja.jar -m $MIDPOINT_HOME $@
exec "$_RUNJAVA" $JDBC_DRIVER -jar $SCRIPT_PATH../lib/ninja.jar -m $MIDPOINT_HOME $@


85 changes: 47 additions & 38 deletions dist/src/main/bin/ninja37.bat
View file
Expand Up @@ -2,50 +2,59 @@

setlocal

set "BIN_DIR=%~dp0"

rem if script for execution is in bin directory
if exist "%BIN_DIR%\ninja37.bat" goto okBoot
echo %BIN_DIR%
echo The keys.bat file is not in \bin
goto end
:okBoot

rem set midpoint.home
if not "%MIDPOINT_HOME%" == "" goto gotHome
cd "%BIN_DIR%.."
if exist "%BIN_DIR%..\var" goto setHome
echo %BIN_DIR%
echo ERROR: midpoint.home directory desn't exist
goto end
:setHome

set "MIDPOINT_HOME=%cd%\var"
echo %MIDPOINT_HOME%
echo %BIN_DIR%
:gotHome

rem NINJA_JAR if not defined
if exist "%cd%\lib\ninja-3.7.2-SNAPSHOT.jar" goto gotJar
echo The ninja-3.7.2-SNAPSHOT.jar is not in \lib directory
echo Can not start ninja
goto end
:gotJar

if "%MIDPOINT_HOME%" == "%MIDPOINT_HOME:;=%" goto homeNoSemicolon
set NINJA_JAR=ninja-3.7.2-SNAPSHOT.jar

set BIN_DIR=%~dp0
set ROOT_DIR=%BIN_DIR%..
set VAR_DIR=%ROOT_DIR%\var
set NINJA_JAR_PATH=%ROOT_DIR%\lib\%NINJA_JAR%

set PARAMETERS=%*

set LOADER_PATH=
:argloop
IF NOT "%1"=="" (
IF "%1"=="-j" (
SET LOADER_PATH="-Dloader.path=%2"
SHIFT
)
IF "%1"=="--jdbc" (
SET LOADER_PATH="-Dloader.path=%2"
SHIFT
)
SHIFT
GOTO :argloop
)

if "%MIDPOINT_HOME%" == "" (
if not exist "%VAR_DIR%" (
echo Error: Default midpoint.home directory "%VAR_DIR%" does not exist.
goto end
)
set MIDPOINT_HOME=%VAR_DIR%
)

if not "%MIDPOINT_HOME%" == "%MIDPOINT_HOME:;=%" (
echo Error: Unable to start as MIDPOINT_HOME contains a semicolon ";" character
goto end
)

echo Using MIDPOINT_HOME: "%MIDPOINT_HOME%"
echo Unable to start as MIDPOINT_HOME contains a semicolon (;) character
goto end
:homeNoSemicolon

if not exist "%NINJA_JAR_PATH%" (
echo Error: %NINJA_JAR% is not in the lib directory.
echo Cannot start ninja
goto end
)

rem ----- Execute The Requested Command ---------------------------------------

echo Using MIDPOINT_HOME: "%MIDPOINT_HOME%"
set RUN_JAVA=java
if not "%JAVA_HOME%" == "" set RUN_JAVA=%JAVA_HOME%\bin\java

start /b java -jar "%cd%\lib\ninja-3.7.2-SNAPSHOT.jar" -m "%MIDPOINT_HOME%" %*
goto end
echo Using LOADER_PATH: %LOADER_PATH%
echo Using RUN_JAVA: "%RUN_JAVA%"

"%RUN_JAVA%" %LOADER_PATH% -jar "%NINJA_JAR_PATH%" -m "%MIDPOINT_HOME%" %PARAMETERS%

:end

0 comments on commit 923739a

Please sign in to comment.