geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r533500 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/ modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/
Date Sun, 29 Apr 2007 13:10:35 GMT
Author: akulshreshtha
Date: Sun Apr 29 06:10:34 2007
New Revision: 533500

URL: http://svn.apache.org/viewvc?view=rev&rev=533500
Log:
GERONIMO-3011 Resolve relative java.io.tmpdir relative to GERONIMO_BASE instead of user.dir

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat?view=diff&rev=533500&r1=533499&r2=533500
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
Sun Apr 29 06:10:34 2007
@@ -183,11 +183,14 @@
 if not %errorlevel% == 0 goto end
 
 if not "%GERONIMO_BASE%" == "" goto gotBase
+@REM GERONIMO_BASE is used by lib, ext and endorsed which are currently shared
 set GERONIMO_BASE=%GERONIMO_HOME%
+
 :gotBase
 
 if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
-set GERONIMO_TMPDIR=%GERONIMO_BASE%\var\temp
+@REM A relative value will be resolved relative to each instance 
+set GERONIMO_TMPDIR=var\temp
 :gotTmpdir
 
 set _EXECJAVA=%_RUNJAVA%

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh?view=diff&rev=533500&r1=533499&r2=533500
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
Sun Apr 29 06:10:34 2007
@@ -212,7 +212,8 @@
 
 if [ -z "$GERONIMO_TMPDIR" ] ; then
   # Define the java.io.tmpdir to use for Geronimo
-  GERONIMO_TMPDIR="$GERONIMO_BASE"/var/temp
+  # A relative value will be resolved relative to each instance
+  GERONIMO_TMPDIR=var/temp
 fi
 
 if [ -z "$GERONIMO_OUT" ] ; then

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java?view=diff&rev=533500&r1=533499&r2=533500
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
Sun Apr 29 06:10:34 2007
@@ -75,6 +75,8 @@
         baseServer = deriveBaseServer();
         baseServerURI = baseServer.toURI();
         System.setProperty(SERVER_DIR_SYS_PROP, baseServer.getAbsolutePath());
+        String tmpDir = resolveServerPath(System.getProperty("java.io.tmpdir"));       
+        System.setProperty("java.io.tmpdir", tmpDir);
     }
 
     /**



Mime
View raw message