[jboss-cvs] JBossAS SVN: r93682 - trunk/main/src/bin.

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

Author: mladen.turk at jboss.com
Date: 2009-09-18 07:22:31 -0400 (Fri, 18 Sep 2009)
New Revision: 93682

Modified:
   trunk/main/src/bin/run.sh
Log:
Merge run.sh from EAP 5.0 branch adding community version native directoy layout check

Modified: trunk/main/src/bin/run.sh
===================================================================
--- trunk/main/src/bin/run.sh	2009-09-18 11:16:02 UTC (rev 93681)
+++ trunk/main/src/bin/run.sh	2009-09-18 11:22:31 UTC (rev 93682)
@@ -81,6 +81,11 @@
 if [ "$cygwin" = "false" ]; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ "$?" -eq 0 ]; then
+        # Darwin does not allow RLIMIT_INFINITY on file soft limit
+        if [ "$darwin" = "true" -a "$MAX_FD_LIMIT" = "unlimited" ]; then
+            MAX_FD_LIMIT=`/usr/sbin/sysctl -n kern.maxfilesperproc`
+        fi
+
 	if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
 	    # use the system max
 	    MAX_FD="$MAX_FD_LIMIT"
@@ -146,8 +151,13 @@
 	HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
     fi
 
-    # Enable -server if we have Hotspot, unless we can't
-    if [ "x$HAS_HOTSPOT" != "x" ]; then
+    # Check for OpenJDK JVM w/server support
+    if [ "x$HAS_OPENJDK_" = "x" ]; then
+        HAS_OPENJDK=`"$JAVA" -version 2>&1 | $GREP -i OpenJDK`
+    fi
+
+    # Enable -server if we have Hotspot or OpenJDK, unless we can't
+    if [ "x$HAS_HOTSPOT" != "x" -o "x$HAS_OPENJDK" != "x" ]; then
 	# MacOS does not support -server flag
 	if [ "$darwin" != "true" ]; then
 	    JAVA_OPTS="-server $JAVA_OPTS"
@@ -157,8 +167,14 @@
 
 # Setup JBoss Native library path
 #
-if [ -d "$JBOSS_HOME/../native/bin" ]; then
+if [ -d "$JBOSS_HOME/../native/lib" ]; then
     JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/../native" && pwd`
+elif [ -d "$JBOSS_HOME/native/lib" ]; then
+    JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/native" && pwd`
+elif [ -d "$JBOSS_HOME/../native/lib64" ]; then
+    JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/../native" && pwd`
+elif [ -d "$JBOSS_HOME/native/lib64" ]; then
+    JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/native" && pwd`
 elif [ -d "$JBOSS_HOME/native/bin" ]; then
     JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/native" && pwd`
 elif [ -d "$JBOSS_HOME/bin/native" ]; then
@@ -166,21 +182,15 @@
 fi
 if [ -d "$JBOSS_NATIVE_DIR" ]; then
     if $cygwin; then
-        if [ -d "$JBOSS_NATIVE_DIR/bin" ]; then
-            JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/bin"
-        fi
+        JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/bin"
         export PATH="$JBOSS_NATIVE_DIR:$PATH"
         JBOSS_NATIVE_LIBPATH=`cygpath --path --windows "$JBOSS_NATIVE_DIR"`
     else
-        IS_64_BIT_JVM=`"$JAVA" -version 2>&1 | $GREP -i 64-bit`
+        IS_64_BIT_JVM=`"$JAVA" $JAVA_OPTS -version 2>&1 | $GREP -i 64-bit`
         if [ "x$IS_64_BIT_JVM" != "x" ]; then
-            if [ -d "$JBOSS_NATIVE_DIR/lib64" ]; then
-                JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64"
-            fi
+            JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64"
         else
-            if [ -d "$JBOSS_NATIVE_DIR/lib64" ]; then
-                JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib"
-            fi
+            JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib"
         fi
         if [ "x$LD_LIBRARY_PATH" = "x" ]; then
           LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"