[jboss-cvs] JBossAS SVN: r58679 - trunk/system/src/bin

[jboss-cvs-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2006-11-27 05:21:09 -0500 (Mon, 27 Nov 2006)
New Revision: 58679

Modified:
   trunk/system/src/bin/run.bat
   trunk/system/src/bin/run.sh
Log:
Detect if we have bin/native present. If we have, add it to the startup environment

Modified: trunk/system/src/bin/run.bat
===================================================================
--- trunk/system/src/bin/run.bat	2006-11-27 01:40:09 UTC (rev 58678)
+++ trunk/system/src/bin/run.bat	2006-11-27 10:21:09 UTC (rev 58679)
@@ -13,6 +13,12 @@
 set PROGNAME=run.bat
 if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
 
+REM
+REM Add bin/native to the PATH if present
+REM
+if exist %DIRNAME%native set PATH=%DIRNAME%native;%PATH%
+if exist %DIRNAME%native set JAVA_OPTS=%JAVA_OPTS% -Djava.library.path=%DIRNAME%native
+
 rem Read all command line arguments
 
 REM

Modified: trunk/system/src/bin/run.sh
===================================================================
--- trunk/system/src/bin/run.sh	2006-11-27 01:40:09 UTC (rev 58678)
+++ trunk/system/src/bin/run.sh	2006-11-27 10:21:09 UTC (rev 58679)
@@ -138,6 +138,26 @@
     fi
 fi
 
+# Setup JBosst Native library path
+JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/native"
+if [ -d "$JBOSS_NATIVE_DIR" ]; then
+    if $cygwin ; then
+        export PATH="$JBOSS_NATIVE_DIR:$PATH"
+        JBOSS_NATIVE_DIR=`cygpath --dos "$JBOSS_NATIVE_DIR"`
+    fi
+    if [ "x$LD_LIBRARY_PATH" = "x" ]; then
+        LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"
+    else
+        LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH"
+    fi
+    export LD_LIBRARY_PATH
+    if [ "x$JAVA_OPTS" = "x" ]; then
+        JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR"
+    else
+        JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_DIR"
+    fi
+fi
+
 #JPDA options. Uncomment and modify as appropriate to enable remote debugging .
 #JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"