Redefine java tmp directory #11444

modules/runtime/src/bin/server.bat

@@ -45,7 +45,16 @@ set CONSTANT_XP_OPTS=-Dfile.encoding=UTF8 -Dmapper.allow_dots_in_name=true --add
 if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
 if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS%
 
-IF "%1"=="debug" set JAVA_OPTS=%JAVA_OPTS% %JAVA_DEBUG_OPTS%
+if "%1"=="debug" set JAVA_OPTS=%JAVA_OPTS% %JAVA_DEBUG_OPTS%
+
+if defined XP_TMP (
+  set "TMPDIR=%XP_TMP%"
+) else if defined XP_HOME (
+  set "TMPDIR=%XP_HOME%\work"
+) else (
+  set "TMPDIR=%XP_INSTALL%\home\work"
+)
+set "JAVA_OPTS=-Djava.io.tmpdir="%TMPDIR%." %JAVA_OPTS%"
 
 :execute
 "%JAVA_EXE%" %JAVA_OPTS% -Dxp.install="%XP_INSTALL%" %XP_OPTS% %CONSTANT_XP_OPTS% --module-path "%XP_INSTALL%\mods" -classpath "%XP_INSTALL%\lib\*" com.enonic.xp.launcher.LauncherMain %ARGS%

modules/runtime/src/bin/server.sh

@@ -43,15 +43,15 @@ setupDefaults() {
 }
 
 setupOptions() {
-    if [ "x$JAVA_OPTS" = "x" ]; then
+    if [ -z "$JAVA_OPTS" ]; then
         JAVA_OPTS="$DEFAULT_JAVA_OPTS"
     fi
     export JAVA_OPTS
 }
 
 setupDebugOptions() {
     if [ "$ARG1" = "debug" ]; then
-        if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then
+        if [ -z "$JAVA_DEBUG_OPTS" ]; then
             JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS"
         fi
 
@@ -66,12 +66,19 @@ locateInstallDir() {
     fi
 }
 
+setupTmpDir() {
+  tmpdir=${XP_TMP:-${XP_HOME:+$XP_HOME/work}}
+  tmpdir=${tmpdir:-$XP_INSTALL/home/work}
+  JAVA_OPTS="-Djava.io.tmpdir=$tmpdir $JAVA_OPTS"
+}
+
 init() {
     locateJava
     setupDefaults
     setupOptions
     setupDebugOptions
     locateInstallDir
+    setupTmpDir
 }
 
 run() {

modules/runtime/src/home/deploy/README.txt

@@ -0,0 +1 @@
+Apps placed here are automatically loaded and started on the specific node.

modules/runtime/src/home/logs/README.txt

@@ -0,0 +1 @@
+Default output location for all logs.

modules/runtime/src/home/work/README.txt

@@ -0,0 +1 @@
+Cache and generated bundles (apps etc) are stored here.