Skip to content
Snippets Groups Projects
Commit 8f48e650 authored by Vincent Massol's avatar Vincent Massol
Browse files

XWIKI-12154: XWiki fails to start on Windows when there are spaces in the XWiki Data dir

parent 82d31ccf
No related branches found
No related tags found
No related merge requests found
@echo off @echo off
REM ------------------------------------------------------------------------- REM -------------------------------------------------------------------------
REM See the NOTICE file distributed with this work for additional REM See the NOTICE file distributed with this work for additional
REM information regarding copyright ownership. REM information regarding copyright ownership.
...@@ -70,13 +70,13 @@ set XWIKI_DATA_DIR=${xwikiDataDir} ...@@ -70,13 +70,13 @@ set XWIKI_DATA_DIR=${xwikiDataDir}
set XWIKI_OPTS=%XWIKI_OPTS% -Dxwiki.data.dir=%XWIKI_DATA_DIR% set XWIKI_OPTS=%XWIKI_OPTS% -Dxwiki.data.dir=%XWIKI_DATA_DIR%
REM Ensure the data directory exists so that XWiki can use it for storing permanent data. REM Ensure the data directory exists so that XWiki can use it for storing permanent data.
if not exist %XWIKI_DATA_DIR% mkdir %XWIKI_DATA_DIR% if not exist "%XWIKI_DATA_DIR%" mkdir "%XWIKI_DATA_DIR%"
REM Ensure the logs directory exists as otherwise Jetty reports an error REM Ensure the logs directory exists as otherwise Jetty reports an error
if not exist %XWIKI_DATA_DIR%\logs mkdir %XWIKI_DATA_DIR%\logs if not exist "%XWIKI_DATA_DIR%\logs" mkdir "%XWIKI_DATA_DIR%\logs"
REM Specify Jetty's home and base directories REM Specify Jetty's home and base directories
set XWIKI_OPTS=%XWIKI_OPTS% -Djetty.home=%JETTY_HOME% -Djetty.base=%JETTY_BASE% set XWIKI_OPTS=%XWIKI_OPTS% -Djetty.home="%JETTY_HOME%" -Djetty.base="%JETTY_BASE%"
REM Specify the encoding to use REM Specify the encoding to use
set XWIKI_OPTS=%XWIKI_OPTS% -Dfile.encoding=UTF8 set XWIKI_OPTS=%XWIKI_OPTS% -Dfile.encoding=UTF8
......
...@@ -78,13 +78,13 @@ set XWIKI_DATA_DIR=${xwikiDataDir} ...@@ -78,13 +78,13 @@ set XWIKI_DATA_DIR=${xwikiDataDir}
set XWIKI_OPTS=%XWIKI_OPTS% -Dxwiki.data.dir=%XWIKI_DATA_DIR% set XWIKI_OPTS=%XWIKI_OPTS% -Dxwiki.data.dir=%XWIKI_DATA_DIR%
REM Ensure the data directory exists so that XWiki can use it for storing permanent data. REM Ensure the data directory exists so that XWiki can use it for storing permanent data.
if not exist %XWIKI_DATA_DIR% mkdir %XWIKI_DATA_DIR% if not exist "%XWIKI_DATA_DIR%" mkdir "%XWIKI_DATA_DIR%"
REM Ensure the logs directory exists as otherwise Jetty reports an error REM Ensure the logs directory exists as otherwise Jetty reports an error
if not exist %XWIKI_DATA_DIR%\logs mkdir %XWIKI_DATA_DIR%\logs if not exist "%XWIKI_DATA_DIR%\logs" mkdir "%XWIKI_DATA_DIR%\logs"
REM Specify Jetty's home and base directories REM Specify Jetty's home and base directories
set XWIKI_OPTS=%XWIKI_OPTS% -Djetty.home=%JETTY_HOME% -Djetty.base=%JETTY_BASE% set XWIKI_OPTS=%XWIKI_OPTS% -Djetty.home="%JETTY_HOME%" -Djetty.base="%JETTY_BASE%"
REM Specify the encoding to use REM Specify the encoding to use
set XWIKI_OPTS=%XWIKI_OPTS% -Dfile.encoding=UTF8 set XWIKI_OPTS=%XWIKI_OPTS% -Dfile.encoding=UTF8
......
...@@ -38,7 +38,7 @@ REM Handle the case when JAVA_HOME is set by the user ...@@ -38,7 +38,7 @@ REM Handle the case when JAVA_HOME is set by the user
if not "%JAVA_HOME%" == "" set JAVA_PATH=%JAVA_HOME%\bin\java.exe if not "%JAVA_HOME%" == "" set JAVA_PATH=%JAVA_HOME%\bin\java.exe
REM Specify Jetty's home and base directories REM Specify Jetty's home and base directories
set XWIKI_OPTS=%XWIKI_OPTS% -Djetty.home=%JETTY_HOME% -Djetty.base=%JETTY_BASE% set XWIKI_OPTS=%XWIKI_OPTS% -Djetty.home="%JETTY_HOME%" -Djetty.base="%JETTY_BASE%"
REM Specify port and key to stop a running Jetty instance REM Specify port and key to stop a running Jetty instance
set JETTY_OPTS=%JETTY_OPTS% STOP.KEY=xwiki STOP.PORT=%JETTY_STOP_PORT% set JETTY_OPTS=%JETTY_OPTS% STOP.KEY=xwiki STOP.PORT=%JETTY_STOP_PORT%
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment